From c0e30c30241080d61f89fe723a235f9f930313d8 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 24 Aug 2023 14:32:50 +0200
Subject: [PATCH 001/148] First structure for creating a dict

---
 proposals/utils/proposal_utils.py | 29 ++++++++++++++++++++++++++++-
 1 file changed, 28 insertions(+), 1 deletion(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 2a8e51a19..fadc76d19 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -302,7 +302,34 @@ def _get_next_proposal_number(current_year) -> int:
     except Proposal.DoesNotExist:
         return 1
 
-
+def generate_relevant_data_pdf(proposal):
+    empty_dict = {}
+
+    empty_dict[_('Algemene informatie over de aanvraag')] = {}
+    empty_dict[_('Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?')] = {}
+
+    if proposal.wmo.status != proposal.wmo.NO_WMO:
+        empty_dict[_("Aanmelding bij de METC")] = {}
+
+    empty_dict[_('Eén of meerdere trajecten?')] = {}
+
+    '''Note to self: this will be a huge pain of nesting ... only scratch surface for now ...'''
+    if proposal.wmo.status == proposal.wmo.NO_WMO:
+        for study in proposal.study_set.all():
+            if proposal.studies_number > 1:
+                empty_dict['studies'] = {}
+                if study.name:
+                    empty_dict['studies'][_(f'traject { study.order } { study.name }')] = {}
+                else:
+                    empty_dict['studies'][_(f'traject { study.order }')] = {}
+            else:
+                empty_dict['study'] = {}
+    
+    empty_dict['extra documents'] = []
+
+    empty_dict['Aanmelding versturen'] = {}
+
+    return empty_dict
 
 def generate_pdf(proposal, template=False):
     """Grandfathered function for pdf saving. The template arg currently

From b1d1ee34f02baa4bb934f61d045f63127168b5d5 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 28 Aug 2023 15:44:51 +0200
Subject: [PATCH 002/148] Some groundwork and a bit of RowValueClass

---
 proposals/utils/proposal_utils.py | 108 +++++++++++++++++++++++++++++-
 1 file changed, 107 insertions(+), 1 deletion(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index fadc76d19..b36d3410e 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -1,6 +1,6 @@
 # -*- encoding: utf-8 -*-
 
-from collections import defaultdict
+from collections import defaultdict, OrderedDict
 from datetime import datetime
 from io import BytesIO
 import os
@@ -306,6 +306,20 @@ def generate_relevant_data_pdf(proposal):
     empty_dict = {}
 
     empty_dict[_('Algemene informatie over de aanvraag')] = {}
+    empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('relation').verbose_name] = proposal.relation
+    if proposal.relation.needs_supervisor:
+        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('supervisor').verbose_name] = proposal.supervisor.get_full_name
+    if proposal.relation.check_in_course:
+        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_program').verbose_name] = proposal.student_program
+        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_context').verbose_name] = proposal.student_context
+        if proposal.student_context.needs_detail:
+            empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_context_detail').verbose_name] = proposal.student_context_details
+        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_justification').verbose_name] = proposal.student_justification
+    #I am not quite sure how to add translation to the boolean value resulting here ...
+    empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('other_applicants').verbose_name] = proposal.other_applicants
+    if proposal.other_applicants:
+        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('applicants').verbose_name] = [applicant.get_full_name for applicant in proposal.applicants]
+
     empty_dict[_('Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?')] = {}
 
     if proposal.wmo.status != proposal.wmo.NO_WMO:
@@ -331,6 +345,97 @@ def generate_relevant_data_pdf(proposal):
 
     return empty_dict
 
+class PDFSection:
+    
+    section_title = None
+    row_fields = None
+
+    def __init__(self, object):
+        self.object = object
+        # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
+        self._row_fields = self.row_fields
+    
+    def get_rows(self):
+        rows = OrderedDict()
+        for row_field in self._row_fields:
+            rows[row_field] = {
+               'label': self.object._meta.get_field(row_field).verbose_name,
+               'value': RowValueClass(self.object, row_field)
+            }
+        return rows
+
+    def render(self, context):
+        template = get_template("proposals/pdf/table_with_header.html")
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.get_rows(),
+            }
+        )
+        return template.render(context)
+
+class GeneralSection(PDFSection):
+    # This class inherits from the above
+
+    section_title = _("Algemene informatie over de aanvraag")
+    row_fields = ['metc', 'metc_details', 'metc_institution']
+    
+    def get_rows(self):
+        # Remove the metc_details if no METC review is needed
+        if not self.object.metc:
+            del self._row_fields['metc_details']
+            del self._row_fields['metc_institution']
+        # Use the get_rows from PDFSection to get the actual rows, the code above should have filtered out everything we don't need
+        return super().get_rows()
+    
+class RowValueClass:
+
+        def __init__(self, object, field):
+
+            self.object = object
+            self.field = field
+
+        def render(self, context):
+
+            value = getattr(self.object, self.field)
+
+            if type(value) in (str, int, datetime.date):
+                return value
+            elif type(value) == bool:
+                return _('Ja') if value else _('Nee')
+            elif type(value) == User:
+                return self.handle_user(value)
+            elif value.__class__.__name__ == 'ManyRelatedManager':
+                if value.all().model == User:
+                    return self.get_applicants_names(value)
+                elif value.all().model == Funding:
+                    return self.get_funding_list()
+            elif callable(value):
+                return value()
+            
+        def handle_user(self, user):
+            return user.get_full_name()
+        
+        def get_applicants_names(self, applicants):
+            applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
+            return self.create_unordered_html_list(applicant_names)
+        
+        def get_funding_list(self, funding):
+            list_of_funds = [fund for fund in funding.all()]
+            return self.create_unordered_html_list(list_of_funds)
+        
+        def create_unordered_html_list(list):
+            html_output = '<ul>'
+
+            for item in list:
+                html_output += f'<li>{item}</li>'
+            
+            html_output += '</ul>'
+
+            return html_output
+
+
+
 def generate_pdf(proposal, template=False):
     """Grandfathered function for pdf saving. The template arg currently
     only exists for backwards compatibility."""
@@ -355,6 +460,7 @@ def generate_pdf(proposal, template=False):
     return proposal.pdf
 
 
+
 def pdf_link_callback(uri, rel):
     """
     Convert HTML URIs to absolute system paths so xhtml2pdf can access those

From 158c62bbe35c506e2128376be8caa74edfebd44b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 29 Aug 2023 10:39:38 +0200
Subject: [PATCH 003/148] Furthering test build

---
 .../proposals/pdf/table_with_header.html      |  8 +++
 proposals/utils/proposal_utils.py             | 50 ++++++++++++++++---
 2 files changed, 50 insertions(+), 8 deletions(-)
 create mode 100644 proposals/templates/proposals/pdf/table_with_header.html

diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
new file mode 100644
index 000000000..68c62ac5d
--- /dev/null
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -0,0 +1,8 @@
+<h2> {{ section_title }} </h2>
+<table>
+{% for key, value rows.items() %}
+<tr>
+<th>{{value.label}}</th><td>{{ value.value }}</td>
+</tr>
+{% endfor %}
+</table>
\ No newline at end of file
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index b36d3410e..7aad0c73a 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -19,6 +19,8 @@
 from main.utils import AvailableURL, get_secretary
 from studies.utils import study_urls
 
+from proposals.templatetags.proposal_filters import needs_details
+
 
 __all__ = ['available_urls', 'generate_ref_number',
            'generate_revision_ref_number', 'generate_pdf',
@@ -360,7 +362,7 @@ def get_rows(self):
         for row_field in self._row_fields:
             rows[row_field] = {
                'label': self.object._meta.get_field(row_field).verbose_name,
-               'value': RowValueClass(self.object, row_field)
+               'value': RowValueClass(self.object, row_field).render()
             }
         return rows
 
@@ -375,16 +377,48 @@ def render(self, context):
         return template.render(context)
 
 class GeneralSection(PDFSection):
-    # This class inherits from the above
+    '''This class generates the data for the general section of 
+    the PDF page.'''
 
     section_title = _("Algemene informatie over de aanvraag")
-    row_fields = ['metc', 'metc_details', 'metc_institution']
+    row_fields = [
+        'relation',
+        'supervisor',
+        'student program',
+        'student_context',
+        'student_context_details',
+        'student_justification',
+        'other_applicants',
+        'applicants',
+        'other_stakeholders',
+        'stakeholders',
+        'date_start',
+        'title',
+        'funding'
+        'funding_details',
+        'funding_name',
+        'self_assessment'
+    ]
     
     def get_rows(self):
-        # Remove the metc_details if no METC review is needed
-        if not self.object.metc:
-            del self._row_fields['metc_details']
-            del self._row_fields['metc_institution']
+        obj = self.object
+        rows = self._row_fields
+        if not obj.needs_supervisor:
+            del rows['supervisor']
+        if not obj.check_in_course:
+            del rows['student_program']
+            del rows['student_context']
+            if not obj.student_context.needs_details:
+                del rows['student_context_details']
+            del rows['student_justification']
+        if not obj.other_applicants:
+            del rows['applicants']
+        if not obj.other_stakeholders:
+            del rows['stakeholders']
+        if not needs_details(obj.funding.all()):
+            del rows['funding_details']
+        if not needs_details(obj.funding.all(), 'needs_name'):
+            del rows['funding_name']
         # Use the get_rows from PDFSection to get the actual rows, the code above should have filtered out everything we don't need
         return super().get_rows()
     
@@ -395,7 +429,7 @@ def __init__(self, object, field):
             self.object = object
             self.field = field
 
-        def render(self, context):
+        def render(self):
 
             value = getattr(self.object, self.field)
 

From 41b9c34dcdc36b5b2024df968298f722bc45bc06 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 29 Aug 2023 16:50:40 +0200
Subject: [PATCH 004/148] First working test, plus extra stuff

---
 .../templates/proposals/pdf/new_pdf_test.html |  18 ++
 .../proposals/pdf/table_with_header.html      |   4 +-
 proposals/utils/proposal_utils.py             | 178 ++++++++++++------
 proposals/views/proposal_views.py             |  15 +-
 4 files changed, 154 insertions(+), 61 deletions(-)
 create mode 100644 proposals/templates/proposals/pdf/new_pdf_test.html

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
new file mode 100644
index 000000000..c03c57358
--- /dev/null
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -0,0 +1,18 @@
+{% extends "base/base.html" %}
+
+{% load static %}
+{% load proposal_filters %}
+{% load fetc_filters %}
+{% load i18n %}
+{% load compare_tags %}
+{% load uil_filters %}
+
+{% block header_title %}
+    New PDF test
+{% endblock %}
+
+{% block content %}
+
+    {% include test %}
+
+{% endblock %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
index 68c62ac5d..0f0e00c65 100644
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -1,8 +1,8 @@
 <h2> {{ section_title }} </h2>
 <table>
-{% for key, value rows.items() %}
+{% for label, value in rows.items %}
 <tr>
-<th>{{value.label}}</th><td>{{ value.value }}</td>
+<th>{{ value.label }}</th><td>{{ value.value }}</td>
 </tr>
 {% endfor %}
 </table>
\ No newline at end of file
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 7aad0c73a..13e70911d 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
 from collections import defaultdict, OrderedDict
-from datetime import datetime
+from datetime import datetime, date
 from io import BytesIO
 import os
 
@@ -347,23 +347,36 @@ def generate_relevant_data_pdf(proposal):
 
     return empty_dict
 
+from django.contrib.auth import get_user_model
+from django.utils.safestring import mark_safe
+from django.utils.html import format_html
+from copy import copy
 class PDFSection:
     
     section_title = None
     row_fields = None
+    verbose_name_diff_field_dict = {
+        'get_metc_display': ('wmo', 'metc')
+        'get_is_medical_display': ('wmo','is_medical')
+
+    }
 
     def __init__(self, object):
         self.object = object
         # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
-        self._row_fields = self.row_fields
+        self._row_fields = copy(self.row_fields)
     
     def get_rows(self):
         rows = OrderedDict()
         for row_field in self._row_fields:
-            rows[row_field] = {
-               'label': self.object._meta.get_field(row_field).verbose_name,
-               'value': RowValueClass(self.object, row_field).render()
-            }
+            if type(row_field) == str:
+                rows[row_field] = {
+                'label': self.object._meta.get_field(row_field).verbose_name,
+                'value': RowValueClass(self.object, row_field).render()
+                }
+            #TODO: finish this
+            if type(row_field) == tuple:
+                
         return rows
 
     def render(self, context):
@@ -374,7 +387,7 @@ def render(self, context):
                 "rows": self.get_rows(),
             }
         )
-        return template.render(context)
+        return template.render(context.flatten())
 
 class GeneralSection(PDFSection):
     '''This class generates the data for the general section of 
@@ -384,7 +397,7 @@ class GeneralSection(PDFSection):
     row_fields = [
         'relation',
         'supervisor',
-        'student program',
+        'student_program',
         'student_context',
         'student_context_details',
         'student_justification',
@@ -394,79 +407,128 @@ class GeneralSection(PDFSection):
         'stakeholders',
         'date_start',
         'title',
-        'funding'
+        'funding',
         'funding_details',
         'funding_name',
-        'self_assessment'
+        'self_assessment',
     ]
     
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
-        if not obj.needs_supervisor:
-            del rows['supervisor']
-        if not obj.check_in_course:
-            del rows['student_program']
-            del rows['student_context']
-            if not obj.student_context.needs_details:
-                del rows['student_context_details']
-            del rows['student_justification']
+        if not obj.relation.needs_supervisor:
+            rows.remove('supervisor')
+        if not obj.relation.check_in_course:
+            rows.remove('student_program')
+            rows.remove('student_context')
+            if obj.student_context is not None:
+                if not obj.student_context.needs_details:
+                    rows.remove('student_context_details')
+            else:
+                rows.remove('student_context_details')
+            rows.remove('student_justification')
         if not obj.other_applicants:
-            del rows['applicants']
+            rows.remove('applicants')
         if not obj.other_stakeholders:
-            del rows['stakeholders']
+            rows.remove('stakeholders')
         if not needs_details(obj.funding.all()):
-            del rows['funding_details']
+            rows.remove('funding_details')
         if not needs_details(obj.funding.all(), 'needs_name'):
-            del rows['funding_name']
+            rows.remove('funding_name')
         # Use the get_rows from PDFSection to get the actual rows, the code above should have filtered out everything we don't need
         return super().get_rows()
     
+class WMOSection(PDFSection):
+
+    section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
+    row_fields = [
+        'get_metc_display',
+        'metc_details',
+        'metc_institution',
+        'get_is_medical_display'        
+    ]
+
+    def __init__(self, object):
+        super().__init__(self, object)
+        self.object = self.object.wmo
+    
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+        if not obj.metc == 'Y':
+            rows.remove('metc_details')
+            rows.remove('metc_institution')
+        else:
+            rows.remove('get_is_medical')
+    
+
+    
 class RowValueClass:
 
-        def __init__(self, object, field):
+    def __init__(self, object, field):
 
-            self.object = object
-            self.field = field
+        self.object = object
+        self.field = field
 
-        def render(self):
+    def render(self):
+        from ..models import Funding, Relation
 
+        if type(self.field) == str:
             value = getattr(self.object, self.field)
-
-            if type(value) in (str, int, datetime.date):
-                return value
-            elif type(value) == bool:
-                return _('Ja') if value else _('Nee')
-            elif type(value) == User:
-                return self.handle_user(value)
-            elif value.__class__.__name__ == 'ManyRelatedManager':
-                if value.all().model == User:
-                    return self.get_applicants_names(value)
-                elif value.all().model == Funding:
-                    return self.get_funding_list()
-            elif callable(value):
-                return value()
-            
-        def handle_user(self, user):
-            return user.get_full_name()
+        '''A workaround for accessing subclasses:
+        For a subclass provide a tuple like so:
+        ('wmo', 'metc')'''
+        if type(self.field) == tuple:
+        #TODO: create a separate method for this!
+            obj = self.object
+            for item in self.field:
+                value = getattr(obj, item)
+                obj = value
+
+        User = get_user_model()
+
+        if type(value) in (str, int, date):
+            return value
+        if value is None:
+            return _('Onbekend')
+        elif type(value) == bool:
+            return _('Ja') if value else _('Nee')
+        elif type(value) == User:
+            return self.handle_user(value)
+        elif type(value) == Relation:
+            return value.description
+        elif value.__class__.__name__ == 'ManyRelatedManager':
+            if value.all().model == User:
+                return self.get_applicants_names(value)
+            elif value.all().model == Funding:
+                return self.get_funding_list(value)
+        elif callable(value):
+            return value()
         
-        def get_applicants_names(self, applicants):
-            applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
-            return self.create_unordered_html_list(applicant_names)
-        
-        def get_funding_list(self, funding):
-            list_of_funds = [fund for fund in funding.all()]
-            return self.create_unordered_html_list(list_of_funds)
+    def handle_user(self, user):
+        return user.get_full_name()
+    
+    def get_applicants_names(self, applicants):
+        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
+        return self.create_unordered_html_list(applicant_names)
+    
+    def get_funding_list(self, funding):
+        list_of_funds = [fund for fund in funding.all()]
+        return self.create_unordered_html_list(list_of_funds)
+    
+    def create_unordered_html_list(self, list):
+        html_output = mark_safe('<ul class="p-0">')
+
+        for item in list:
+            html_output += format_html('{}{}{}',
+                mark_safe('<li>'),
+                item,
+                mark_safe('</li>')                
+            )
         
-        def create_unordered_html_list(list):
-            html_output = '<ul>'
-
-            for item in list:
-                html_output += f'<li>{item}</li>'
-            
-            html_output += '</ul>'
+        html_output += mark_safe('</ul>')
 
-            return html_output
+        return html_output
 
 
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 96f96379b..ef1e70df2 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -445,7 +445,7 @@ def get_next_url(self):
 
     def get_back_url(self):
         """Return to the data management view"""
-        return reverse('proposals:data_management', args=(self.object.pk,))
+        return reverse('proposals:data_management', aPdfrgs=(self.object.pk,))
 
     def _get_page_number(self):
         if self.object.is_pre_assessment:
@@ -578,6 +578,19 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
     template_name = 'proposals/proposal_diff.html'
 
+from proposals.utils.proposal_utils import GeneralSection
+class NewPDFViewTest(generic.TemplateView):
+
+    template_name = 'proposals/pdf/new_pdf_test.html'
+
+    def get_context_data(self, **kwargs):
+        model = Proposal.objects.last()
+        test = GeneralSection(model)
+        context = super().get_context_data(**kwargs)
+        context['test'] = test
+        return context
+
+
 
 ########################
 # Preliminary assessment

From ba1ab48bfde0bdb47122f37f146b4645dbe4c857 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 30 Aug 2023 11:36:54 +0200
Subject: [PATCH 005/148] workaround for nested field values

---
 proposals/utils/proposal_utils.py | 35 +++++++++++++++++++++++--------
 1 file changed, 26 insertions(+), 9 deletions(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 13e70911d..5b1f5726a 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -351,12 +351,19 @@ def generate_relevant_data_pdf(proposal):
 from django.utils.safestring import mark_safe
 from django.utils.html import format_html
 from copy import copy
+
+'''('created_by', 'email')'''
+
+# def access_foreignkey_getattr(object, field_tuple):
+    
+
+#     return value, verbose_name
 class PDFSection:
     
     section_title = None
     row_fields = None
     verbose_name_diff_field_dict = {
-        'get_metc_display': ('wmo', 'metc')
+        'get_metc_display': ('wmo', 'metc'),
         'get_is_medical_display': ('wmo','is_medical')
 
     }
@@ -374,9 +381,11 @@ def get_rows(self):
                 'label': self.object._meta.get_field(row_field).verbose_name,
                 'value': RowValueClass(self.object, row_field).render()
                 }
-            #TODO: finish this
-            if type(row_field) == tuple:
-                
+            elif type(row_field) == tuple:
+                rows[row_field[-1]] = {
+                'label': self.get_nested_verbose_name(self.object, row_field),
+                'value': RowValueClass(self.object, row_field).render()
+                }                
         return rows
 
     def render(self, context):
@@ -388,6 +397,15 @@ def render(self, context):
             }
         )
         return template.render(context.flatten())
+    
+    def get_nested_verbose_name(object, tuple_field):
+        for item in tuple_field:
+            if item == tuple_field[-1]:
+                verbose_name = object._meta_get_field(item).verbose_name 
+                break
+            new_object = getattr(object, item)
+            object = new_object
+        return verbose_name   
 
 class GeneralSection(PDFSection):
     '''This class generates the data for the general section of 
@@ -445,7 +463,7 @@ class WMOSection(PDFSection):
         'get_metc_display',
         'metc_details',
         'metc_institution',
-        'get_is_medical_display'        
+        'get_is_medical_display',      
     ]
 
     def __init__(self, object):
@@ -479,11 +497,10 @@ def render(self):
         For a subclass provide a tuple like so:
         ('wmo', 'metc')'''
         if type(self.field) == tuple:
-        #TODO: create a separate method for this!
-            obj = self.object
+            object = self.object
             for item in self.field:
-                value = getattr(obj, item)
-                obj = value
+                value = getattr(object, item)
+                object = value
 
         User = get_user_model()
 

From 027fa7cf21f547538496a0825654712aaea96ada Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 30 Aug 2023 12:14:54 +0200
Subject: [PATCH 006/148] workaround for different label & value + metc sect

---
 .../templates/proposals/pdf/new_pdf_test.html |  1 +
 proposals/urls.py                             |  4 +-
 proposals/utils/proposal_utils.py             | 82 ++++++++++++-------
 proposals/views/proposal_views.py             |  4 +-
 4 files changed, 59 insertions(+), 32 deletions(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index c03c57358..581889e8d 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -14,5 +14,6 @@
 {% block content %}
 
     {% include test %}
+    {% include wmo_test %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/urls.py b/proposals/urls.py
index d7dcd56e5..7a4e5e3d5 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -15,7 +15,8 @@
     ProposalSubmitPreApproved, ProposalUpdatePreApproved, \
     ProposalUsersOnlyArchiveView, \
     ProposalCopyAmendment, ProposalsPublicArchiveView, \
-    ProposalUpdateDataManagement, TranslatedConsentFormsView
+    ProposalUpdateDataManagement, TranslatedConsentFormsView, \
+    NewPDFViewTest
 
 from .views.study_views import StudyStart, StudyConsent
 from .views.wmo_views import WmoCreate, WmoUpdate, \
@@ -121,6 +122,7 @@
     path('diff/<int:pk>/', ProposalDifference.as_view(), name='diff'),
 
     path('pdf/<int:pk>/', ProposalAsPdf.as_view(), name='pdf'),
+    path('new_pdf/', NewPDFViewTest.as_view(), name='new_pdf'),
 
     # WMO
     path('wmo/create/<int:pk>/', include([
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 5b1f5726a..0d970c7dc 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -354,18 +354,13 @@ def generate_relevant_data_pdf(proposal):
 
 '''('created_by', 'email')'''
 
-# def access_foreignkey_getattr(object, field_tuple):
-    
-
-#     return value, verbose_name
 class PDFSection:
     
     section_title = None
     row_fields = None
     verbose_name_diff_field_dict = {
-        'get_metc_display': ('wmo', 'metc'),
-        'get_is_medical_display': ('wmo','is_medical')
-
+        ('wmo', 'get_metc_display'): ('wmo', 'metc'),
+        ('wmo', 'get_is_medical_display'): ('wmo','is_medical')
     }
 
     def __init__(self, object):
@@ -376,16 +371,42 @@ def __init__(self, object):
     def get_rows(self):
         rows = OrderedDict()
         for row_field in self._row_fields:
-            if type(row_field) == str:
-                rows[row_field] = {
-                'label': self.object._meta.get_field(row_field).verbose_name,
-                'value': RowValueClass(self.object, row_field).render()
-                }
-            elif type(row_field) == tuple:
-                rows[row_field[-1]] = {
-                'label': self.get_nested_verbose_name(self.object, row_field),
-                'value': RowValueClass(self.object, row_field).render()
-                }                
+            if row_field in self.verbose_name_diff_field_dict:
+                verbose_name = self.verbose_name_diff_field_dict[row_field]
+                '''This sequence checks for all combinations of tuples and strings
+                in the dict. Might not be neccessary, but is nice to account
+                for all possibilities'''
+                if type(row_field) == str and type(verbose_name) == str:
+                    rows[row_field] = {
+                    'label': self.object._meta.get_field(verbose_name).verbose_name,
+                    'value': RowValueClass(self.object, row_field).render()
+                    }
+                elif type(row_field) == tuple and type(verbose_name) == str:
+                    rows[row_field[-1]] = {
+                    'label': self.object._meta.get_field(verbose_name).verbose_name,
+                    'value': RowValueClass(self.object, row_field).render()
+                    }  
+                elif type(row_field) == str and type(verbose_name) == tuple:
+                    rows[row_field] = {
+                    'label': self.get_nested_verbose_name(self.object, verbose_name),
+                    'value': RowValueClass(self.object, row_field).render()
+                    }
+                else:
+                    rows[row_field[-1]] = {
+                    'label': self.get_nested_verbose_name(self.object, verbose_name),
+                    'value': RowValueClass(self.object, row_field).render()
+                    }  
+            else:
+                if type(row_field) == str:
+                    rows[row_field] = {
+                    'label': self.object._meta.get_field(row_field).verbose_name,
+                    'value': RowValueClass(self.object, row_field).render()
+                    }
+                elif type(row_field) == tuple:
+                    rows[row_field[-1]] = {
+                    'label': self.get_nested_verbose_name(self.object, row_field),
+                    'value': RowValueClass(self.object, row_field).render()
+                    }                
         return rows
 
     def render(self, context):
@@ -398,10 +419,10 @@ def render(self, context):
         )
         return template.render(context.flatten())
     
-    def get_nested_verbose_name(object, tuple_field):
+    def get_nested_verbose_name(self, object, tuple_field):
         for item in tuple_field:
             if item == tuple_field[-1]:
-                verbose_name = object._meta_get_field(item).verbose_name 
+                verbose_name = object._meta.get_field(item).verbose_name 
                 break
             new_object = getattr(object, item)
             object = new_object
@@ -460,24 +481,25 @@ class WMOSection(PDFSection):
 
     section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
     row_fields = [
-        'get_metc_display',
-        'metc_details',
-        'metc_institution',
-        'get_is_medical_display',      
+        ('wmo', 'get_metc_display'),
+        ('wmo', 'metc_details'),
+        ('wmo', 'metc_institution'),
+        ('wmo', 'get_is_medical_display'),      
     ]
 
-    def __init__(self, object):
-        super().__init__(self, object)
-        self.object = self.object.wmo
+    # def __init__(self, object):
+    #     super().__init__(self, object)
+    #     self.object = self.object.wmo
     
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
-        if not obj.metc == 'Y':
-            rows.remove('metc_details')
-            rows.remove('metc_institution')
+        if not obj.wmo.metc == 'Y':
+            rows.remove(('wmo', 'metc_details'))
+            rows.remove(('wmo', 'metc_institution'))
         else:
-            rows.remove('get_is_medical')
+            rows.remove(('wmo', 'get_is_medical_display'))
+        return super().get_rows()
     
 
     
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index ef1e70df2..fd5dd3450 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -578,7 +578,7 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
     template_name = 'proposals/proposal_diff.html'
 
-from proposals.utils.proposal_utils import GeneralSection
+from proposals.utils.proposal_utils import GeneralSection, WMOSection
 class NewPDFViewTest(generic.TemplateView):
 
     template_name = 'proposals/pdf/new_pdf_test.html'
@@ -586,8 +586,10 @@ class NewPDFViewTest(generic.TemplateView):
     def get_context_data(self, **kwargs):
         model = Proposal.objects.last()
         test = GeneralSection(model)
+        wmo_test = WMOSection(model)
         context = super().get_context_data(**kwargs)
         context['test'] = test
+        context['wmo_test'] = wmo_test
         return context
 
 

From b5b9b059507d7602ec65c1ba6a13b0334ee415ac Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 30 Aug 2023 14:48:40 +0200
Subject: [PATCH 007/148] metc section

---
 proposals/utils/proposal_utils.py | 32 ++++++++++++++++++++++++-------
 1 file changed, 25 insertions(+), 7 deletions(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 0d970c7dc..e67dd68e6 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -351,6 +351,7 @@ def generate_relevant_data_pdf(proposal):
 from django.utils.safestring import mark_safe
 from django.utils.html import format_html
 from copy import copy
+from django.conf import settings
 
 '''('created_by', 'email')'''
 
@@ -484,12 +485,8 @@ class WMOSection(PDFSection):
         ('wmo', 'get_metc_display'),
         ('wmo', 'metc_details'),
         ('wmo', 'metc_institution'),
-        ('wmo', 'get_is_medical_display'),      
+        ('wmo', 'get_is_medical_display'),  
     ]
-
-    # def __init__(self, object):
-    #     super().__init__(self, object)
-    #     self.object = self.object.wmo
     
     def get_rows(self):
         obj = self.object
@@ -501,8 +498,16 @@ def get_rows(self):
             rows.remove(('wmo', 'get_is_medical_display'))
         return super().get_rows()
     
+class METCSection(PDFSection):
 
+    section_title = _("Aanmelding bij de METC")
     
+    row_fields = [
+        ('wmo', 'metc_application'),
+        ('wmo', 'metc_decision'),
+        ('wmo', 'metc_decision_pdf')
+    ]
+
 class RowValueClass:
 
     def __init__(self, object, field):
@@ -541,6 +546,8 @@ def render(self):
                 return self.get_applicants_names(value)
             elif value.all().model == Funding:
                 return self.get_funding_list(value)
+        elif value.__class__.__name__ == 'FieldFile':
+            return self.handle_field_file(value, self.object)
         elif callable(value):
             return value()
         
@@ -568,8 +575,19 @@ def create_unordered_html_list(self, list):
         html_output += mark_safe('</ul>')
 
         return html_output
-
-
+    
+    def handle_field_file(self, field_file, object):
+        if object.wmo.metc_decision_pdf and not object.is_practice():
+            output = format_html('{}{}{}{}{}',
+                                mark_safe('<a href="'),
+                                f'{settings.BASE_URL}{field_file.url}',
+                                mark_safe('" target="_blank">'),
+                                _('Download'),
+                                mark_safe('</a>')
+                                )
+        else:
+            output = _('Niet aangeleverd')
+        return output
 
 def generate_pdf(proposal, template=False):
     """Grandfathered function for pdf saving. The template arg currently

From 2d907d9b04c9c4e3c13f9884953fdc04c8ae93ad Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 30 Aug 2023 14:52:52 +0200
Subject: [PATCH 008/148] include metc in template and view

---
 proposals/templates/proposals/pdf/new_pdf_test.html | 1 +
 proposals/views/proposal_views.py                   | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 581889e8d..7db055344 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -15,5 +15,6 @@
 
     {% include test %}
     {% include wmo_test %}
+    {% include metc_test %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index fd5dd3450..9a2ba873d 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -578,7 +578,7 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
     template_name = 'proposals/proposal_diff.html'
 
-from proposals.utils.proposal_utils import GeneralSection, WMOSection
+from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection
 class NewPDFViewTest(generic.TemplateView):
 
     template_name = 'proposals/pdf/new_pdf_test.html'
@@ -590,6 +590,9 @@ def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
         context['test'] = test
         context['wmo_test'] = wmo_test
+        if model.wmo.status != model.wmo.NO_WMO:
+            metc_test = METCSection(model)
+            context['metc_test'] = metc_test
         return context
 
 

From 18f29fe5759d2e8b5d8e5da1c0410d9bfce31f5b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 31 Aug 2023 14:40:32 +0200
Subject: [PATCH 009/148] first groundwork for studies

---
 .../templates/proposals/pdf/new_pdf_test.html |   7 +-
 .../proposals/pdf/table_with_header.html      |   3 +
 proposals/utils/proposal_utils.py             | 201 ++++++++++++------
 proposals/views/proposal_views.py             |  12 +-
 4 files changed, 152 insertions(+), 71 deletions(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 7db055344..51a390651 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -14,7 +14,10 @@
 {% block content %}
 
     {% include test %}
-    {% include wmo_test %}
-    {% include metc_test %}
+    {% include wmo_test %}studies_similar
+    {% if metc_test %}
+        {% include metc_test %}
+    {% endif %}
+    {% include trajectories_test  %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
index 0f0e00c65..5a1475941 100644
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -1,3 +1,6 @@
+{% if study_title %}
+    <h3> {{ study_title }} </h3>
+{% endif %}
 <h2> {{ section_title }} </h2>
 <table>
 {% for label, value in rows.items %}
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index e67dd68e6..f2ccabbde 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -19,8 +19,6 @@
 from main.utils import AvailableURL, get_secretary
 from studies.utils import study_urls
 
-from proposals.templatetags.proposal_filters import needs_details
-
 
 __all__ = ['available_urls', 'generate_ref_number',
            'generate_revision_ref_number', 'generate_pdf',
@@ -304,64 +302,26 @@ def _get_next_proposal_number(current_year) -> int:
     except Proposal.DoesNotExist:
         return 1
 
-def generate_relevant_data_pdf(proposal):
-    empty_dict = {}
-
-    empty_dict[_('Algemene informatie over de aanvraag')] = {}
-    empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('relation').verbose_name] = proposal.relation
-    if proposal.relation.needs_supervisor:
-        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('supervisor').verbose_name] = proposal.supervisor.get_full_name
-    if proposal.relation.check_in_course:
-        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_program').verbose_name] = proposal.student_program
-        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_context').verbose_name] = proposal.student_context
-        if proposal.student_context.needs_detail:
-            empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_context_detail').verbose_name] = proposal.student_context_details
-        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('student_justification').verbose_name] = proposal.student_justification
-    #I am not quite sure how to add translation to the boolean value resulting here ...
-    empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('other_applicants').verbose_name] = proposal.other_applicants
-    if proposal.other_applicants:
-        empty_dict[_('Algemene informatie over de aanvraag')][proposal._meta.get_field('applicants').verbose_name] = [applicant.get_full_name for applicant in proposal.applicants]
-
-    empty_dict[_('Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?')] = {}
-
-    if proposal.wmo.status != proposal.wmo.NO_WMO:
-        empty_dict[_("Aanmelding bij de METC")] = {}
-
-    empty_dict[_('Eén of meerdere trajecten?')] = {}
-
-    '''Note to self: this will be a huge pain of nesting ... only scratch surface for now ...'''
-    if proposal.wmo.status == proposal.wmo.NO_WMO:
-        for study in proposal.study_set.all():
-            if proposal.studies_number > 1:
-                empty_dict['studies'] = {}
-                if study.name:
-                    empty_dict['studies'][_(f'traject { study.order } { study.name }')] = {}
-                else:
-                    empty_dict['studies'][_(f'traject { study.order }')] = {}
-            else:
-                empty_dict['study'] = {}
-    
-    empty_dict['extra documents'] = []
-
-    empty_dict['Aanmelding versturen'] = {}
-
-    return empty_dict
-
 from django.contrib.auth import get_user_model
 from django.utils.safestring import mark_safe
 from django.utils.html import format_html
 from copy import copy
 from django.conf import settings
+from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
+necessity_required, has_adults
 
-'''('created_by', 'email')'''
+'''NOTE TO SELF:
+Might not  have to have the whole tuple system ...
+Would streamline code a lot.'''
 
 class PDFSection:
     
     section_title = None
+    study_title = None
     row_fields = None
     verbose_name_diff_field_dict = {
-        ('wmo', 'get_metc_display'): ('wmo', 'metc'),
-        ('wmo', 'get_is_medical_display'): ('wmo','is_medical')
+        'get_metc_display': 'metc',
+        'get_is_medical_display': 'is_medical'
     }
 
     def __init__(self, object):
@@ -479,35 +439,144 @@ def get_rows(self):
         return super().get_rows()
     
 class WMOSection(PDFSection):
-
+    '''Object for this section is proposal.wmo'''
     section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
     row_fields = [
-        ('wmo', 'get_metc_display'),
-        ('wmo', 'metc_details'),
-        ('wmo', 'metc_institution'),
-        ('wmo', 'get_is_medical_display'),  
+        'get_metc_display',
+        'metc_details',
+        'metc_institution',
+        'get_is_medical_display',  
     ]
     
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
         if not obj.wmo.metc == 'Y':
-            rows.remove(('wmo', 'metc_details'))
-            rows.remove(('wmo', 'metc_institution'))
+            rows.remove('metc_details')
+            rows.remove('metc_institution')
         else:
-            rows.remove(('wmo', 'get_is_medical_display'))
+            rows.remove('get_is_medical_display')
         return super().get_rows()
     
 class METCSection(PDFSection):
-
+    '''Object for this section is proposal.wmo'''
     section_title = _("Aanmelding bij de METC")
     
     row_fields = [
-        ('wmo', 'metc_application'),
-        ('wmo', 'metc_decision'),
-        ('wmo', 'metc_decision_pdf')
+        'metc_application',
+        'metc_decision',
+        'metc_decision_pdf'
+    ]
+    
+class TrajectoriesSection(PDFSection):
+
+    section_title = _("Eén of meerdere trajecten?")
+
+    row_fields = [
+        'studies_similar',
+        'studies_number'
+    ]
+    
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+        if obj.studies_similar:
+            rows.remove('studies_number')
+        return super().get_rows()
+    
+class StudySection(PDFSection):
+    '''object for this study is proposal.study'''
+    section_title = _('De Deelnemers')
+    row_fields = [
+        'age_groups',
+        'legally_incapable',
+        'legally_incapable_details',
+        'has_special_details',
+        'special_details',
+        'traits',
+        'traits_details',
+        'necessity',
+        'necessity_reason',
+        'recruitment',
+        'recruitment_details',
+        'compensation',
+        'compensation_details',
+        'hierarchy',
+        'hierarchy_details',
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+        if not has_adults(obj):
+            rows.remove('legally_incapable')
+            rows.remove('legally_incapable_details')
+        elif not obj.legally_incapable:
+            rows.remove('legally_incapable_details')
+        if not obj.has_special_details:
+            rows.remove('special_details')
+            rows.remove('traits')
+            rows.remove('traits_details')
+        elif not medical_traits(obj.special_details.all()):
+            rows.remove('traits')
+            rows.remove('traits_details')
+        elif not needs_details(obj.traits.all()):
+            rows.remove('traits_details')
+        if not necessity_required(obj):
+            rows.remove('necessity')
+            rows.remove('necessity_reason')
+        if not needs_details(obj.recruitment.all()):
+            rows.remove('recruitment_details')
+        if not obj.compensation.needs_details:
+            rows.remove('compensation_details')
+        if not obj.hierarchy:
+            rows.remove('hierarchy_details')
+        return super().get_rows()
+
+    def get_study_title(study):
+        if study.name:
+            study_title = format_html('{}{}{}{}{}',
+                                      _('Traject'),
+                                      study.order,
+                                      mark_safe('<em>'),
+                                      study.name,
+                                      mark_safe('</em>')
+            )
+        else:
+            study_title = format_html('{}{}',
+                                      _('Traject'),
+                                      {study.order}
+            )
+        return study_title
+        
+    def render(self, context):
+        template = get_template("proposals/pdf/table_with_header.html")
+        context.update(
+            {
+                "section_title": self.section_title,
+                '''Will this work? I dont know ...'''
+                "rows": self.get_rows(),
+            }
+        )
+        if self.object.proposal.studies_number > 1:
+            context.update(
+                {
+                    'study_title': self.get_study_title(self.object)
+                }
+            )
+        return template.render(context.flatten())
+    
+class TasksSection(PDFSection):
+    
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'tasks_number',       
     ]
 
+
 class RowValueClass:
 
     def __init__(self, object, field):
@@ -544,8 +613,8 @@ def render(self):
         elif value.__class__.__name__ == 'ManyRelatedManager':
             if value.all().model == User:
                 return self.get_applicants_names(value)
-            elif value.all().model == Funding:
-                return self.get_funding_list(value)
+            else:
+                return self.get_object_list(value)
         elif value.__class__.__name__ == 'FieldFile':
             return self.handle_field_file(value, self.object)
         elif callable(value):
@@ -558,9 +627,9 @@ def get_applicants_names(self, applicants):
         applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
         return self.create_unordered_html_list(applicant_names)
     
-    def get_funding_list(self, funding):
-        list_of_funds = [fund for fund in funding.all()]
-        return self.create_unordered_html_list(list_of_funds)
+    def get_object_list(self, object):
+        list_of_objects = [obj for obj in object.all()]
+        return self.create_unordered_html_list(list_of_objects)
     
     def create_unordered_html_list(self, list):
         html_output = mark_safe('<ul class="p-0">')
@@ -580,7 +649,7 @@ def handle_field_file(self, field_file, object):
         if object.wmo.metc_decision_pdf and not object.is_practice():
             output = format_html('{}{}{}{}{}',
                                 mark_safe('<a href="'),
-                                f'{settings.BASE_URL}{field_file.url}',
+                                f'{settings.BASE_URL}{field_file.url()}',
                                 mark_safe('" target="_blank">'),
                                 _('Download'),
                                 mark_safe('</a>')
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 9a2ba873d..868bf4344 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -578,7 +578,8 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
     template_name = 'proposals/proposal_diff.html'
 
-from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection
+from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
+TrajectoriesSection, StudySection
 class NewPDFViewTest(generic.TemplateView):
 
     template_name = 'proposals/pdf/new_pdf_test.html'
@@ -586,13 +587,18 @@ class NewPDFViewTest(generic.TemplateView):
     def get_context_data(self, **kwargs):
         model = Proposal.objects.last()
         test = GeneralSection(model)
-        wmo_test = WMOSection(model)
+        wmo_test = WMOSection(model.wmo)
+        trajectories_test = TrajectoriesSection(model)
         context = super().get_context_data(**kwargs)
         context['test'] = test
         context['wmo_test'] = wmo_test
         if model.wmo.status != model.wmo.NO_WMO:
-            metc_test = METCSection(model)
+            metc_test = METCSection(model.wmo)
             context['metc_test'] = metc_test
+        if model.wmo.status == model.wmo.NO_WMO:
+            for study in model.study_set.all():
+                study_test = StudySection(study)
+        context['trajectories_test'] = trajectories_test
         return context
 
 

From d68b8750e7034666cf21198d5407bd12ef45c867 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 4 Sep 2023 16:04:03 +0200
Subject: [PATCH 010/148] A lot of changes ... Started implementing studies

---
 .../templates/proposals/pdf/new_pdf_test.html |  12 +-
 .../proposals/pdf/table_with_header.html      |   3 +
 proposals/utils/proposal_utils.py             | 196 ++++++++++++++++--
 proposals/views/proposal_views.py             |  13 +-
 4 files changed, 199 insertions(+), 25 deletions(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 51a390651..156dd3703 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -14,10 +14,20 @@
 {% block content %}
 
     {% include test %}
-    {% include wmo_test %}studies_similar
+    {% include wmo_test %}
+
     {% if metc_test %}
         {% include metc_test %}
     {% endif %}
+
     {% include trajectories_test  %}
 
+    {% if studies %}
+        {% for study in studies %}
+            {% for study_section in study %}
+                {% include study_section %}
+            {% endfor %}
+        {% endfor %}
+    {% endif %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
index 5a1475941..838900091 100644
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -2,6 +2,9 @@
     <h3> {{ study_title }} </h3>
 {% endif %}
 <h2> {{ section_title }} </h2>
+{% if sub_study_title %}
+    <h3> {{ sub_study_title }} </h3>
+{% endif %}
 <table>
 {% for label, value in rows.items %}
 <tr>
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index f2ccabbde..177d4c1d3 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -314,6 +314,8 @@ def _get_next_proposal_number(current_year) -> int:
 Might not  have to have the whole tuple system ...
 Would streamline code a lot.'''
 
+'''TODO: Test multiple studies proposal'''
+
 class PDFSection:
     
     section_title = None
@@ -378,6 +380,7 @@ def render(self, context):
                 "rows": self.get_rows(),
             }
         )
+
         return template.render(context.flatten())
     
     def get_nested_verbose_name(self, object, tuple_field):
@@ -451,7 +454,7 @@ class WMOSection(PDFSection):
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
-        if not obj.wmo.metc == 'Y':
+        if not obj.metc == 'Y':
             rows.remove('metc_details')
             rows.remove('metc_institution')
         else:
@@ -533,7 +536,7 @@ def get_rows(self):
             rows.remove('hierarchy_details')
         return super().get_rows()
 
-    def get_study_title(study):
+    def get_study_title(self, study):
         if study.name:
             study_title = format_html('{}{}{}{}{}',
                                       _('Traject'),
@@ -550,23 +553,162 @@ def get_study_title(study):
         return study_title
         
     def render(self, context):
-        template = get_template("proposals/pdf/table_with_header.html")
-        context.update(
-            {
-                "section_title": self.section_title,
-                '''Will this work? I dont know ...'''
-                "rows": self.get_rows(),
-            }
-        )
         if self.object.proposal.studies_number > 1:
             context.update(
                 {
                     'study_title': self.get_study_title(self.object)
                 }
             )
-        return template.render(context.flatten())
+        return super().render(context)
+
+class InterventionSection(StudySection):
+    '''This class will receive a study object'''
+    section_title = _('Het interventieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'period',
+        'multiple_sessions', 
+        'session_frequency',
+        'amount_per_week',
+        'duration',
+        'measurement',
+        'experimenter',
+        'description',
+        'has_controls',
+        'controls_description',
+        'extra_task'
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if obj.version == 1:
+            fields_to_remove = ['multiple_sessions',
+                                'session_frequency',
+                                'extra_task']
+            rows = [field for field in rows if field not in fields_to_remove]
+        else:
+            rows.remove('amount_per_week')
+            if not obj.multiple_sessions:
+                rows.remove('session_frequency')
+            if obj.settings_contains_schools:
+                rows.remove('extra_task')
+        
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not obj.has_controls:
+            rows.remove('controls_description')          
+
+        return super(StudySection, self).get_rows()
     
-class TasksSection(PDFSection):
+    def render(self, context):
+        if self.object.study.proposal.studies_number > 1:
+            context.update(
+                {
+                    'sub_study_title': super().get_study_title(self.object.study)
+                }
+            )
+        return super(StudySection, self).render(context)
+    
+class ObservationSection(StudySection):
+    '''Gets passed an observation object'''
+    section_title = _('Het observatieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'days',
+        'mean_hours',
+        'details_who',
+        'details_why',
+        'details_frequency',
+        'is_anonymous',
+        'is_anonymous_details',
+        'is_in_target_group',
+        'is_in_target_group_details',
+        'is_nonpublic_space',
+        'is_nonpublic_space_details',
+        'has_advanced_consent',
+        'has_advanced_consent_details',
+        'needs_approval',
+        'approval_institution',
+        'approval_document',
+        'registrations',
+        'registrations_details'        
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if obj.version == 1:
+            to_remove_if_v1 = ['details_who',
+                            'details_why',
+                            'is_anonymous_details', 
+                            'is_in_target_group_details',
+                            'is_nonpublic_space_details',
+                            'has_advanced_consent_details'
+                            ]
+            rows = [field for field in rows if field not in to_remove_if_v1]
+            if not obj.is_nonpublic_space:
+                rows.remove('has_advanced_consent')
+            if not obj.needs_approval:
+                rows.remove('approval_institution')
+                rows.remove('approval_document')
+            elif obj.study.proposal.is_practice():
+                rows.remove('approval_document')
+        else:
+            to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
+            rows = [field for field in rows if field not in to_remove_if_v2]
+
+            if not obj.is_anonymous:
+                rows.remove('is_anonymous_details')
+            if not obj.is_in_target_group:
+                rows.remove('is_in_target_group_details')
+            if not obj.is_nonpublic_space:
+                rows.remove('is_nonpublic_space_details')
+                rows.remove('has_advanced_consent')
+                rows.remove('has_advanced_consent_details')
+            elif obj.has_advanced_consent:
+                rows.remove('has_advanced_consent_details')
+            if not needs_details(obj.setting.all(), 'is_school'):
+                rows.remove('needs_approval')
+            if not obj.needs_approval:
+                rows.remove('approval_institution')
+
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not needs_details(obj.registrations.all()):
+            rows.remove('registrations_details')
+        return super(StudySection, self).get_rows()
+    
+    def render(self, context):
+        if self.object.study.proposal.studies_number > 1:
+            context.update(
+                {
+                    'sub_study_title': super().get_study_title(self.object.study)
+                }
+            )
+        return super(StudySection, self).render(context)
+
+class SessionSection(PDFSection):
     
     row_fields = [
         'setting',
@@ -577,6 +719,7 @@ class TasksSection(PDFSection):
     ]
 
 
+
 class RowValueClass:
 
     def __init__(self, object, field):
@@ -646,16 +789,27 @@ def create_unordered_html_list(self, list):
         return html_output
     
     def handle_field_file(self, field_file, object):
-        if object.wmo.metc_decision_pdf and not object.is_practice():
-            output = format_html('{}{}{}{}{}',
-                                mark_safe('<a href="'),
-                                f'{settings.BASE_URL}{field_file.url()}',
-                                mark_safe('" target="_blank">'),
-                                _('Download'),
-                                mark_safe('</a>')
-                                )
+        from ..models import Proposal
+        if type(object) == Proposal:
+            if object.wmo.metc_decision_pdf and not object.is_practice():
+                output = format_html('{}{}{}{}{}',
+                                    mark_safe('<a href="'),
+                                    f'{settings.BASE_URL}{field_file.url()}',
+                                    mark_safe('" target="_blank">'),
+                                    _('Download'),
+                                    mark_safe('</a>')
+                                    )
+            else:
+                output = _('Niet aangeleverd')
         else:
-            output = _('Niet aangeleverd')
+            #if obj == Observation
+            output = format_html('{}{}{}{}{}',
+                                    mark_safe('<a href="'),
+                                    f'{settings.BASE_URL}{field_file.url()}',
+                                    mark_safe('" target="_blank">'),
+                                    _('Download'),
+                                    mark_safe('</a>')
+                                    )
         return output
 
 def generate_pdf(proposal, template=False):
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 868bf4344..e90a038a7 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -579,7 +579,7 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     template_name = 'proposals/proposal_diff.html'
 
 from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
-TrajectoriesSection, StudySection
+TrajectoriesSection, StudySection, InterventionSection, ObservationSection
 class NewPDFViewTest(generic.TemplateView):
 
     template_name = 'proposals/pdf/new_pdf_test.html'
@@ -595,10 +595,17 @@ def get_context_data(self, **kwargs):
         if model.wmo.status != model.wmo.NO_WMO:
             metc_test = METCSection(model.wmo)
             context['metc_test'] = metc_test
+        context['trajectories_test'] = trajectories_test
         if model.wmo.status == model.wmo.NO_WMO:
+            context['studies'] = []
             for study in model.study_set.all():
-                study_test = StudySection(study)
-        context['trajectories_test'] = trajectories_test
+                study_sections = []
+                study_sections.append(StudySection(study))
+                if study.has_intervention:
+                    study_sections.append(InterventionSection(study.intervention))
+                if study.has_observation:
+                    study_sections.append(ObservationSection(study.observation))
+                context['studies'].append(study_sections)
         return context
 
 

From 7dda34d2a535cf0bab7d4fe6bbe96d52f975a7f8 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 11 Sep 2023 14:08:26 +0200
Subject: [PATCH 011/148] Bugfixes and implementing sessions and tasks

---
 .../templates/proposals/pdf/new_pdf_test.html |  14 +-
 .../proposals/pdf/table_with_header.html      |   7 +-
 proposals/templatetags/proposal_filters.py    |   3 +
 proposals/utils/proposal_utils.py             | 184 ++++++++++++++----
 proposals/views/proposal_views.py             |  14 +-
 5 files changed, 178 insertions(+), 44 deletions(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 156dd3703..2bb8844d0 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -20,12 +20,22 @@
         {% include metc_test %}
     {% endif %}
 
-    {% include trajectories_test  %}
+    {% include trajectories_test %}
 
     {% if studies %}
         {% for study in studies %}
             {% for study_section in study %}
-                {% include study_section %}
+                {% if study_section | get_type == 'list' %}
+                    {% for session in study_section %}
+                        {% if session | get_type == 'list' %}
+                            {% for task in session %}
+                                {% include task %}
+                        {% else %}
+                            {% include session %}
+                    {% endfor %}
+                {% else %}
+                    {% include study_section %}
+                {% endif %}
             {% endfor %}
         {% endfor %}
     {% endif %}
diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
index 838900091..7511d8fe6 100644
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -1,10 +1,9 @@
+{% if section_title is not None %}
+    <h2> {{ section_title }} </h2>
+{% endif %}
 {% if study_title %}
     <h3> {{ study_title }} </h3>
 {% endif %}
-<h2> {{ section_title }} </h2>
-{% if sub_study_title %}
-    <h3> {{ sub_study_title }} </h3>
-{% endif %}
 <table>
 {% for label, value in rows.items %}
 <tr>
diff --git a/proposals/templatetags/proposal_filters.py b/proposals/templatetags/proposal_filters.py
index a323e32e5..12ff09a67 100644
--- a/proposals/templatetags/proposal_filters.py
+++ b/proposals/templatetags/proposal_filters.py
@@ -33,6 +33,9 @@ def necessity_required(study):
     age_groups = study.age_groups.values_list('id', flat=True)
     return check_necessity_required(study.proposal, age_groups, study.legally_incapable)
 
+@register.filter
+def get_type(value):
+    return type(value)
 
 @register.simple_tag
 def show_yesno(doubt=False):
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 177d4c1d3..e33addf92 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -369,7 +369,7 @@ def get_rows(self):
                     rows[row_field[-1]] = {
                     'label': self.get_nested_verbose_name(self.object, row_field),
                     'value': RowValueClass(self.object, row_field).render()
-                    }                
+                    }
         return rows
 
     def render(self, context):
@@ -390,7 +390,83 @@ def get_nested_verbose_name(self, object, tuple_field):
                 break
             new_object = getattr(object, item)
             object = new_object
-        return verbose_name   
+        return verbose_name
+    
+    def get_study_title(self, study):
+        if study.name:
+            study_title = format_html('{}{}{}{}{}',
+                                      _('Traject '),
+                                      study.order,
+                                      mark_safe(' <em>'),
+                                      study.name,
+                                      mark_safe(' </em>')
+            )
+        else:
+            study_title = format_html('{}{}',
+                                      _('Traject'),
+                                      {study.order}
+            )
+        return study_title
+    
+    def get_session_title(self, session):
+
+        order = session.order 
+        study_order = session.study.order 
+        study_name = session.study.name 
+        studies_number = session.study.proposal.studies_number 
+        sessions_number = session.study.sessions_number
+
+        if studies_number > 1 and sessions_number > 1:
+            session_title = format_html('{}{}{}{}{}{}{}',
+                                      _('Traject '),
+                                      study_order,
+                                      mark_safe(' <em>'),
+                                      study_name,
+                                      mark_safe(' </em>, '),
+                                      _('sessie '),
+                                      order
+            )
+        elif studies_number > 1:
+            session_title = format_html('{}{}{}{}{}',
+                                      _('Traject '),
+                                      study_order,
+                                      mark_safe(' <em>'),
+                                      study_name,
+                                      mark_safe(' </em>')
+            )
+        elif sessions_number >= 1:
+            session_title = format_html('{}{}',
+                                        _('Sessie '),
+                                        order
+            )
+        return session_title
+    
+    def get_task_title(task):
+        order=task.order 
+        session_order=task.session.order 
+        study_order=task.session.study.order 
+        study_name=task.session.study.name 
+        studies_number=task.session.study.proposal.studies_number
+        if studies_number > 1:
+            task_title = format_html('{}{}{}{}{}{}{}{}{}',
+                                      _('Traject '),
+                                      study_order,
+                                      mark_safe(' <em>'),
+                                      study_name,
+                                      mark_safe(' </em>, '),
+                                      _('sessie '),
+                                      session_order,
+                                      _(', taak '),
+                                      order
+            )
+        else:
+            task_title = format_html('{}{}{}{}',
+                                     _('Sessie '),
+                                     session_order,
+                                     _(', taak '),
+                                     order
+                                     )
+        return task_title
 
 class GeneralSection(PDFSection):
     '''This class generates the data for the general section of 
@@ -535,34 +611,18 @@ def get_rows(self):
         if not obj.hierarchy:
             rows.remove('hierarchy_details')
         return super().get_rows()
-
-    def get_study_title(self, study):
-        if study.name:
-            study_title = format_html('{}{}{}{}{}',
-                                      _('Traject'),
-                                      study.order,
-                                      mark_safe('<em>'),
-                                      study.name,
-                                      mark_safe('</em>')
-            )
-        else:
-            study_title = format_html('{}{}',
-                                      _('Traject'),
-                                      {study.order}
-            )
-        return study_title
         
     def render(self, context):
         if self.object.proposal.studies_number > 1:
             context.update(
                 {
-                    'study_title': self.get_study_title(self.object)
+                    'study_title': super().get_study_title(self.object)
                 }
             )
         return super().render(context)
 
-class InterventionSection(StudySection):
-    '''This class will receive a study object'''
+class InterventionSection(PDFSection):
+    '''This class will receive a intervention object'''
     section_title = _('Het interventieonderzoek')
     row_fields = [
         'setting',
@@ -590,7 +650,8 @@ def get_rows(self):
             fields_to_remove = ['multiple_sessions',
                                 'session_frequency',
                                 'extra_task']
-            rows = [field for field in rows if field not in fields_to_remove]
+            for field in fields_to_remove:
+                rows.remove(field)
         else:
             rows.remove('amount_per_week')
             if not obj.multiple_sessions:
@@ -609,18 +670,18 @@ def get_rows(self):
         if not obj.has_controls:
             rows.remove('controls_description')          
 
-        return super(StudySection, self).get_rows()
+        return super().get_rows()
     
     def render(self, context):
         if self.object.study.proposal.studies_number > 1:
             context.update(
                 {
-                    'sub_study_title': super().get_study_title(self.object.study)
+                    'study_title': super().get_study_title(self.object.study)
                 }
             )
-        return super(StudySection, self).render(context)
+        return super().render(context)
     
-class ObservationSection(StudySection):
+class ObservationSection(InterventionSection):
     '''Gets passed an observation object'''
     section_title = _('Het observatieonderzoek')
     row_fields = [
@@ -660,7 +721,9 @@ def get_rows(self):
                             'is_nonpublic_space_details',
                             'has_advanced_consent_details'
                             ]
-            rows = [field for field in rows if field not in to_remove_if_v1]
+            for field in to_remove_if_v1:
+                rows.remove(field)
+
             if not obj.is_nonpublic_space:
                 rows.remove('has_advanced_consent')
             if not obj.needs_approval:
@@ -670,7 +733,8 @@ def get_rows(self):
                 rows.remove('approval_document')
         else:
             to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
-            rows = [field for field in rows if field not in to_remove_if_v2]
+            for field in to_remove_if_v2:
+                rows.remove(field)
 
             if not obj.is_anonymous:
                 rows.remove('is_anonymous_details')
@@ -697,18 +761,19 @@ def get_rows(self):
             rows.remove('leader_has_coc')
         if not needs_details(obj.registrations.all()):
             rows.remove('registrations_details')
+
+        return super(InterventionSection, self).get_rows()
+
+class SessionsSection(StudySection):
+    '''Gets passed a study object'''
+    section_title = _("Het takenonderzoek en interviews")
+    row_fields = ['sessions_number']
+
+    def get_rows(self):
         return super(StudySection, self).get_rows()
-    
-    def render(self, context):
-        if self.object.study.proposal.studies_number > 1:
-            context.update(
-                {
-                    'sub_study_title': super().get_study_title(self.object.study)
-                }
-            )
-        return super(StudySection, self).render(context)
 
 class SessionSection(PDFSection):
+    '''Gets passed a session object'''
     
     row_fields = [
         'setting',
@@ -718,6 +783,51 @@ class SessionSection(PDFSection):
         'tasks_number',       
     ]
 
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+
+        return super().get_rows()
+    
+    def render(self, context):
+        context.update(
+            {
+                'study_title': super().get_session_title(self.object)
+            }
+        )
+        return super().render(context)
+    
+class TaskSection(PDFSection):
+    '''Gets passed a task object'''
+    
+    row_fields = [
+    
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        return super().get_rows()
+    
+    def render(self, context):
+        context.update(
+            {
+                'study_title': super().get_task_title(self.object)
+            }
+        )
+        return super().render(context)
+
+
 
 
 class RowValueClass:
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index e90a038a7..2a0f69541 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -579,7 +579,9 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     template_name = 'proposals/proposal_diff.html'
 
 from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
-TrajectoriesSection, StudySection, InterventionSection, ObservationSection
+TrajectoriesSection, StudySection, InterventionSection, ObservationSection, SessionsSection, \
+SessionSection, TaskSection
+
 class NewPDFViewTest(generic.TemplateView):
 
     template_name = 'proposals/pdf/new_pdf_test.html'
@@ -605,6 +607,16 @@ def get_context_data(self, **kwargs):
                     study_sections.append(InterventionSection(study.intervention))
                 if study.has_observation:
                     study_sections.append(ObservationSection(study.observation))
+                if study.has_sessions:
+                    study_sections.append(SessionsSection(study))
+                    sessions = []
+                    for session in study.session_set.all():
+                        sessions.append(SessionSection(session))
+                        tasks = []
+                        for task in session.task_set.all():
+                            tasks.append(TaskSection(task))
+                        sessions.append(tasks)
+                    study_sections.append(sessions)
                 context['studies'].append(study_sections)
         return context
 

From f95bc493ebf1c5c2954d107510a2f371b71c7db8 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 11 Sep 2023 15:52:00 +0200
Subject: [PATCH 012/148] Implemented session, tasks still produces bug

---
 .../templates/proposals/pdf/new_pdf_test.html | 14 +------
 proposals/templatetags/proposal_filters.py    |  4 --
 proposals/utils/proposal_utils.py             | 41 +++++++++++++++++--
 proposals/views/proposal_views.py             | 12 +++---
 4 files changed, 44 insertions(+), 27 deletions(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 2bb8844d0..6134cbbf3 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -25,19 +25,9 @@
     {% if studies %}
         {% for study in studies %}
             {% for study_section in study %}
-                {% if study_section | get_type == 'list' %}
-                    {% for session in study_section %}
-                        {% if session | get_type == 'list' %}
-                            {% for task in session %}
-                                {% include task %}
-                        {% else %}
-                            {% include session %}
-                    {% endfor %}
-                {% else %}
-                    {% include study_section %}
-                {% endif %}
+                {% include study_section %}
             {% endfor %}
-        {% endfor %}
+        {% endfor %}    
     {% endif %}
 
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/templatetags/proposal_filters.py b/proposals/templatetags/proposal_filters.py
index 12ff09a67..c243b42a4 100644
--- a/proposals/templatetags/proposal_filters.py
+++ b/proposals/templatetags/proposal_filters.py
@@ -33,10 +33,6 @@ def necessity_required(study):
     age_groups = study.age_groups.values_list('id', flat=True)
     return check_necessity_required(study.proposal, age_groups, study.legally_incapable)
 
-@register.filter
-def get_type(value):
-    return type(value)
-
 @register.simple_tag
 def show_yesno(doubt=False):
     result = '<ul>'
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index e33addf92..1b9657cf2 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -314,7 +314,6 @@ def _get_next_proposal_number(current_year) -> int:
 Might not  have to have the whole tuple system ...
 Would streamline code a lot.'''
 
-'''TODO: Test multiple studies proposal'''
 
 class PDFSection:
     
@@ -441,7 +440,7 @@ def get_session_title(self, session):
             )
         return session_title
     
-    def get_task_title(task):
+    def get_task_title(self, task):
         order=task.order 
         session_order=task.session.order 
         study_order=task.session.study.order 
@@ -810,13 +809,32 @@ class TaskSection(PDFSection):
     '''Gets passed a task object'''
     
     row_fields = [
-    
+        'name',
+        'durations',
+        'registrations',
+        'registrations_details',
+        'registration_kinds',
+        'registration_kinds_details',
+        'feedback',
+        'feedback_details',
+        'desctiption'
     ]
 
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
 
+        if not needs_details(obj.registrations.all()):
+            rows.remove['registrations_details']
+        if not needs_details(obj.registrations.all(), 'needs_kind') or \
+        not needs_details(obj.registration_kinds.all()):
+            rows.remove('registration_kinds')
+            rows.remove('registration_kinds_details')
+        elif not needs_details(obj.registration_kinds.all()):
+            rows.remove('registration_kinds_details')
+        if not obj.feedback:
+            rows.remove['feedback_details']    
+
         return super().get_rows()
     
     def render(self, context):
@@ -826,9 +844,24 @@ def render(self, context):
             }
         )
         return super().render(context)
+    
+class TasksOverviewSection(PDFSection):
+    '''Gets passed a session object'''
+    '''TODO: how to pass the net_duration to the verbose name?'''
 
+    row_fields = [
+        'tasks_duration'
+    ]
 
-
+    def render(self, context):
+        '''Here I am just overriding the render function, to get the correct formatting
+        The naming is a bit confusing, might fix later'''
+        context.update(
+            {
+                'study_title': _('Overzicht van het takenonderzoek')
+            }
+        )
+        return super().render(context)
 
 class RowValueClass:
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 2a0f69541..e9251778d 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -609,15 +609,13 @@ def get_context_data(self, **kwargs):
                     study_sections.append(ObservationSection(study.observation))
                 if study.has_sessions:
                     study_sections.append(SessionsSection(study))
-                    sessions = []
+                    # sessions = []
                     for session in study.session_set.all():
-                        sessions.append(SessionSection(session))
-                        tasks = []
-                        for task in session.task_set.all():
-                            tasks.append(TaskSection(task))
-                        sessions.append(tasks)
-                    study_sections.append(sessions)
+                        study_sections.append(SessionSection(session))
+                        # for task in session.task_set.all():
+                        #     study_sections.append(TaskSection(task))
                 context['studies'].append(study_sections)
+
         return context
 
 

From 29889434d9453f3bd832b74c40912ed8d1c88bc5 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 11 Sep 2023 16:17:41 +0200
Subject: [PATCH 013/148] minor thing

---
 proposals/views/proposal_views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index e9251778d..58b19ad95 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -609,7 +609,6 @@ def get_context_data(self, **kwargs):
                     study_sections.append(ObservationSection(study.observation))
                 if study.has_sessions:
                     study_sections.append(SessionsSection(study))
-                    # sessions = []
                     for session in study.session_set.all():
                         study_sections.append(SessionSection(session))
                         # for task in session.task_set.all():

From 7dab89535cd640e14805536e47524aca346e228d Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Sep 2023 10:43:24 +0200
Subject: [PATCH 014/148] Fixed tasks and renamed to make rows

---
 proposals/utils/proposal_utils.py | 43 ++++++++++++++++++-------------
 proposals/views/proposal_views.py |  4 +--
 2 files changed, 27 insertions(+), 20 deletions(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 1b9657cf2..d2d18bb19 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -330,9 +330,9 @@ def __init__(self, object):
         # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
         self._row_fields = copy(self.row_fields)
     
-    def get_rows(self):
+    def make_rows(self):
         rows = OrderedDict()
-        for row_field in self._row_fields:
+        for row_field in self.get_rows():
             if row_field in self.verbose_name_diff_field_dict:
                 verbose_name = self.verbose_name_diff_field_dict[row_field]
                 '''This sequence checks for all combinations of tuples and strings
@@ -376,12 +376,15 @@ def render(self, context):
         context.update(
             {
                 "section_title": self.section_title,
-                "rows": self.get_rows(),
+                "rows": self.make_rows(),
             }
         )
 
         return template.render(context.flatten())
     
+    def get_rows(self):
+        raise Exception('You forgot to define the get_rows function for your subclass!')
+    
     def get_nested_verbose_name(self, object, tuple_field):
         for item in tuple_field:
             if item == tuple_field[-1]:
@@ -513,8 +516,7 @@ def get_rows(self):
             rows.remove('funding_details')
         if not needs_details(obj.funding.all(), 'needs_name'):
             rows.remove('funding_name')
-        # Use the get_rows from PDFSection to get the actual rows, the code above should have filtered out everything we don't need
-        return super().get_rows()
+        return rows
     
 class WMOSection(PDFSection):
     '''Object for this section is proposal.wmo'''
@@ -534,10 +536,12 @@ def get_rows(self):
             rows.remove('metc_institution')
         else:
             rows.remove('get_is_medical_display')
-        return super().get_rows()
+        return rows
     
 class METCSection(PDFSection):
-    '''Object for this section is proposal.wmo'''
+    '''Object for this section is proposal.wmo
+    This class exists because the RowValueClass does some
+    funky things for working with the metc_decision_pdf field'''
     section_title = _("Aanmelding bij de METC")
     
     row_fields = [
@@ -545,6 +549,9 @@ class METCSection(PDFSection):
         'metc_decision',
         'metc_decision_pdf'
     ]
+
+    def get_rows(self):
+        return self._row_fields
     
 class TrajectoriesSection(PDFSection):
 
@@ -560,7 +567,7 @@ def get_rows(self):
         rows = self._row_fields
         if obj.studies_similar:
             rows.remove('studies_number')
-        return super().get_rows()
+        return rows
     
 class StudySection(PDFSection):
     '''object for this study is proposal.study'''
@@ -609,7 +616,7 @@ def get_rows(self):
             rows.remove('compensation_details')
         if not obj.hierarchy:
             rows.remove('hierarchy_details')
-        return super().get_rows()
+        return rows
         
     def render(self, context):
         if self.object.proposal.studies_number > 1:
@@ -669,7 +676,7 @@ def get_rows(self):
         if not obj.has_controls:
             rows.remove('controls_description')          
 
-        return super().get_rows()
+        return rows
     
     def render(self, context):
         if self.object.study.proposal.studies_number > 1:
@@ -761,7 +768,7 @@ def get_rows(self):
         if not needs_details(obj.registrations.all()):
             rows.remove('registrations_details')
 
-        return super(InterventionSection, self).get_rows()
+        return rows
 
 class SessionsSection(StudySection):
     '''Gets passed a study object'''
@@ -769,7 +776,7 @@ class SessionsSection(StudySection):
     row_fields = ['sessions_number']
 
     def get_rows(self):
-        return super(StudySection, self).get_rows()
+        return self._row_fields
 
 class SessionSection(PDFSection):
     '''Gets passed a session object'''
@@ -795,7 +802,7 @@ def get_rows(self):
         elif obj.supervision:
             rows.remove('leader_has_coc')
 
-        return super().get_rows()
+        return rows
     
     def render(self, context):
         context.update(
@@ -810,14 +817,14 @@ class TaskSection(PDFSection):
     
     row_fields = [
         'name',
-        'durations',
+        'duration',
         'registrations',
         'registrations_details',
         'registration_kinds',
         'registration_kinds_details',
         'feedback',
         'feedback_details',
-        'desctiption'
+        'description'
     ]
 
     def get_rows(self):
@@ -825,7 +832,7 @@ def get_rows(self):
         rows = self._row_fields
 
         if not needs_details(obj.registrations.all()):
-            rows.remove['registrations_details']
+            rows.remove('registrations_details')
         if not needs_details(obj.registrations.all(), 'needs_kind') or \
         not needs_details(obj.registration_kinds.all()):
             rows.remove('registration_kinds')
@@ -833,9 +840,9 @@ def get_rows(self):
         elif not needs_details(obj.registration_kinds.all()):
             rows.remove('registration_kinds_details')
         if not obj.feedback:
-            rows.remove['feedback_details']    
+            rows.remove('feedback_details')
 
-        return super().get_rows()
+        return rows
     
     def render(self, context):
         context.update(
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 58b19ad95..8fcaf634a 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -611,8 +611,8 @@ def get_context_data(self, **kwargs):
                     study_sections.append(SessionsSection(study))
                     for session in study.session_set.all():
                         study_sections.append(SessionSection(session))
-                        # for task in session.task_set.all():
-                        #     study_sections.append(TaskSection(task))
+                        for task in session.task_set.all():
+                            study_sections.append(TaskSection(task))
                 context['studies'].append(study_sections)
 
         return context

From 995449f9edb2662f7db31a55344c1c0ba40b9986 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Sep 2023 10:46:18 +0200
Subject: [PATCH 015/148] Simplified the make_rows function

---
 proposals/utils/proposal_utils.py | 41 ++++++-------------------------
 1 file changed, 8 insertions(+), 33 deletions(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index d2d18bb19..22213a206 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -335,40 +335,15 @@ def make_rows(self):
         for row_field in self.get_rows():
             if row_field in self.verbose_name_diff_field_dict:
                 verbose_name = self.verbose_name_diff_field_dict[row_field]
-                '''This sequence checks for all combinations of tuples and strings
-                in the dict. Might not be neccessary, but is nice to account
-                for all possibilities'''
-                if type(row_field) == str and type(verbose_name) == str:
-                    rows[row_field] = {
-                    'label': self.object._meta.get_field(verbose_name).verbose_name,
-                    'value': RowValueClass(self.object, row_field).render()
-                    }
-                elif type(row_field) == tuple and type(verbose_name) == str:
-                    rows[row_field[-1]] = {
-                    'label': self.object._meta.get_field(verbose_name).verbose_name,
-                    'value': RowValueClass(self.object, row_field).render()
-                    }  
-                elif type(row_field) == str and type(verbose_name) == tuple:
-                    rows[row_field] = {
-                    'label': self.get_nested_verbose_name(self.object, verbose_name),
-                    'value': RowValueClass(self.object, row_field).render()
-                    }
-                else:
-                    rows[row_field[-1]] = {
-                    'label': self.get_nested_verbose_name(self.object, verbose_name),
-                    'value': RowValueClass(self.object, row_field).render()
-                    }  
+                rows[row_field] = {
+                'label': mark_safe(self.object._meta.get_field(verbose_name).verbose_name),
+                'value': RowValueClass(self.object, row_field).render()
+                }
             else:
-                if type(row_field) == str:
-                    rows[row_field] = {
-                    'label': self.object._meta.get_field(row_field).verbose_name,
-                    'value': RowValueClass(self.object, row_field).render()
-                    }
-                elif type(row_field) == tuple:
-                    rows[row_field[-1]] = {
-                    'label': self.get_nested_verbose_name(self.object, row_field),
-                    'value': RowValueClass(self.object, row_field).render()
-                    }
+                rows[row_field] = {
+                'label': mark_safe(self.object._meta.get_field(row_field).verbose_name),
+                'value': RowValueClass(self.object, row_field).render()
+                }
         return rows
 
     def render(self, context):

From f63799187ef68a96dd5b72a14e11938ef77173a1 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Sep 2023 10:48:16 +0200
Subject: [PATCH 016/148] Removed all implementation of the tuple nesting

---
 proposals/utils/proposal_utils.py | 21 ++-------------------
 1 file changed, 2 insertions(+), 19 deletions(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 22213a206..cd35d6a9b 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -360,15 +360,6 @@ def render(self, context):
     def get_rows(self):
         raise Exception('You forgot to define the get_rows function for your subclass!')
     
-    def get_nested_verbose_name(self, object, tuple_field):
-        for item in tuple_field:
-            if item == tuple_field[-1]:
-                verbose_name = object._meta.get_field(item).verbose_name 
-                break
-            new_object = getattr(object, item)
-            object = new_object
-        return verbose_name
-    
     def get_study_title(self, study):
         if study.name:
             study_title = format_html('{}{}{}{}{}',
@@ -855,16 +846,8 @@ def __init__(self, object, field):
     def render(self):
         from ..models import Funding, Relation
 
-        if type(self.field) == str:
-            value = getattr(self.object, self.field)
-        '''A workaround for accessing subclasses:
-        For a subclass provide a tuple like so:
-        ('wmo', 'metc')'''
-        if type(self.field) == tuple:
-            object = self.object
-            for item in self.field:
-                value = getattr(object, item)
-                object = value
+
+        value = getattr(self.object, self.field)
 
         User = get_user_model()
 

From d880b1c9078fb36a32905effc57c2521e3729398 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Sep 2023 16:28:24 +0200
Subject: [PATCH 017/148] Implemented a RowClass. Much better

---
 .../proposals/pdf/table_with_header.html      |   4 +-
 proposals/utils/proposal_utils.py             | 152 +++++++++++++++---
 proposals/views/proposal_views.py             |   4 +-
 3 files changed, 131 insertions(+), 29 deletions(-)

diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
index 7511d8fe6..d7560b7eb 100644
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -5,9 +5,9 @@ <h2> {{ section_title }} </h2>
     <h3> {{ study_title }} </h3>
 {% endif %}
 <table>
-{% for label, value in rows.items %}
+{% for row in rows %}
 <tr>
-<th>{{ value.label }}</th><td>{{ value.value }}</td>
+<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
 </tr>
 {% endfor %}
 </table>
\ No newline at end of file
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index cd35d6a9b..5a5ca617d 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -329,29 +329,13 @@ def __init__(self, object):
         self.object = object
         # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
         self._row_fields = copy(self.row_fields)
-    
-    def make_rows(self):
-        rows = OrderedDict()
-        for row_field in self.get_rows():
-            if row_field in self.verbose_name_diff_field_dict:
-                verbose_name = self.verbose_name_diff_field_dict[row_field]
-                rows[row_field] = {
-                'label': mark_safe(self.object._meta.get_field(verbose_name).verbose_name),
-                'value': RowValueClass(self.object, row_field).render()
-                }
-            else:
-                rows[row_field] = {
-                'label': mark_safe(self.object._meta.get_field(row_field).verbose_name),
-                'value': RowValueClass(self.object, row_field).render()
-                }
-        return rows
 
     def render(self, context):
         template = get_template("proposals/pdf/table_with_header.html")
         context.update(
             {
                 "section_title": self.section_title,
-                "rows": self.make_rows(),
+                "rows": self.get_rows(),
             }
         )
 
@@ -463,6 +447,7 @@ class GeneralSection(PDFSection):
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
+
         if not obj.relation.needs_supervisor:
             rows.remove('supervisor')
         if not obj.relation.check_in_course:
@@ -482,6 +467,9 @@ def get_rows(self):
             rows.remove('funding_details')
         if not needs_details(obj.funding.all(), 'needs_name'):
             rows.remove('funding_name')
+
+        rows = [RowClass(obj, field) for field in rows]
+
         return rows
     
 class WMOSection(PDFSection):
@@ -497,11 +485,15 @@ class WMOSection(PDFSection):
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
+
         if not obj.metc == 'Y':
             rows.remove('metc_details')
             rows.remove('metc_institution')
         else:
             rows.remove('get_is_medical_display')
+
+        rows = [RowClass(obj, field) for field in rows]
+
         return rows
     
 class METCSection(PDFSection):
@@ -517,7 +509,10 @@ class METCSection(PDFSection):
     ]
 
     def get_rows(self):
-        return self._row_fields
+
+        rows = [RowClass(self.object, field) for field in self._row_fields]
+
+        return rows
     
 class TrajectoriesSection(PDFSection):
 
@@ -531,8 +526,12 @@ class TrajectoriesSection(PDFSection):
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
+
         if obj.studies_similar:
             rows.remove('studies_number')
+
+        rows = [RowClass(obj, field) for field in rows]
+
         return rows
     
 class StudySection(PDFSection):
@@ -559,6 +558,7 @@ class StudySection(PDFSection):
     def get_rows(self):
         obj = self.object
         rows = self._row_fields
+
         if not has_adults(obj):
             rows.remove('legally_incapable')
             rows.remove('legally_incapable_details')
@@ -582,6 +582,9 @@ def get_rows(self):
             rows.remove('compensation_details')
         if not obj.hierarchy:
             rows.remove('hierarchy_details')
+
+        rows = [RowClass(obj, field) for field in rows]
+
         return rows
         
     def render(self, context):
@@ -640,7 +643,9 @@ def get_rows(self):
         elif obj.supervision:
             rows.remove('leader_has_coc')
         if not obj.has_controls:
-            rows.remove('controls_description')          
+            rows.remove('controls_description')   
+
+        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
@@ -733,17 +738,22 @@ def get_rows(self):
             rows.remove('leader_has_coc')
         if not needs_details(obj.registrations.all()):
             rows.remove('registrations_details')
+        
+        rows = [RowClass(obj, field) for field in rows]
 
         return rows
 
 class SessionsSection(StudySection):
-    '''Gets passed a study object'''
+    '''Gets passed a study object
+    This Section looks maybe a bit unnecessary, but it does remove some logic, plus
+    the study_title.html from the template.'''
     section_title = _("Het takenonderzoek en interviews")
-    row_fields = ['sessions_number']
 
     def get_rows(self):
-        return self._row_fields
 
+        rows = [RowValueClass(self.object, 'sessions_number')]
+
+        return rows
 class SessionSection(PDFSection):
     '''Gets passed a session object'''
     
@@ -767,6 +777,8 @@ def get_rows(self):
             rows.remove('leader_has_coc')
         elif obj.supervision:
             rows.remove('leader_has_coc')
+        
+        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
@@ -807,6 +819,8 @@ def get_rows(self):
             rows.remove('registration_kinds_details')
         if not obj.feedback:
             rows.remove('feedback_details')
+        
+        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
@@ -819,13 +833,21 @@ def render(self, context):
         return super().render(context)
     
 class TasksOverviewSection(PDFSection):
-    '''Gets passed a session object'''
-    '''TODO: how to pass the net_duration to the verbose name?'''
+    '''Gets passed a session object
+    This might be unecessary ... Maybe just use the existing template language ...
+    Because the verbose name of this field is formatted, the method for retrieving
+    the verbose name in the RowClass is quite convoluded.'''
 
     row_fields = [
         'tasks_duration'
     ]
 
+    def get_rows(self):
+
+        rows = [RowClass(self.object, field) for field in self._row_fields]
+
+        return rows
+
     def render(self, context):
         '''Here I am just overriding the render function, to get the correct formatting
         The naming is a bit confusing, might fix later'''
@@ -835,6 +857,78 @@ def render(self, context):
             }
         )
         return super().render(context)
+    
+class StudyOverviewSection(StudySection):
+    '''Receives a Study object'''
+
+    section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
+    row_fields = [
+        'deception',
+        'deception_details',
+        'negativity',
+        'negativity_details',
+        'stressful',
+        'stressful_details',
+        'risk',
+        'risk_details'
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        rows_to_remove = []
+        for x in range(0, 7, 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]
+
+        if not obj.has_sessions and not obj.deception == 'N':
+            rows.remove('deception')
+            rows.remove('deception_details')
+        elif not obj.has_sessions:
+            rows.remove('deception')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+class InformedConsentFormsSection(StudySection):
+    '''Receives a Documents object'''
+
+    section_title = _('Informed consent formulieren')
+
+    def get_rows(self):
+        rows = []
+        rows.append(RowClass(obj, field))
+
+class RowClass:
+
+    verbose_name_diff_field_dict = {
+        'get_metc_display': 'metc',
+        'get_is_medical_display': 'is_medical'
+    }
+
+    def __init__(self, object, field):
+        self.object = object
+        self.field = field
+    
+    def verbose_name(self):
+        if self.field in self.verbose_name_diff_field_dict:
+            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
+            verbose_name = self.get_verbose_name(verbose_name_field),
+        else:
+            verbose_name= self.get_verbose_name(self.field)
+        return verbose_name   
+    
+    def value(self):
+        return RowValueClass(self.object, self.field).render()
+    
+    def get_verbose_name(self, field):
+        if field != 'tasks_duration':
+            return mark_safe(self.object._meta.get_field(field).verbose_name)
+        else:
+            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
 
 class RowValueClass:
 
@@ -851,9 +945,11 @@ def render(self):
 
         User = get_user_model()
 
+        if value in ('Y', 'N', '?'):
+            return self.yes_no_doubt(value)
         if type(value) in (str, int, date):
             return value
-        if value is None:
+        elif value is None:
             return _('Onbekend')
         elif type(value) == bool:
             return _('Ja') if value else _('Nee')
@@ -910,7 +1006,6 @@ def handle_field_file(self, field_file, object):
             else:
                 output = _('Niet aangeleverd')
         else:
-            #if obj == Observation
             output = format_html('{}{}{}{}{}',
                                     mark_safe('<a href="'),
                                     f'{settings.BASE_URL}{field_file.url()}',
@@ -919,6 +1014,11 @@ def handle_field_file(self, field_file, object):
                                     mark_safe('</a>')
                                     )
         return output
+    
+    def yes_no_doubt(self, value):
+        from main.models import YES_NO_DOUBT
+        d = dict(YES_NO_DOUBT)
+        return d[value]
 
 def generate_pdf(proposal, template=False):
     """Grandfathered function for pdf saving. The template arg currently
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 8fcaf634a..825907de8 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -580,7 +580,7 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
 
 from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
 TrajectoriesSection, StudySection, InterventionSection, ObservationSection, SessionsSection, \
-SessionSection, TaskSection
+SessionSection, TaskSection, TasksOverviewSection, StudyOverviewSection
 
 class NewPDFViewTest(generic.TemplateView):
 
@@ -613,6 +613,8 @@ def get_context_data(self, **kwargs):
                         study_sections.append(SessionSection(session))
                         for task in session.task_set.all():
                             study_sections.append(TaskSection(task))
+                    study_sections.append(TasksOverviewSection(session))
+                study_sections.append(StudyOverviewSection(study))
                 context['studies'].append(study_sections)
 
         return context

From b8a04b9807fadb95448ffe3619d2e9bfcca8415a Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Sep 2023 17:00:47 +0200
Subject: [PATCH 018/148] informedConsent section

---
 proposals/utils/proposal_utils.py | 24 +++++++++++++++++++++---
 proposals/views/proposal_views.py |  4 +++-
 2 files changed, 24 insertions(+), 4 deletions(-)

diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 5a5ca617d..e1c00b329 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -893,15 +893,33 @@ def get_rows(self):
 
         return rows
     
-class InformedConsentFormsSection(StudySection):
+class InformedConsentFormsSection(InterventionSection):
     '''Receives a Documents object'''
 
     section_title = _('Informed consent formulieren')
 
+    '''TODO: Debug'''
     def get_rows(self):
+        obj = self.object
         rows = []
-        rows.append(RowClass(obj, field))
-
+        rows.append(RowClass(obj.proposal, 'translated_forms'))
+        if obj.proposal.translated_forms:
+            rows.append(RowClass(obj.proposal, 'translated_forms_languages'))
+        if not obj.proposal.is_practice and obj.informed_consent:
+            rows.append(RowClass(obj, 'informed_consent'))
+            rows.append(RowClass(obj, 'briefing'))
+        if obj.study.passive_consent is not None:
+            rows.append(RowClass(obj.study, 'passive_consent'))
+        if obj.study.passive_consent:
+            rows.append(RowClass(obj.study, 'passive_consent_details'))
+        if obj.director_consent_declaration:
+            rows.append(RowClass(obj, 'director_consent_declaration'))
+        if obj.director_consent_information:
+            rows.append(RowClass(obj, 'director_consent_information')) 
+        if obj.parents_information:
+            rows.append(RowClass(obj, 'parents_information'))
+        breakpoint()
+        return rows
 class RowClass:
 
     verbose_name_diff_field_dict = {
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 825907de8..41b877610 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -580,7 +580,8 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
 
 from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
 TrajectoriesSection, StudySection, InterventionSection, ObservationSection, SessionsSection, \
-SessionSection, TaskSection, TasksOverviewSection, StudyOverviewSection
+SessionSection, TaskSection, TasksOverviewSection, StudyOverviewSection, \
+InformedConsentFormsSection
 
 class NewPDFViewTest(generic.TemplateView):
 
@@ -615,6 +616,7 @@ def get_context_data(self, **kwargs):
                             study_sections.append(TaskSection(task))
                     study_sections.append(TasksOverviewSection(session))
                 study_sections.append(StudyOverviewSection(study))
+                study_sections.append(InformedConsentFormsSection(study.documents))
                 context['studies'].append(study_sections)
 
         return context

From f3cce5685a761126e0fa5446d50f1c1d698f914f Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Sep 2023 11:16:51 +0200
Subject: [PATCH 019/148] Finishing touches and reorganizing

---
 main/models.py                                |   6 +-
 .../templates/proposals/pdf/new_pdf_test.html |  12 +
 .../proposals/pdf/table_with_header.html      |   2 +-
 proposals/utils/__init__.py                   |   3 +-
 proposals/utils/pdf_diff_logic.py             | 779 ++++++++++++++++++
 proposals/utils/proposal_utils.py             | 744 +----------------
 proposals/views/proposal_views.py             |  15 +-
 7 files changed, 813 insertions(+), 748 deletions(-)
 create mode 100644 proposals/utils/pdf_diff_logic.py

diff --git a/main/models.py b/main/models.py
index 18d5d409a..bdbcac5a5 100644
--- a/main/models.py
+++ b/main/models.py
@@ -5,9 +5,9 @@
 NO = 'N'
 DOUBT = '?'
 YES_NO_DOUBT = (
-    (YES, _('ja')),
-    (NO, _('nee')),
-    (DOUBT, _('twijfel')),
+    (YES, _('Ja')),
+    (NO, _('Nee')),
+    (DOUBT, _('Twijfel')),
 )
 
 
diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 6134cbbf3..8bda7801e 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -30,4 +30,16 @@
         {% endfor %}    
     {% endif %}
 
+    {% if extra_documents %}
+        {% for document in extra_documents %}
+            {% include document %}
+        {% endfor %}
+    {% endif %}
+
+    {% if dmp_file %}
+        {% include dmp_file %}
+    {% endif %}
+
+    {% include embargo %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
index d7560b7eb..6b491d820 100644
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ b/proposals/templates/proposals/pdf/table_with_header.html
@@ -1,4 +1,4 @@
-{% if section_title is not None %}
+{% if section_title %}
     <h2> {{ section_title }} </h2>
 {% endif %}
 {% if study_title %}
diff --git a/proposals/utils/__init__.py b/proposals/utils/__init__.py
index 4661c3735..583297b59 100644
--- a/proposals/utils/__init__.py
+++ b/proposals/utils/__init__.py
@@ -1 +1,2 @@
-from .proposal_utils import *
\ No newline at end of file
+from .proposal_utils import *
+from .pdf_diff_logic import *
\ No newline at end of file
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
new file mode 100644
index 000000000..a018005db
--- /dev/null
+++ b/proposals/utils/pdf_diff_logic.py
@@ -0,0 +1,779 @@
+
+from datetime import date
+from copy import copy
+
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.template.loader import get_template
+from django.utils.html import format_html
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext as _
+
+from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
+necessity_required, has_adults
+
+class PDFSection:
+    
+    section_title = None
+    row_fields = None
+
+    def __init__(self, object):
+        self.object = object
+        # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
+        self._row_fields = copy(self.row_fields)
+
+    def render(self, context):
+        context = context.flatten()
+        template = get_template("proposals/pdf/table_with_header.html")
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.get_rows(),
+            }
+        )
+        return template.render(context)
+    
+    def get_rows(self):
+
+        rows = [RowClass(self.object, field) for field in self._row_fields]
+
+        return rows
+        
+    def get_study_title(self, study):
+        if study.name:
+            study_title = format_html('{}{}{}{}{}',
+                                      _('Traject '),
+                                      study.order,
+                                      mark_safe(' <em>'),
+                                      study.name,
+                                      mark_safe(' </em>')
+            )
+        else:
+            study_title = format_html('{}{}',
+                                      _('Traject'),
+                                      {study.order}
+            )
+        return study_title
+    
+    def get_session_title(self, session):
+
+        order = session.order 
+        study_order = session.study.order 
+        study_name = session.study.name 
+        studies_number = session.study.proposal.studies_number 
+        sessions_number = session.study.sessions_number
+
+        if studies_number > 1 and sessions_number > 1:
+            session_title = format_html('{}{}{}{}{}{}{}',
+                                      _('Traject '),
+                                      study_order,
+                                      mark_safe(' <em>'),
+                                      study_name,
+                                      mark_safe(' </em>, '),
+                                      _('sessie '),
+                                      order
+            )
+        elif studies_number > 1:
+            session_title = format_html('{}{}{}{}{}',
+                                      _('Traject '),
+                                      study_order,
+                                      mark_safe(' <em>'),
+                                      study_name,
+                                      mark_safe(' </em>')
+            )
+        elif sessions_number >= 1:
+            session_title = format_html('{}{}',
+                                        _('Sessie '),
+                                        order
+            )
+        return session_title
+    
+    def get_task_title(self, task):
+        order=task.order 
+        session_order=task.session.order 
+        study_order=task.session.study.order 
+        study_name=task.session.study.name 
+        studies_number=task.session.study.proposal.studies_number
+        if studies_number > 1:
+            task_title = format_html('{}{}{}{}{}{}{}{}{}',
+                                      _('Traject '),
+                                      study_order,
+                                      mark_safe(' <em>'),
+                                      study_name,
+                                      mark_safe(' </em>, '),
+                                      _('sessie '),
+                                      session_order,
+                                      _(', taak '),
+                                      order
+            )
+        else:
+            task_title = format_html('{}{}{}{}',
+                                     _('Sessie '),
+                                     session_order,
+                                     _(', taak '),
+                                     order
+                                     )
+        return task_title
+
+class GeneralSection(PDFSection):
+    '''This class generates the data for the general section of 
+    the PDF page.'''
+
+    section_title = _("Algemene informatie over de aanvraag")
+    row_fields = [
+        'relation',
+        'supervisor',
+        'student_program',
+        'student_context',
+        'student_context_details',
+        'student_justification',
+        'other_applicants',
+        'applicants',
+        'other_stakeholders',
+        'stakeholders',
+        'date_start',
+        'title',
+        'funding',
+        'funding_details',
+        'funding_name',
+        'self_assessment',
+    ]
+    
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not obj.relation.needs_supervisor:
+            rows.remove('supervisor')
+        if not obj.relation.check_in_course:
+            rows.remove('student_program')
+            rows.remove('student_context')
+            if obj.student_context is not None:
+                if not obj.student_context.needs_details:
+                    rows.remove('student_context_details')
+            else:
+                rows.remove('student_context_details')
+            rows.remove('student_justification')
+        if not obj.other_applicants:
+            rows.remove('applicants')
+        if not obj.other_stakeholders:
+            rows.remove('stakeholders')
+        if not needs_details(obj.funding.all()):
+            rows.remove('funding_details')
+        if not needs_details(obj.funding.all(), 'needs_name'):
+            rows.remove('funding_name')
+
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+class WMOSection(PDFSection):
+    '''Object for this section is proposal.wmo'''
+    section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
+    row_fields = [
+        'get_metc_display',
+        'metc_details',
+        'metc_institution',
+        'get_is_medical_display',  
+    ]
+    
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not obj.metc == 'Y':
+            rows.remove('metc_details')
+            rows.remove('metc_institution')
+        else:
+            rows.remove('get_is_medical_display')
+
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+class METCSection(PDFSection):
+    '''Object for this section is proposal.wmo
+    This class exists because the RowValueClass does some
+    funky things for working with the metc_decision_pdf field'''
+    section_title = _("Aanmelding bij de METC")
+    
+    row_fields = [
+        'metc_application',
+        'metc_decision',
+        'metc_decision_pdf'
+    ]
+    
+class TrajectoriesSection(PDFSection):
+
+    section_title = _("Eén of meerdere trajecten?")
+
+    row_fields = [
+        'studies_similar',
+        'studies_number'
+    ]
+    
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if obj.studies_similar:
+            rows.remove('studies_number')
+
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+class StudySection(PDFSection):
+    '''object for this study is proposal.study'''
+    section_title = _('De Deelnemers')
+    row_fields = [
+        'age_groups',
+        'legally_incapable',
+        'legally_incapable_details',
+        'has_special_details',
+        'special_details',
+        'traits',
+        'traits_details',
+        'necessity',
+        'necessity_reason',
+        'recruitment',
+        'recruitment_details',
+        'compensation',
+        'compensation_details',
+        'hierarchy',
+        'hierarchy_details',
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not has_adults(obj):
+            rows.remove('legally_incapable')
+            rows.remove('legally_incapable_details')
+        elif not obj.legally_incapable:
+            rows.remove('legally_incapable_details')
+        if not obj.has_special_details:
+            rows.remove('special_details')
+            rows.remove('traits')
+            rows.remove('traits_details')
+        elif not medical_traits(obj.special_details.all()):
+            rows.remove('traits')
+            rows.remove('traits_details')
+        elif not needs_details(obj.traits.all()):
+            rows.remove('traits_details')
+        if not necessity_required(obj):
+            rows.remove('necessity')
+            rows.remove('necessity_reason')
+        if not needs_details(obj.recruitment.all()):
+            rows.remove('recruitment_details')
+        if not obj.compensation.needs_details:
+            rows.remove('compensation_details')
+        if not obj.hierarchy:
+            rows.remove('hierarchy_details')
+
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+        
+    def render(self, context):
+        if self.object.proposal.studies_number > 1:
+            context.update(
+                {
+                    'study_title': super().get_study_title(self.object)
+                }
+            )
+        return super().render(context)
+
+class InterventionSection(PDFSection):
+    '''This class will receive a intervention object'''
+    section_title = _('Het interventieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'period',
+        'multiple_sessions', 
+        'session_frequency',
+        'amount_per_week',
+        'duration',
+        'measurement',
+        'experimenter',
+        'description',
+        'has_controls',
+        'controls_description',
+        'extra_task'
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if obj.version == 1:
+            fields_to_remove = ['multiple_sessions',
+                                'session_frequency',
+                                'extra_task']
+            for field in fields_to_remove:
+                rows.remove(field)
+        else:
+            rows.remove('amount_per_week')
+            if not obj.multiple_sessions:
+                rows.remove('session_frequency')
+            if obj.settings_contains_schools:
+                rows.remove('extra_task')
+        
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not obj.has_controls:
+            rows.remove('controls_description')   
+
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+    def render(self, context):
+        if self.object.study.proposal.studies_number > 1:
+            context.update(
+                {
+                    'study_title': super().get_study_title(self.object.study)
+                }
+            )
+        return super().render(context)
+    
+class ObservationSection(InterventionSection):
+    '''Gets passed an observation object'''
+    section_title = _('Het observatieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'days',
+        'mean_hours',
+        'details_who',
+        'details_why',
+        'details_frequency',
+        'is_anonymous',
+        'is_anonymous_details',
+        'is_in_target_group',
+        'is_in_target_group_details',
+        'is_nonpublic_space',
+        'is_nonpublic_space_details',
+        'has_advanced_consent',
+        'has_advanced_consent_details',
+        'needs_approval',
+        'approval_institution',
+        'approval_document',
+        'registrations',
+        'registrations_details'        
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if obj.version == 1:
+            to_remove_if_v1 = ['details_who',
+                            'details_why',
+                            'is_anonymous_details', 
+                            'is_in_target_group_details',
+                            'is_nonpublic_space_details',
+                            'has_advanced_consent_details'
+                            ]
+            for field in to_remove_if_v1:
+                rows.remove(field)
+
+            if not obj.is_nonpublic_space:
+                rows.remove('has_advanced_consent')
+            if not obj.needs_approval:
+                rows.remove('approval_institution')
+                rows.remove('approval_document')
+            elif obj.study.proposal.is_practice():
+                rows.remove('approval_document')
+        else:
+            to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
+            for field in to_remove_if_v2:
+                rows.remove(field)
+
+            if not obj.is_anonymous:
+                rows.remove('is_anonymous_details')
+            if not obj.is_in_target_group:
+                rows.remove('is_in_target_group_details')
+            if not obj.is_nonpublic_space:
+                rows.remove('is_nonpublic_space_details')
+                rows.remove('has_advanced_consent')
+                rows.remove('has_advanced_consent_details')
+            elif obj.has_advanced_consent:
+                rows.remove('has_advanced_consent_details')
+            if not needs_details(obj.setting.all(), 'is_school'):
+                rows.remove('needs_approval')
+            if not obj.needs_approval:
+                rows.remove('approval_institution')
+
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not needs_details(obj.registrations.all()):
+            rows.remove('registrations_details')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+
+class SessionsSection(StudySection):
+    '''Gets passed a study object
+    This Section looks maybe a bit unnecessary, but it does remove some logic, plus
+    the study_title.html from the template.'''
+
+    section_title = _("Het takenonderzoek en interviews")
+
+    def get_rows(self):
+
+        rows = [RowValueClass(self.object, 'sessions_number')]
+
+        return rows
+    
+class SessionSection(PDFSection):
+    '''Gets passed a session object'''
+    
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'tasks_number',       
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+    def render(self, context):
+        context.update(
+            {
+                'study_title': super().get_session_title(self.object)
+            }
+        )
+        return super().render(context)
+    
+class TaskSection(PDFSection):
+    '''Gets passed a task object'''
+    
+    row_fields = [
+        'name',
+        'duration',
+        'registrations',
+        'registrations_details',
+        'registration_kinds',
+        'registration_kinds_details',
+        'feedback',
+        'feedback_details',
+        'description'
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not needs_details(obj.registrations.all()):
+            rows.remove('registrations_details')
+        if not needs_details(obj.registrations.all(), 'needs_kind') or \
+        not needs_details(obj.registration_kinds.all()):
+            rows.remove('registration_kinds')
+            rows.remove('registration_kinds_details')
+        elif not needs_details(obj.registration_kinds.all()):
+            rows.remove('registration_kinds_details')
+        if not obj.feedback:
+            rows.remove('feedback_details')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+    def render(self, context):
+        context.update(
+            {
+                'study_title': super().get_task_title(self.object)
+            }
+        )
+        return super().render(context)
+    
+class TasksOverviewSection(PDFSection):
+    '''Gets passed a session object
+    This might be unecessary ... Maybe just use the existing template language ...
+    Because the verbose name of this field is formatted, the method for retrieving
+    the verbose name in the RowClass is quite convoluded.'''
+
+    row_fields = [
+        'tasks_duration'
+    ]
+
+    def render(self, context):
+        '''Here I am just overriding the render function, to get the correct formatting
+        The naming is a bit confusing, might fix later'''
+        context.update(
+            {
+                'study_title': _('Overzicht van het takenonderzoek')
+            }
+        )
+        return super().render(context)
+    
+class StudyOverviewSection(StudySection):
+    '''Receives a Study object'''
+
+    section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
+    row_fields = [
+        'deception',
+        'deception_details',
+        'negativity',
+        'negativity_details',
+        'stressful',
+        'stressful_details',
+        'risk',
+        'risk_details'
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        rows_to_remove = []
+        for x in range(0, 7, 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]
+
+        if not obj.has_sessions and not obj.deception == 'N':
+            rows.remove('deception')
+            rows.remove('deception_details')
+        elif not obj.has_sessions:
+            rows.remove('deception')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+class InformedConsentFormsSection(InterventionSection):
+    '''Receives a Documents object'''
+
+    section_title = _('Informed consent formulieren')
+
+    def get_rows(self):
+        obj = self.object
+
+        rows = []
+
+        rows.append(RowClass(obj.proposal, 'translated_forms'))
+        if obj.proposal.translated_forms:
+            rows.append(RowClass(obj.proposal, 'translated_forms_languages'))
+        if not obj.proposal.is_practice() and obj.informed_consent:
+            rows.append(RowClass(obj, 'informed_consent'))
+            rows.append(RowClass(obj, 'briefing'))
+        if obj.study.passive_consent is not None:
+            rows.append(RowClass(obj.study, 'passive_consent'))
+        if obj.study.passive_consent:
+            rows.append(RowClass(obj.study, 'passive_consent_details'))
+        if obj.director_consent_declaration:
+            rows.append(RowClass(obj, 'director_consent_declaration'))
+        if obj.director_consent_information:
+            rows.append(RowClass(obj, 'director_consent_information')) 
+        if obj.parents_information:
+            rows.append(RowClass(obj, 'parents_information'))
+
+        return rows
+    
+class ExtraDocumentsSection(PDFSection):
+    '''gets a documents object'''
+
+    row_fields = [
+        'informed_consent',
+        'briefing'
+    ]
+
+    def __init__(self, object, count):
+        super().__init__(object)
+        self.section_title = _('Extra formulieren ') + str(count)
+    
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not obj.informed_consent:
+            rows.remove('informed_consent')
+        if not obj.briefing:
+            rows.remove('briefing')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+    
+class DMPFileSection(PDFSection):
+    '''Gets passed a proposal object.'''
+
+    section_title = _('Data Management Plan')
+    
+    row_fields = ['dmp_file']
+
+class EmbargoSection(PDFSection):
+    '''Gets passed a proposal object'''
+
+    section_title = _('Aanmelding Versturen')
+
+    row_fields = [
+        'embargo',
+        'embargo_end_date'
+    ]
+
+    def get_rows(self):
+        obj = self.object
+        rows = self._row_fields
+
+        if not obj.embargo:
+            rows.remove('embargo_end_date')
+        
+        rows = [RowClass(obj, field) for field in rows]
+
+        return rows
+
+class RowClass:
+
+    verbose_name_diff_field_dict = {
+        'get_metc_display': 'metc',
+        'get_is_medical_display': 'is_medical'
+    }
+
+    def __init__(self, object, field):
+        self.object = object
+        self.field = field
+    
+    def verbose_name(self):
+        if self.field in self.verbose_name_diff_field_dict:
+            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
+            verbose_name = self.get_verbose_name(verbose_name_field)
+        else:
+            verbose_name= self.get_verbose_name(self.field)
+        return verbose_name   
+    
+    def value(self):
+        return RowValueClass(self.object, self.field).render()
+    
+    def get_verbose_name(self, field):
+        if field != 'tasks_duration':
+            return mark_safe(self.object._meta.get_field(field).verbose_name)
+        else:
+            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
+
+class RowValueClass:
+
+    def __init__(self, object, field):
+
+        self.object = object
+        self.field = field
+
+    def render(self):
+        from ..models import Funding, Relation
+
+
+        value = getattr(self.object, self.field)
+
+        User = get_user_model()
+
+        if value in ('Y', 'N', '?'):
+            return self.yes_no_doubt(value)
+        if type(value) in (str, int, date):
+            return value
+        elif value is None:
+            return _('Onbekend')
+        elif type(value) == bool:
+            return _('Ja') if value else _('Nee')
+        elif type(value) == User:
+            return self.handle_user(value)
+        elif type(value) == Relation:
+            return value.description
+        elif value.__class__.__name__ == 'ManyRelatedManager':
+            if value.all().model == User:
+                return self.get_applicants_names(value)
+            else:
+                return self.get_object_list(value)
+        elif value.__class__.__name__ == 'FieldFile':
+            return self.handle_field_file(value, self.object)
+        elif callable(value):
+            return value()
+        
+    def handle_user(self, user):
+        return user.get_full_name()
+    
+    def get_applicants_names(self, applicants):
+        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
+        return self.create_unordered_html_list(applicant_names)
+    
+    def get_object_list(self, object):
+        list_of_objects = [obj for obj in object.all()]
+        return self.create_unordered_html_list(list_of_objects)
+    
+    def create_unordered_html_list(self, list):
+        html_output = mark_safe('<ul class="p-0">')
+
+        for item in list:
+            html_output += format_html('{}{}{}',
+                mark_safe('<li>'),
+                item,
+                mark_safe('</li>')                
+            )
+        
+        html_output += mark_safe('</ul>')
+
+        return html_output
+    
+    def handle_field_file(self, field_file, object):
+        from ..models import Proposal
+        if object == Proposal and field_file == object.wmo.metc_decision_pdf:
+            if object.wmo.metc_decision_pdf and not object.is_practice():
+                output = format_html('{}{}{}{}{}',
+                                    mark_safe('<a href="'),
+                                    f'{settings.BASE_URL}{field_file.url}',
+                                    mark_safe('" target="_blank">'),
+                                    _('Download'),
+                                    mark_safe('</a>')
+                                    )
+            else:
+                output = _('Niet aangeleverd')
+        else:
+            output = format_html('{}{}{}{}{}',
+                                    mark_safe('<a href="'),
+                                    f'{settings.BASE_URL}{field_file.url}',
+                                    mark_safe('" target="_blank">'),
+                                    _('Download'),
+                                    mark_safe('</a>')
+                                    )
+        return output
+    
+    def yes_no_doubt(self, value):
+        from main.models import YES_NO_DOUBT
+        d = dict(YES_NO_DOUBT)
+        return d[value]
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index e1c00b329..79c3bbb21 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -1,7 +1,7 @@
 # -*- encoding: utf-8 -*-
 
-from collections import defaultdict, OrderedDict
-from datetime import datetime, date
+from collections import defaultdict
+from datetime import datetime
 from io import BytesIO
 import os
 
@@ -12,7 +12,7 @@
 from django.core.mail import send_mail
 from django.db.models import Q
 from django.urls import reverse
-from django.template.loader import render_to_string, get_template
+from django.template.loader import render_to_string,
 from django.utils.translation import activate, get_language, ugettext as _
 from django.utils.deconstruct import deconstructible
 
@@ -302,742 +302,6 @@ def _get_next_proposal_number(current_year) -> int:
     except Proposal.DoesNotExist:
         return 1
 
-from django.contrib.auth import get_user_model
-from django.utils.safestring import mark_safe
-from django.utils.html import format_html
-from copy import copy
-from django.conf import settings
-from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
-necessity_required, has_adults
-
-'''NOTE TO SELF:
-Might not  have to have the whole tuple system ...
-Would streamline code a lot.'''
-
-
-class PDFSection:
-    
-    section_title = None
-    study_title = None
-    row_fields = None
-    verbose_name_diff_field_dict = {
-        'get_metc_display': 'metc',
-        'get_is_medical_display': 'is_medical'
-    }
-
-    def __init__(self, object):
-        self.object = object
-        # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
-        self._row_fields = copy(self.row_fields)
-
-    def render(self, context):
-        template = get_template("proposals/pdf/table_with_header.html")
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": self.get_rows(),
-            }
-        )
-
-        return template.render(context.flatten())
-    
-    def get_rows(self):
-        raise Exception('You forgot to define the get_rows function for your subclass!')
-    
-    def get_study_title(self, study):
-        if study.name:
-            study_title = format_html('{}{}{}{}{}',
-                                      _('Traject '),
-                                      study.order,
-                                      mark_safe(' <em>'),
-                                      study.name,
-                                      mark_safe(' </em>')
-            )
-        else:
-            study_title = format_html('{}{}',
-                                      _('Traject'),
-                                      {study.order}
-            )
-        return study_title
-    
-    def get_session_title(self, session):
-
-        order = session.order 
-        study_order = session.study.order 
-        study_name = session.study.name 
-        studies_number = session.study.proposal.studies_number 
-        sessions_number = session.study.sessions_number
-
-        if studies_number > 1 and sessions_number > 1:
-            session_title = format_html('{}{}{}{}{}{}{}',
-                                      _('Traject '),
-                                      study_order,
-                                      mark_safe(' <em>'),
-                                      study_name,
-                                      mark_safe(' </em>, '),
-                                      _('sessie '),
-                                      order
-            )
-        elif studies_number > 1:
-            session_title = format_html('{}{}{}{}{}',
-                                      _('Traject '),
-                                      study_order,
-                                      mark_safe(' <em>'),
-                                      study_name,
-                                      mark_safe(' </em>')
-            )
-        elif sessions_number >= 1:
-            session_title = format_html('{}{}',
-                                        _('Sessie '),
-                                        order
-            )
-        return session_title
-    
-    def get_task_title(self, task):
-        order=task.order 
-        session_order=task.session.order 
-        study_order=task.session.study.order 
-        study_name=task.session.study.name 
-        studies_number=task.session.study.proposal.studies_number
-        if studies_number > 1:
-            task_title = format_html('{}{}{}{}{}{}{}{}{}',
-                                      _('Traject '),
-                                      study_order,
-                                      mark_safe(' <em>'),
-                                      study_name,
-                                      mark_safe(' </em>, '),
-                                      _('sessie '),
-                                      session_order,
-                                      _(', taak '),
-                                      order
-            )
-        else:
-            task_title = format_html('{}{}{}{}',
-                                     _('Sessie '),
-                                     session_order,
-                                     _(', taak '),
-                                     order
-                                     )
-        return task_title
-
-class GeneralSection(PDFSection):
-    '''This class generates the data for the general section of 
-    the PDF page.'''
-
-    section_title = _("Algemene informatie over de aanvraag")
-    row_fields = [
-        'relation',
-        'supervisor',
-        'student_program',
-        'student_context',
-        'student_context_details',
-        'student_justification',
-        'other_applicants',
-        'applicants',
-        'other_stakeholders',
-        'stakeholders',
-        'date_start',
-        'title',
-        'funding',
-        'funding_details',
-        'funding_name',
-        'self_assessment',
-    ]
-    
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if not obj.relation.needs_supervisor:
-            rows.remove('supervisor')
-        if not obj.relation.check_in_course:
-            rows.remove('student_program')
-            rows.remove('student_context')
-            if obj.student_context is not None:
-                if not obj.student_context.needs_details:
-                    rows.remove('student_context_details')
-            else:
-                rows.remove('student_context_details')
-            rows.remove('student_justification')
-        if not obj.other_applicants:
-            rows.remove('applicants')
-        if not obj.other_stakeholders:
-            rows.remove('stakeholders')
-        if not needs_details(obj.funding.all()):
-            rows.remove('funding_details')
-        if not needs_details(obj.funding.all(), 'needs_name'):
-            rows.remove('funding_name')
-
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-class WMOSection(PDFSection):
-    '''Object for this section is proposal.wmo'''
-    section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
-    row_fields = [
-        'get_metc_display',
-        'metc_details',
-        'metc_institution',
-        'get_is_medical_display',  
-    ]
-    
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if not obj.metc == 'Y':
-            rows.remove('metc_details')
-            rows.remove('metc_institution')
-        else:
-            rows.remove('get_is_medical_display')
-
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-class METCSection(PDFSection):
-    '''Object for this section is proposal.wmo
-    This class exists because the RowValueClass does some
-    funky things for working with the metc_decision_pdf field'''
-    section_title = _("Aanmelding bij de METC")
-    
-    row_fields = [
-        'metc_application',
-        'metc_decision',
-        'metc_decision_pdf'
-    ]
-
-    def get_rows(self):
-
-        rows = [RowClass(self.object, field) for field in self._row_fields]
-
-        return rows
-    
-class TrajectoriesSection(PDFSection):
-
-    section_title = _("Eén of meerdere trajecten?")
-
-    row_fields = [
-        'studies_similar',
-        'studies_number'
-    ]
-    
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if obj.studies_similar:
-            rows.remove('studies_number')
-
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-class StudySection(PDFSection):
-    '''object for this study is proposal.study'''
-    section_title = _('De Deelnemers')
-    row_fields = [
-        'age_groups',
-        'legally_incapable',
-        'legally_incapable_details',
-        'has_special_details',
-        'special_details',
-        'traits',
-        'traits_details',
-        'necessity',
-        'necessity_reason',
-        'recruitment',
-        'recruitment_details',
-        'compensation',
-        'compensation_details',
-        'hierarchy',
-        'hierarchy_details',
-    ]
-
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if not has_adults(obj):
-            rows.remove('legally_incapable')
-            rows.remove('legally_incapable_details')
-        elif not obj.legally_incapable:
-            rows.remove('legally_incapable_details')
-        if not obj.has_special_details:
-            rows.remove('special_details')
-            rows.remove('traits')
-            rows.remove('traits_details')
-        elif not medical_traits(obj.special_details.all()):
-            rows.remove('traits')
-            rows.remove('traits_details')
-        elif not needs_details(obj.traits.all()):
-            rows.remove('traits_details')
-        if not necessity_required(obj):
-            rows.remove('necessity')
-            rows.remove('necessity_reason')
-        if not needs_details(obj.recruitment.all()):
-            rows.remove('recruitment_details')
-        if not obj.compensation.needs_details:
-            rows.remove('compensation_details')
-        if not obj.hierarchy:
-            rows.remove('hierarchy_details')
-
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-        
-    def render(self, context):
-        if self.object.proposal.studies_number > 1:
-            context.update(
-                {
-                    'study_title': super().get_study_title(self.object)
-                }
-            )
-        return super().render(context)
-
-class InterventionSection(PDFSection):
-    '''This class will receive a intervention object'''
-    section_title = _('Het interventieonderzoek')
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'period',
-        'multiple_sessions', 
-        'session_frequency',
-        'amount_per_week',
-        'duration',
-        'measurement',
-        'experimenter',
-        'description',
-        'has_controls',
-        'controls_description',
-        'extra_task'
-    ]
-
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if obj.version == 1:
-            fields_to_remove = ['multiple_sessions',
-                                'session_frequency',
-                                'extra_task']
-            for field in fields_to_remove:
-                rows.remove(field)
-        else:
-            rows.remove('amount_per_week')
-            if not obj.multiple_sessions:
-                rows.remove('session_frequency')
-            if obj.settings_contains_schools:
-                rows.remove('extra_task')
-        
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        if not obj.has_controls:
-            rows.remove('controls_description')   
-
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-    def render(self, context):
-        if self.object.study.proposal.studies_number > 1:
-            context.update(
-                {
-                    'study_title': super().get_study_title(self.object.study)
-                }
-            )
-        return super().render(context)
-    
-class ObservationSection(InterventionSection):
-    '''Gets passed an observation object'''
-    section_title = _('Het observatieonderzoek')
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'days',
-        'mean_hours',
-        'details_who',
-        'details_why',
-        'details_frequency',
-        'is_anonymous',
-        'is_anonymous_details',
-        'is_in_target_group',
-        'is_in_target_group_details',
-        'is_nonpublic_space',
-        'is_nonpublic_space_details',
-        'has_advanced_consent',
-        'has_advanced_consent_details',
-        'needs_approval',
-        'approval_institution',
-        'approval_document',
-        'registrations',
-        'registrations_details'        
-    ]
-
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if obj.version == 1:
-            to_remove_if_v1 = ['details_who',
-                            'details_why',
-                            'is_anonymous_details', 
-                            'is_in_target_group_details',
-                            'is_nonpublic_space_details',
-                            'has_advanced_consent_details'
-                            ]
-            for field in to_remove_if_v1:
-                rows.remove(field)
-
-            if not obj.is_nonpublic_space:
-                rows.remove('has_advanced_consent')
-            if not obj.needs_approval:
-                rows.remove('approval_institution')
-                rows.remove('approval_document')
-            elif obj.study.proposal.is_practice():
-                rows.remove('approval_document')
-        else:
-            to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
-            for field in to_remove_if_v2:
-                rows.remove(field)
-
-            if not obj.is_anonymous:
-                rows.remove('is_anonymous_details')
-            if not obj.is_in_target_group:
-                rows.remove('is_in_target_group_details')
-            if not obj.is_nonpublic_space:
-                rows.remove('is_nonpublic_space_details')
-                rows.remove('has_advanced_consent')
-                rows.remove('has_advanced_consent_details')
-            elif obj.has_advanced_consent:
-                rows.remove('has_advanced_consent_details')
-            if not needs_details(obj.setting.all(), 'is_school'):
-                rows.remove('needs_approval')
-            if not obj.needs_approval:
-                rows.remove('approval_institution')
-
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        if not needs_details(obj.registrations.all()):
-            rows.remove('registrations_details')
-        
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-
-class SessionsSection(StudySection):
-    '''Gets passed a study object
-    This Section looks maybe a bit unnecessary, but it does remove some logic, plus
-    the study_title.html from the template.'''
-    section_title = _("Het takenonderzoek en interviews")
-
-    def get_rows(self):
-
-        rows = [RowValueClass(self.object, 'sessions_number')]
-
-        return rows
-class SessionSection(PDFSection):
-    '''Gets passed a session object'''
-    
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'tasks_number',       
-    ]
-
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-    def render(self, context):
-        context.update(
-            {
-                'study_title': super().get_session_title(self.object)
-            }
-        )
-        return super().render(context)
-    
-class TaskSection(PDFSection):
-    '''Gets passed a task object'''
-    
-    row_fields = [
-        'name',
-        'duration',
-        'registrations',
-        'registrations_details',
-        'registration_kinds',
-        'registration_kinds_details',
-        'feedback',
-        'feedback_details',
-        'description'
-    ]
-
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        if not needs_details(obj.registrations.all()):
-            rows.remove('registrations_details')
-        if not needs_details(obj.registrations.all(), 'needs_kind') or \
-        not needs_details(obj.registration_kinds.all()):
-            rows.remove('registration_kinds')
-            rows.remove('registration_kinds_details')
-        elif not needs_details(obj.registration_kinds.all()):
-            rows.remove('registration_kinds_details')
-        if not obj.feedback:
-            rows.remove('feedback_details')
-        
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-    def render(self, context):
-        context.update(
-            {
-                'study_title': super().get_task_title(self.object)
-            }
-        )
-        return super().render(context)
-    
-class TasksOverviewSection(PDFSection):
-    '''Gets passed a session object
-    This might be unecessary ... Maybe just use the existing template language ...
-    Because the verbose name of this field is formatted, the method for retrieving
-    the verbose name in the RowClass is quite convoluded.'''
-
-    row_fields = [
-        'tasks_duration'
-    ]
-
-    def get_rows(self):
-
-        rows = [RowClass(self.object, field) for field in self._row_fields]
-
-        return rows
-
-    def render(self, context):
-        '''Here I am just overriding the render function, to get the correct formatting
-        The naming is a bit confusing, might fix later'''
-        context.update(
-            {
-                'study_title': _('Overzicht van het takenonderzoek')
-            }
-        )
-        return super().render(context)
-    
-class StudyOverviewSection(StudySection):
-    '''Receives a Study object'''
-
-    section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
-    row_fields = [
-        'deception',
-        'deception_details',
-        'negativity',
-        'negativity_details',
-        'stressful',
-        'stressful_details',
-        'risk',
-        'risk_details'
-    ]
-
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
-
-        rows_to_remove = []
-        for x in range(0, 7, 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]
-
-        if not obj.has_sessions and not obj.deception == 'N':
-            rows.remove('deception')
-            rows.remove('deception_details')
-        elif not obj.has_sessions:
-            rows.remove('deception')
-        
-        rows = [RowClass(obj, field) for field in rows]
-
-        return rows
-    
-class InformedConsentFormsSection(InterventionSection):
-    '''Receives a Documents object'''
-
-    section_title = _('Informed consent formulieren')
-
-    '''TODO: Debug'''
-    def get_rows(self):
-        obj = self.object
-        rows = []
-        rows.append(RowClass(obj.proposal, 'translated_forms'))
-        if obj.proposal.translated_forms:
-            rows.append(RowClass(obj.proposal, 'translated_forms_languages'))
-        if not obj.proposal.is_practice and obj.informed_consent:
-            rows.append(RowClass(obj, 'informed_consent'))
-            rows.append(RowClass(obj, 'briefing'))
-        if obj.study.passive_consent is not None:
-            rows.append(RowClass(obj.study, 'passive_consent'))
-        if obj.study.passive_consent:
-            rows.append(RowClass(obj.study, 'passive_consent_details'))
-        if obj.director_consent_declaration:
-            rows.append(RowClass(obj, 'director_consent_declaration'))
-        if obj.director_consent_information:
-            rows.append(RowClass(obj, 'director_consent_information')) 
-        if obj.parents_information:
-            rows.append(RowClass(obj, 'parents_information'))
-        breakpoint()
-        return rows
-class RowClass:
-
-    verbose_name_diff_field_dict = {
-        'get_metc_display': 'metc',
-        'get_is_medical_display': 'is_medical'
-    }
-
-    def __init__(self, object, field):
-        self.object = object
-        self.field = field
-    
-    def verbose_name(self):
-        if self.field in self.verbose_name_diff_field_dict:
-            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
-            verbose_name = self.get_verbose_name(verbose_name_field),
-        else:
-            verbose_name= self.get_verbose_name(self.field)
-        return verbose_name   
-    
-    def value(self):
-        return RowValueClass(self.object, self.field).render()
-    
-    def get_verbose_name(self, field):
-        if field != 'tasks_duration':
-            return mark_safe(self.object._meta.get_field(field).verbose_name)
-        else:
-            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
-
-class RowValueClass:
-
-    def __init__(self, object, field):
-
-        self.object = object
-        self.field = field
-
-    def render(self):
-        from ..models import Funding, Relation
-
-
-        value = getattr(self.object, self.field)
-
-        User = get_user_model()
-
-        if value in ('Y', 'N', '?'):
-            return self.yes_no_doubt(value)
-        if type(value) in (str, int, date):
-            return value
-        elif value is None:
-            return _('Onbekend')
-        elif type(value) == bool:
-            return _('Ja') if value else _('Nee')
-        elif type(value) == User:
-            return self.handle_user(value)
-        elif type(value) == Relation:
-            return value.description
-        elif value.__class__.__name__ == 'ManyRelatedManager':
-            if value.all().model == User:
-                return self.get_applicants_names(value)
-            else:
-                return self.get_object_list(value)
-        elif value.__class__.__name__ == 'FieldFile':
-            return self.handle_field_file(value, self.object)
-        elif callable(value):
-            return value()
-        
-    def handle_user(self, user):
-        return user.get_full_name()
-    
-    def get_applicants_names(self, applicants):
-        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
-        return self.create_unordered_html_list(applicant_names)
-    
-    def get_object_list(self, object):
-        list_of_objects = [obj for obj in object.all()]
-        return self.create_unordered_html_list(list_of_objects)
-    
-    def create_unordered_html_list(self, list):
-        html_output = mark_safe('<ul class="p-0">')
-
-        for item in list:
-            html_output += format_html('{}{}{}',
-                mark_safe('<li>'),
-                item,
-                mark_safe('</li>')                
-            )
-        
-        html_output += mark_safe('</ul>')
-
-        return html_output
-    
-    def handle_field_file(self, field_file, object):
-        from ..models import Proposal
-        if type(object) == Proposal:
-            if object.wmo.metc_decision_pdf and not object.is_practice():
-                output = format_html('{}{}{}{}{}',
-                                    mark_safe('<a href="'),
-                                    f'{settings.BASE_URL}{field_file.url()}',
-                                    mark_safe('" target="_blank">'),
-                                    _('Download'),
-                                    mark_safe('</a>')
-                                    )
-            else:
-                output = _('Niet aangeleverd')
-        else:
-            output = format_html('{}{}{}{}{}',
-                                    mark_safe('<a href="'),
-                                    f'{settings.BASE_URL}{field_file.url()}',
-                                    mark_safe('" target="_blank">'),
-                                    _('Download'),
-                                    mark_safe('</a>')
-                                    )
-        return output
-    
-    def yes_no_doubt(self, value):
-        from main.models import YES_NO_DOUBT
-        d = dict(YES_NO_DOUBT)
-        return d[value]
-
 def generate_pdf(proposal, template=False):
     """Grandfathered function for pdf saving. The template arg currently
     only exists for backwards compatibility."""
@@ -1061,8 +325,6 @@ def generate_pdf(proposal, template=False):
 
     return proposal.pdf
 
-
-
 def pdf_link_callback(uri, rel):
     """
     Convert HTML URIs to absolute system paths so xhtml2pdf can access those
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 41b877610..4c75ceb5f 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -581,7 +581,7 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
 from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
 TrajectoriesSection, StudySection, InterventionSection, ObservationSection, SessionsSection, \
 SessionSection, TaskSection, TasksOverviewSection, StudyOverviewSection, \
-InformedConsentFormsSection
+InformedConsentFormsSection, ExtraDocumentsSection, DMPFileSection, EmbargoSection \
 
 class NewPDFViewTest(generic.TemplateView):
 
@@ -618,7 +618,18 @@ def get_context_data(self, **kwargs):
                 study_sections.append(StudyOverviewSection(study))
                 study_sections.append(InformedConsentFormsSection(study.documents))
                 context['studies'].append(study_sections)
-
+        extra_documents = []
+        for count, document in enumerate(Documents.objects.filter(
+            proposal = model,
+            study__isnull = True
+        )):
+            extra_documents.append(ExtraDocumentsSection(document, count+1))
+        if extra_documents:
+            context['extra_documents'] = extra_documents
+        if model.dmp_file:
+            context['dmp_file'] = DMPFileSection(model)
+        context['embargo'] = EmbargoSection(model)
+               
         return context
 
 

From d1c55b5cb7212dce94abd40bd54c9bbfeb6b74f5 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Sep 2023 14:31:12 +0200
Subject: [PATCH 020/148] Started implementing it for diff + organizing

---
 .../proposals/new_proposal_diff.html          | 180 +++++++++++
 .../proposals/pdf/diff_table_with_header.html |  33 ++
 .../templates/proposals/pdf/new_pdf_test.html |  48 ++-
 .../templates/proposals/proposal_pdf.html     | 131 +-------
 proposals/utils/pdf_diff_logic.py             | 281 ++++++++++--------
 proposals/utils/proposal_utils.py             |   2 +-
 proposals/views/proposal_views.py             |  77 +++--
 7 files changed, 460 insertions(+), 292 deletions(-)
 create mode 100644 proposals/templates/proposals/new_proposal_diff.html
 create mode 100644 proposals/templates/proposals/pdf/diff_table_with_header.html

diff --git a/proposals/templates/proposals/new_proposal_diff.html b/proposals/templates/proposals/new_proposal_diff.html
new file mode 100644
index 000000000..e5fee7cad
--- /dev/null
+++ b/proposals/templates/proposals/new_proposal_diff.html
@@ -0,0 +1,180 @@
+{% extends "base/base.html" %}
+
+{% load i18n %}
+{% load proposal_filters %}
+{% load static %}
+{% load uil_filters %}
+{% load get_field_name %}
+{% load diff_tags %}
+
+{% block header_title %}
+    {% trans "Overzicht van wijzigingen" %} - {{ block.super }}
+{% endblock %}
+
+{% block html_head %}
+    <script src="{% static 'main/js/htmldiff.js' %}"></script>
+    <script>
+        $(function () {
+            // Color changes between proposals
+            $('td:nth-child(2)').each(function () {
+                let old_el = $(this);
+                let new_el = old_el.next();
+                let before = html_to_tokens(old_el.html());
+                let after = html_to_tokens(new_el.html());
+                let ops = calculate_operations(before, after);
+
+                old_el.html(render_before_operations(before, after, ops));
+                new_el.html(render_after_operations(before, after, ops));
+            });
+            $("#loading-icon").hide();
+        });
+    </script>
+{% endblock %}
+
+{% block content %}
+    <div class="uu-inner-container">
+        <div class="col-12">
+            <h2>{% trans "Overzicht van wijzigingen" %}</h2>
+            <p>
+                {% trans "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten opzichte van de originele aanvraag." %}
+            </p>
+        </div>
+    </div>
+    <div class="uu-inner-container">
+        <div class="col-12 compare document-compare">
+            <div class="col-12 text-center mt-5 mb-5" id="loading-icon">
+                <img src="{% static 'main/images/loading.gif' %}"/>
+            </div>
+            {% with p_proposal=proposal.parent %}
+
+                {% include general %}
+                
+                {% with wmo=proposal.wmo %}
+                    {% with p_wmo=p_proposal.wmo %}
+                        <h2 class="mt-5 mb-1">{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
+                        <table class="proposals-diff ">
+                            <tr>
+                                <th class="proposals-diff-question"></th>
+                                <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+                                <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+                            </tr>
+                            <tr>
+                                <th>{% get_verbose_field_name "proposals" "wmo" "metc" %}</th>
+                                <td>{{ p_wmo.get_metc_display }}</td>
+                                <td>{{ wmo.get_metc_display }}</td>
+                            </tr>
+                            {% if wmo.metc == 'Y' or p_wmo.metc == 'Y' %}
+                                <tr>
+                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_details" %}</th>
+                                    <td>{{ p_wmo.metc_details }}</td>
+                                    <td>{{ wmo.metc_details }}</td>
+                                </tr>
+                                <tr>
+                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_institution" %}</th>
+                                    <td>{{ p_wmo.metc_institution }}</td>
+                                    <td>{{ wmo.metc_institution }}</td>
+                                </tr>
+                            {% else %}
+                                <tr>
+                                    <th>{% get_verbose_field_name "proposals" "wmo" "is_medical" %}</th>
+                                    <td>{{ p_wmo.get_is_medical_display }}</td>
+                                    <td>{{ wmo.get_is_medical_display }}</td>
+                                </tr>
+                            {% endif %}
+                        </table>
+
+                        {% if wmo.status != wmo.NO_WMO or p_wmo.status != p_wmo.NO_WMO %}
+                            <h2 class="mt-5 mb-1">{% trans "Aanmelding bij de METC" %}</h2>
+                            <table class="proposals-diff ">
+                                <tr>
+                                    <th class="proposals-diff-question"></th>
+                                    <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+                                    <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+                                </tr>
+                                <tr>
+                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_application" %}</th>
+                                    <td>{{ p_wmo.metc_application|yesno:_("ja,nee") }}</td>
+                                    <td>{{ wmo.metc_application|yesno:_("ja,nee") }}</td>
+                                </tr>
+                                <tr>
+                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision" %}</th>
+                                    <td>{{ p_wmo.metc_decision|yesno:_("ja,nee") }}</td>
+                                    <td>{{ wmo.metc_decision|yesno:_("ja,nee") }}</td>
+                                </tr>
+                                <tr>
+                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision_pdf" %}</th>
+                                    {% if p_wmo.metc_decision_pdf %}
+                                        <td><a href="{{ p_wmo.metc_decision_pdf.url }}"
+                                               target="_blank">{% trans "Download" %}</a></td>
+                                    {% endif %}
+                                    {% if wmo.metc_decision_pdf %}
+                                        <td><a href="{{ wmo.metc_decision_pdf.url }}"
+                                               target="_blank">{% trans "Download" %}</a></td>
+                                    {% endif %}
+                                </tr>
+                            </table>
+                        {% endif %}
+                    {% endwith %}
+                {% endwith %}
+
+                <h2 class="mt-5 mb-1">{% trans "Eén of meerdere trajecten?" %}</h2>
+                <table class="proposals-diff ">
+                    <tr>
+                        <th class="proposals-diff-question"></th>
+                        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+                        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+                    </tr>
+                    <tr>
+                        <th>{% get_verbose_field_name "proposals" "proposal" "studies_similar" %}</th>
+                        <td>{{ p_proposal.studies_similar|yesno:_("ja,nee") }}</td>
+                        <td>{{ proposal.studies_similar|yesno:_("ja,nee") }}</td>
+                    </tr>
+                    {% if not proposal.studies_similar or not p_proposal.studies_similar %}
+                        <tr>
+                            <th>{% get_verbose_field_name "proposals" "proposal" "studies_number" %}</th>
+                            <td>{{ p_proposal.studies_number }}</td>
+                            <td>{{ proposal.studies_number }}</td>
+                        </tr>
+                    {% endif %}
+                </table>
+
+                {% if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED %}
+                    {% include 'proposals/diff/study.html' %}
+
+                    <h2 class="mt-5 mb-1">{% trans "Concept-aanmelding versturen" %}</h2>
+                    <table class="proposals-diff ">
+                        <tr>
+                            <th class="proposals-diff-question"></th>
+                            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+                            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+                        </tr>
+                        <tr>
+                            <th>{% get_verbose_field_name "proposals" "proposal" "embargo" %}</th>
+                            <td>{{ p_proposal.embargo|yesno:_("ja,nee") }}</td>
+                            <td>{{ proposal.embargo|yesno:_("ja,nee") }}</td>
+                        </tr>
+                        {% if proposal.embargo or p_proposal.embargo %}
+                            <tr>
+                                <th>{% get_verbose_field_name "proposals" "proposal" "embargo_end_date" %}</th>
+                                <td>{{ p_proposal.embargo_end_date }}</td>
+                                <td>{{ proposal.embargo_end_date }}</td>
+                            </tr>
+                        {% endif %}
+                        <tr>
+                            <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
+                            <td>{{ p_proposal.comments }}</td>
+                            <td>{{ proposal.comments }}</td>
+                        </tr>
+                    </table>
+                {% endif %}
+            {% endwith %}
+
+            <p class="mt-5 float-right">
+                <button class="button" onclick="window.history.back();">
+                    {% trans "Terug naar de vorige pagina" %}
+                </button>
+            </p>
+
+        </div>
+    </div>
+{% endblock %}
diff --git a/proposals/templates/proposals/pdf/diff_table_with_header.html b/proposals/templates/proposals/pdf/diff_table_with_header.html
new file mode 100644
index 000000000..6c7c0b787
--- /dev/null
+++ b/proposals/templates/proposals/pdf/diff_table_with_header.html
@@ -0,0 +1,33 @@
+{% load i18n %}
+{% load proposal_filters %}
+{% load static %}
+{% load uil_filters %}
+{% load get_field_name %}
+{% load diff_tags %}
+
+{% if section_title %}
+    <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
+{% endif %}
+{% if study_title %}
+    <h3> {{ study_title }} </h3>
+{% endif %}
+<table class="proposals-diff ">
+    <tr>
+        <th class="proposals-diff-question"></th>
+        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+    </tr>
+{% for row in rows %}
+<tr>
+<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td><td>{{row.value_2}}</td>
+</tr>
+{% endfor %}
+</table>
+
+<h2 class="mt-3 mb-1">{% trans "Algemene informatie over de aanvraag" %}</h2>
+<table class="proposals-diff ">
+    <tr>
+        <th class="proposals-diff-question"></th>
+        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+    </tr>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 8bda7801e..74ed47785 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -13,14 +13,14 @@
 
 {% block content %}
 
-    {% include test %}
-    {% include wmo_test %}
+    {% include general %}
+    {% comment %} {% include wmo %}
 
-    {% if metc_test %}
-        {% include metc_test %}
+    {% if metc %}
+        {% include metc %}
     {% endif %}
 
-    {% include trajectories_test %}
+    {% include trajectories %}
 
     {% if studies %}
         {% for study in studies %}
@@ -42,4 +42,42 @@
 
     {% include embargo %}
 
+    {% include general %} {% endcomment %}
+
+    {% comment %} Code to copy into pdf file
+
+    <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
+    <p>{{ proposal.summary|linebreaks }}</p>
+
+    {% include wmo %}
+
+    {% if metc %}
+      {% include metc %}
+    {% endif %}
+
+    {% include trajectories %}
+
+    {% if studies %}
+      {% for study in studies %}
+        {% for study_section in study %}
+          {% include study_section %}
+        {% endfor %}
+      {% endfor %}    
+    {% endif %}
+
+    {% if dmp_file %}
+      {% include dmp_file %}
+    {% endif %}
+
+    {% if dmp_file %}
+      {% include dmp_file %}
+    {% endif %}
+
+    {% include embargo %}
+
+    <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
+      <p>
+        {{ proposal.comments }}
+      </p> {% endcomment %}
+
 {% endblock %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index dd3cc9f88..1dbbd27b0 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -79,136 +79,17 @@ <h2>{% trans 'Indiener' %}</h2>
           <th>{% trans 'E-mail' %}</th><td>{{ proposal.created_by.email }}</td>
         </tr>
       </table>
-      <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
-      <table>
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "relation" %}</th><td>{{ proposal.relation }}</td>
-        </tr>
-        {% if proposal.relation.needs_supervisor %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "supervisor" %}</th><td>{{ proposal.supervisor.get_full_name }}</td>
-          </tr>
-        {% endif %}
-        {% if proposal.relation.check_in_course %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "student_program" %}</th><td>{{ proposal.student_program }}</td>
-          </tr>
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "student_context" %}</th><td>{{ proposal.student_context }}</td>
-          </tr>
-          {% if proposal.student_context.needs_details %}
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "proposal" "student_context_details" %}</th><td>{{ proposal.student_context_details }}</td>
-            </tr>
-          {% endif %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "student_justification" %}</th><td>{{ proposal.student_justification }}</td>
-          </tr>
-        {% endif %}
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "other_applicants" %}</th><td>{{ proposal.other_applicants|yesno:_("ja,nee") }}</td>
-        </tr>
-        {% if proposal.other_applicants %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "applicants" %}</th><td>
-              <ul>
-                {% for applicant in proposal.applicants.all %}
-                  <li>
-                    {{ applicant.get_full_name }}
-                  </li>
-                {% endfor %}
-              </ul>
-            </td>
-          </tr>
-        {% endif %}
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "other_stakeholders" %}</th><td>{{ proposal.other_stakeholders|yesno:_("ja,nee") }}</td>
-        </tr>
-        {% if proposal.other_stakeholders %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "stakeholders" %}</th><td>{{ proposal.stakeholders }}</td>
-          </tr>
-        {% endif %}
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "date_start" %}</th><td>{{ proposal.date_start|default:_("onbekend") }}</td>
-        </tr>
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "title" %}</th><td>{{ proposal.title }}</td>
-        </tr>
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "funding" %}</th><td>{{ proposal.funding.all|unordered_list }}</td>
-        </tr>
-        {% if proposal.funding.all|needs_details %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "funding_details" %}</th><td>{{ proposal.funding_details }}</td>
-          </tr>
-        {% endif %}
-        {% if proposal.funding.all|needs_details:"needs_name" %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "funding_name" %}</th><td>{{ proposal.funding_name }}</td>
-          </tr>
-        {% endif %}
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "self_assessment" %}</th><td>{{ proposal.self_assessment }}</td>
-        </tr>
-      </table>
+      {% include general %}
       <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
       <p>{{ proposal.summary|linebreaks }}</p>
 
-      {% with wmo=proposal.wmo %}
-        <h2 style="page-break-before: always">{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
-        <table>
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "wmo" "metc" %}</th><td>{{ wmo.get_metc_display }}</td>
-          </tr>
-          {% if wmo.metc == 'Y' %}
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "wmo" "metc_details" %}</th><td>{{ wmo.metc_details }}</td>
-            </tr>
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "wmo" "metc_institution" %}</th><td>{{ wmo.metc_institution }}</td>
-            </tr>
-          {% else %}
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "wmo" "is_medical" %}</th><td>{{ wmo.get_is_medical_display }}</td>
-            </tr>
-          {% endif %}
-        </table>
+      {% include wmo %}
 
-        {% if wmo.status != wmo.NO_WMO %}
-          <h2 style="page-break-before: always">{% trans "Aanmelding bij de METC" %}</h2>
-          <table>
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "wmo" "metc_application" %}</th><td>{{ wmo.metc_application|yesno:_("ja,nee") }}</td>
-            </tr>
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision" %}</th><td>{{ wmo.metc_decision|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if wmo.metc_decision_pdf and not proposal.is_practice %}
-              <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision_pdf" %}</th><td><a href="{{ BASE_URL }}{{ wmo.metc_decision_pdf.url }}" target="_blank">{% trans "Download" %}</a></td>
-              </tr>
-            {% else %}
-              <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision_pdf" %}</th>
-                <td>{% trans "Niet aangeleverd" %}</td>
-              </tr>
-            {% endif %}
-          </table>
-        {% endif %}
-      {% endwith %}
+      {% if metc %}
+        {% include metc %}
+      {% endif %}
 
-      <h2 style="page-break-before: always">{% trans "Eén of meerdere trajecten?" %}</h2>
-      <table>
-        <tr>
-          <th>{% get_verbose_field_name "proposals" "proposal" "studies_similar" %}</th><td>{{ proposal.studies_similar|yesno:_("ja,nee") }}</td>
-        </tr>
-        {% if not proposal.studies_similar %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "studies_number" %}</th><td>{{ proposal.studies_number }}</td>
-          </tr>
-        {% endif %}
-      </table>
+      {% include trajectories %}
 
       {% if proposal.wmo.status == proposal.wmo.NO_WMO %}
         {% for study in proposal.study_set.all %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index a018005db..9f490713f 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -12,32 +12,53 @@
 from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
 necessity_required, has_adults
 
+from ..models import Relation
+
+'''NOTE: The current implementation does not account for page break formatting, present 
+in the previous pdf template'''
+
 class PDFSection:
     
     section_title = None
     row_fields = None
 
-    def __init__(self, object):
+    def __init__(self, object, object_2 = None):
         self.object = object
-        # Create a copy of the class level row_fields, such that we can safely manipulate it without changing the class value
-        self._row_fields = copy(self.row_fields)
+        self.object_2 = object_2
 
     def render(self, context):
         context = context.flatten()
-        template = get_template("proposals/pdf/table_with_header.html")
+        if self.object_2:
+            template = get_template("proposals/pdf/diff_table_with_header.html")
+        else:
+            template = get_template("proposals/pdf/table_with_header.html")
         context.update(
             {
                 "section_title": self.section_title,
-                "rows": self.get_rows(),
+                "rows": self.make_rows(),
             }
         )
         return template.render(context)
-    
-    def get_rows(self):
 
-        rows = [RowClass(self.object, field) for field in self._row_fields]
+    def make_rows(self):
+        if self.object_2:
+            row_fields_1 = self.get_row_fields(self.object)
+            row_fields_2 = self.get_row_fields(self.object_2)
+
+            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
+
+            #The merging above messes with the order, so I reorder it here
+            ordered_row_fields = [row for row in self.row_fields if row in row_fields_both]
+
+            rows = [RowClass(self.object, field, self.object_2) for field in ordered_row_fields]
+        else:
+            row_fields = self.get_row_fields(self.object)
 
+            rows = [RowClass(self.object, field) for field in row_fields]
         return rows
+    
+    def get_row_fields(self):
+        return self.row_fields
         
     def get_study_title(self, study):
         if study.name:
@@ -115,6 +136,125 @@ def get_task_title(self, task):
                                      )
         return task_title
 
+class RowClass:
+
+    verbose_name_diff_field_dict = {
+        'get_metc_display': 'metc',
+        'get_is_medical_display': 'is_medical'
+    }
+
+    def __init__(self, object, field, object_2 = None):
+        self.object = object
+        self.object_2 = object_2
+        self.field = field
+    
+    def verbose_name(self):
+        if self.field in self.verbose_name_diff_field_dict:
+            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
+            verbose_name = self.get_verbose_name(verbose_name_field)
+        else:
+            verbose_name= self.get_verbose_name(self.field)
+        return verbose_name   
+    
+    def value(self):
+        return RowValueClass(self.object, self.field).render()
+    
+    def value_2(self):
+        return RowValueClass(self.object_2, self.field).render()
+    
+    def get_verbose_name(self, field):
+        if field != 'tasks_duration':
+            return mark_safe(self.object._meta.get_field(field).verbose_name)
+        else:
+            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
+
+class RowValueClass:
+
+    def __init__(self, object, field):
+
+        self.object = object
+        self.field = field
+
+    def render(self):
+
+        value = getattr(self.object, self.field)
+
+        User = get_user_model()
+
+        if value in ('Y', 'N', '?'):
+            return self.yes_no_doubt(value)
+        if type(value) in (str, int, date):
+            return value
+        elif value is None:
+            return _('Onbekend')
+        elif type(value) == bool:
+            return _('Ja') if value else _('Nee')
+        elif type(value) == User:
+            return self.handle_user(value)
+        elif type(value) == Relation:
+            return value.description
+        elif value.__class__.__name__ == 'ManyRelatedManager':
+            if value.all().model == User:
+                return self.get_applicants_names(value)
+            else:
+                return self.get_object_list(value)
+        elif value.__class__.__name__ == 'FieldFile':
+            return self.handle_field_file(value, self.object)
+        elif callable(value):
+            return value()
+        
+    def handle_user(self, user):
+        return user.get_full_name()
+    
+    def get_applicants_names(self, applicants):
+        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
+        return self.create_unordered_html_list(applicant_names)
+    
+    def get_object_list(self, object):
+        list_of_objects = [obj for obj in object.all()]
+        return self.create_unordered_html_list(list_of_objects)
+    
+    def create_unordered_html_list(self, list):
+        html_output = mark_safe('<ul class="p-0">')
+
+        for item in list:
+            html_output += format_html('{}{}{}',
+                mark_safe('<li>'),
+                item,
+                mark_safe('</li>')                
+            )
+        
+        html_output += mark_safe('</ul>')
+
+        return html_output
+    
+    def handle_field_file(self, field_file, object):
+        from ..models import Proposal
+        if object == Proposal and field_file == object.wmo.metc_decision_pdf:
+            if object.wmo.metc_decision_pdf and not object.is_practice():
+                output = format_html('{}{}{}{}{}',
+                                    mark_safe('<a href="'),
+                                    f'{settings.BASE_URL}{field_file.url}',
+                                    mark_safe('" target="_blank">'),
+                                    _('Download'),
+                                    mark_safe('</a>')
+                                    )
+            else:
+                output = _('Niet aangeleverd')
+        else:
+            output = format_html('{}{}{}{}{}',
+                                    mark_safe('<a href="'),
+                                    f'{settings.BASE_URL}{field_file.url}',
+                                    mark_safe('" target="_blank">'),
+                                    _('Download'),
+                                    mark_safe('</a>')
+                                    )
+        return output
+    
+    def yes_no_doubt(self, value):
+        from main.models import YES_NO_DOUBT
+        d = dict(YES_NO_DOUBT)
+        return d[value]
 class GeneralSection(PDFSection):
     '''This class generates the data for the general section of 
     the PDF page.'''
@@ -139,9 +279,9 @@ class GeneralSection(PDFSection):
         'self_assessment',
     ]
     
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, object):
+        obj = object
+        rows = copy(self.row_fields)
 
         if not obj.relation.needs_supervisor:
             rows.remove('supervisor')
@@ -163,8 +303,6 @@ def get_rows(self):
         if not needs_details(obj.funding.all(), 'needs_name'):
             rows.remove('funding_name')
 
-        rows = [RowClass(obj, field) for field in rows]
-
         return rows
     
 class WMOSection(PDFSection):
@@ -660,120 +798,3 @@ def get_rows(self):
 
         return rows
 
-class RowClass:
-
-    verbose_name_diff_field_dict = {
-        'get_metc_display': 'metc',
-        'get_is_medical_display': 'is_medical'
-    }
-
-    def __init__(self, object, field):
-        self.object = object
-        self.field = field
-    
-    def verbose_name(self):
-        if self.field in self.verbose_name_diff_field_dict:
-            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
-            verbose_name = self.get_verbose_name(verbose_name_field)
-        else:
-            verbose_name= self.get_verbose_name(self.field)
-        return verbose_name   
-    
-    def value(self):
-        return RowValueClass(self.object, self.field).render()
-    
-    def get_verbose_name(self, field):
-        if field != 'tasks_duration':
-            return mark_safe(self.object._meta.get_field(field).verbose_name)
-        else:
-            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
-
-class RowValueClass:
-
-    def __init__(self, object, field):
-
-        self.object = object
-        self.field = field
-
-    def render(self):
-        from ..models import Funding, Relation
-
-
-        value = getattr(self.object, self.field)
-
-        User = get_user_model()
-
-        if value in ('Y', 'N', '?'):
-            return self.yes_no_doubt(value)
-        if type(value) in (str, int, date):
-            return value
-        elif value is None:
-            return _('Onbekend')
-        elif type(value) == bool:
-            return _('Ja') if value else _('Nee')
-        elif type(value) == User:
-            return self.handle_user(value)
-        elif type(value) == Relation:
-            return value.description
-        elif value.__class__.__name__ == 'ManyRelatedManager':
-            if value.all().model == User:
-                return self.get_applicants_names(value)
-            else:
-                return self.get_object_list(value)
-        elif value.__class__.__name__ == 'FieldFile':
-            return self.handle_field_file(value, self.object)
-        elif callable(value):
-            return value()
-        
-    def handle_user(self, user):
-        return user.get_full_name()
-    
-    def get_applicants_names(self, applicants):
-        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
-        return self.create_unordered_html_list(applicant_names)
-    
-    def get_object_list(self, object):
-        list_of_objects = [obj for obj in object.all()]
-        return self.create_unordered_html_list(list_of_objects)
-    
-    def create_unordered_html_list(self, list):
-        html_output = mark_safe('<ul class="p-0">')
-
-        for item in list:
-            html_output += format_html('{}{}{}',
-                mark_safe('<li>'),
-                item,
-                mark_safe('</li>')                
-            )
-        
-        html_output += mark_safe('</ul>')
-
-        return html_output
-    
-    def handle_field_file(self, field_file, object):
-        from ..models import Proposal
-        if object == Proposal and field_file == object.wmo.metc_decision_pdf:
-            if object.wmo.metc_decision_pdf and not object.is_practice():
-                output = format_html('{}{}{}{}{}',
-                                    mark_safe('<a href="'),
-                                    f'{settings.BASE_URL}{field_file.url}',
-                                    mark_safe('" target="_blank">'),
-                                    _('Download'),
-                                    mark_safe('</a>')
-                                    )
-            else:
-                output = _('Niet aangeleverd')
-        else:
-            output = format_html('{}{}{}{}{}',
-                                    mark_safe('<a href="'),
-                                    f'{settings.BASE_URL}{field_file.url}',
-                                    mark_safe('" target="_blank">'),
-                                    _('Download'),
-                                    mark_safe('</a>')
-                                    )
-        return output
-    
-    def yes_no_doubt(self, value):
-        from main.models import YES_NO_DOUBT
-        d = dict(YES_NO_DOUBT)
-        return d[value]
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 79c3bbb21..35bcc8136 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -12,7 +12,7 @@
 from django.core.mail import send_mail
 from django.db.models import Q
 from django.urls import reverse
-from django.template.loader import render_to_string,
+from django.template.loader import render_to_string
 from django.utils.translation import activate, get_language, ugettext as _
 from django.utils.deconstruct import deconstructible
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 4c75ceb5f..78bc1e5e2 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -12,13 +12,14 @@
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 #from easy_pdf.views import PDFTemplateResponseMixin, PDFTemplateView
-from typing import Tuple, Union
+from typing import Any, Tuple, Union
 
 from main.utils import get_document_contents, get_secretary, is_secretary
 from main.views import AllowErrorsOnBackbuttonMixin, CreateView, DeleteView, \
     UpdateView, UserAllowedMixin
 from observations.models import Observation
 from proposals.utils.validate_proposal import get_form_errors
+from proposals.utils.pdf_diff_logic import *
 from reviews.mixins import CommitteeMixin, UsersOrGroupsAllowedMixin
 from reviews.utils.review_utils import start_review, start_review_pre_assessment
 from studies.models import Documents
@@ -552,36 +553,54 @@ class ProposalAsPdf(LoginRequiredMixin, PDFTemplateResponseMixin,
     def get_context_data(self, **kwargs):
         """Adds 'BASE_URL' to template context"""
         context = super(ProposalAsPdf, self).get_context_data(**kwargs)
-        context['BASE_URL'] = settings.BASE_URL
 
-        if self.object.is_pre_approved:
-            self.template_name = 'proposals/proposal_pdf_pre_approved.html'
-        elif self.object.is_pre_assessment:
-            self.template_name = 'proposals/proposal_pdf_pre_assessment.html'
-
-        documents = {
-            'extra': []
-        }
-
-        for document in Documents.objects.filter(proposal=self.object).all():
-            if document.study:
-                documents[document.study.pk] = document
-            else:
-                documents['extra'].append(document)
-
-        context['documents'] = documents
+        context['general'] = GeneralSection(self.object)
+        context['wmo'] = WMOSection(self.object.wmo)
+        if self.object.wmo.status != self.object.wmo.NO_WMO:
+            context['metc'] = METCSection(self.object.wmo)
+        context['trajectories'] = TrajectoriesSection(self.object)
+        if self.object.wmo.status == self.object.wmo.NO_WMO:
+            context['studies'] = []
+            for study in self.object.study_set.all():
+                study_sections = []
+                study_sections.append(StudySection(study))
+                if study.has_intervention:
+                    study_sections.append(InterventionSection(study.intervention))
+                if study.has_observation:
+                    study_sections.append(ObservationSection(study.observation))
+                if study.has_sessions:
+                    study_sections.append(SessionsSection(study))
+                    for session in study.session_set.all():
+                        study_sections.append(SessionSection(session))
+                        for task in session.task_set.all():
+                            study_sections.append(TaskSection(task))
+                    study_sections.append(TasksOverviewSection(session))
+                study_sections.append(StudyOverviewSection(study))
+                study_sections.append(InformedConsentFormsSection(study.documents))
+                context['studies'].append(study_sections)
+        extra_documents = []
+        for count, document in enumerate(Documents.objects.filter(
+            proposal = self.object,
+            study__isnull = True
+        )):
+            extra_documents.append(ExtraDocumentsSection(document, count+1))
+        if extra_documents:
+            context['extra_documents'] = extra_documents
+        if self.object.dmp_file:
+            context['dmp_file'] = DMPFileSection(self.object)
+        context['embargo'] = EmbargoSection(self.object)
 
         return context
 
 
 class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
-    template_name = 'proposals/proposal_diff.html'
+    template_name = 'proposals/new_proposal_diff.html'
 
-from proposals.utils.proposal_utils import GeneralSection, WMOSection, METCSection, \
-TrajectoriesSection, StudySection, InterventionSection, ObservationSection, SessionsSection, \
-SessionSection, TaskSection, TasksOverviewSection, StudyOverviewSection, \
-InformedConsentFormsSection, ExtraDocumentsSection, DMPFileSection, EmbargoSection \
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+        context['general'] = GeneralSection(self.object.parent, self.object)
+        return context
 
 class NewPDFViewTest(generic.TemplateView):
 
@@ -589,16 +608,12 @@ class NewPDFViewTest(generic.TemplateView):
 
     def get_context_data(self, **kwargs):
         model = Proposal.objects.last()
-        test = GeneralSection(model)
-        wmo_test = WMOSection(model.wmo)
-        trajectories_test = TrajectoriesSection(model)
         context = super().get_context_data(**kwargs)
-        context['test'] = test
-        context['wmo_test'] = wmo_test
+        context['general'] = GeneralSection(model)
+        context['wmo'] = WMOSection(model.wmo)
         if model.wmo.status != model.wmo.NO_WMO:
-            metc_test = METCSection(model.wmo)
-            context['metc_test'] = metc_test
-        context['trajectories_test'] = trajectories_test
+            context['metc'] = METCSection(model.wmo)
+        context['trajectories'] = TrajectoriesSection(model)
         if model.wmo.status == model.wmo.NO_WMO:
             context['studies'] = []
             for study in model.study_set.all():

From c85dfa131f5cbadc181bf01c32d01f64f5688bdc Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Sep 2023 15:59:52 +0200
Subject: [PATCH 021/148] seperate func for the sections logic + other
 improvements

---
 .../templates/proposals/pdf/new_pdf_test.html |   4 +-
 proposals/utils/pdf_diff_logic.py             | 231 +++++++++++-------
 proposals/views/proposal_views.py             |  37 +--
 3 files changed, 150 insertions(+), 122 deletions(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 74ed47785..917b9bc64 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -14,7 +14,7 @@
 {% block content %}
 
     {% include general %}
-    {% comment %} {% include wmo %}
+    {% include wmo %}
 
     {% if metc %}
         {% include metc %}
@@ -42,8 +42,6 @@
 
     {% include embargo %}
 
-    {% include general %} {% endcomment %}
-
     {% comment %} Code to copy into pdf file
 
     <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 9f490713f..0f2fe96ba 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -12,8 +12,6 @@
 from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
 necessity_required, has_adults
 
-from ..models import Relation
-
 '''NOTE: The current implementation does not account for page break formatting, present 
 in the previous pdf template'''
 
@@ -22,9 +20,13 @@ class PDFSection:
     section_title = None
     row_fields = None
 
-    def __init__(self, object, object_2 = None):
-        self.object = object
-        self.object_2 = object_2
+    def __init__(self, object):
+        if type(object) == list:
+            self.object = object[0]
+            self.object_2 = object[1]
+        else:
+            self.object = object
+            self.object_2 = None
 
     def render(self, context):
         context = context.flatten()
@@ -57,7 +59,7 @@ def make_rows(self):
             rows = [RowClass(self.object, field) for field in row_fields]
         return rows
     
-    def get_row_fields(self):
+    def get_row_fields(self, obj):
         return self.row_fields
         
     def get_study_title(self, study):
@@ -176,6 +178,7 @@ def __init__(self, object, field):
         self.field = field
 
     def render(self):
+        from ..models import Relation
 
         value = getattr(self.object, self.field)
 
@@ -255,6 +258,7 @@ def yes_no_doubt(self, value):
         from main.models import YES_NO_DOUBT
         d = dict(YES_NO_DOUBT)
         return d[value]
+    
 class GeneralSection(PDFSection):
     '''This class generates the data for the general section of 
     the PDF page.'''
@@ -279,8 +283,7 @@ class GeneralSection(PDFSection):
         'self_assessment',
     ]
     
-    def get_row_fields(self, object):
-        obj = object
+    def get_row_fields(self, obj):
         rows = copy(self.row_fields)
 
         if not obj.relation.needs_supervisor:
@@ -315,9 +318,8 @@ class WMOSection(PDFSection):
         'get_is_medical_display',  
     ]
     
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if not obj.metc == 'Y':
             rows.remove('metc_details')
@@ -325,8 +327,6 @@ def get_rows(self):
         else:
             rows.remove('get_is_medical_display')
 
-        rows = [RowClass(obj, field) for field in rows]
-
         return rows
     
 class METCSection(PDFSection):
@@ -350,15 +350,12 @@ class TrajectoriesSection(PDFSection):
         'studies_number'
     ]
     
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if obj.studies_similar:
             rows.remove('studies_number')
 
-        rows = [RowClass(obj, field) for field in rows]
-
         return rows
     
 class StudySection(PDFSection):
@@ -382,9 +379,8 @@ class StudySection(PDFSection):
         'hierarchy_details',
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if not has_adults(obj):
             rows.remove('legally_incapable')
@@ -410,8 +406,6 @@ def get_rows(self):
         if not obj.hierarchy:
             rows.remove('hierarchy_details')
 
-        rows = [RowClass(obj, field) for field in rows]
-
         return rows
         
     def render(self, context):
@@ -444,9 +438,8 @@ class InterventionSection(PDFSection):
         'extra_task'
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if obj.version == 1:
             fields_to_remove = ['multiple_sessions',
@@ -472,8 +465,6 @@ def get_rows(self):
         if not obj.has_controls:
             rows.remove('controls_description')   
 
-        rows = [RowClass(obj, field) for field in rows]
-
         return rows
     
     def render(self, context):
@@ -513,9 +504,8 @@ class ObservationSection(InterventionSection):
         'registrations_details'        
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if obj.version == 1:
             to_remove_if_v1 = ['details_who',
@@ -565,8 +555,6 @@ def get_rows(self):
             rows.remove('leader_has_coc')
         if not needs_details(obj.registrations.all()):
             rows.remove('registrations_details')
-        
-        rows = [RowClass(obj, field) for field in rows]
 
         return rows
 
@@ -577,11 +565,10 @@ class SessionsSection(StudySection):
 
     section_title = _("Het takenonderzoek en interviews")
 
-    def get_rows(self):
-
-        rows = [RowValueClass(self.object, 'sessions_number')]
+    row_fields = ['sessions_number']
 
-        return rows
+    def get_row_fields(self, obj):
+        return self.row_fields
     
 class SessionSection(PDFSection):
     '''Gets passed a session object'''
@@ -594,9 +581,8 @@ class SessionSection(PDFSection):
         'tasks_number',       
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if not needs_details(obj.setting.all()):
             rows.remove('setting_details')
@@ -606,8 +592,6 @@ def get_rows(self):
             rows.remove('leader_has_coc')
         elif obj.supervision:
             rows.remove('leader_has_coc')
-        
-        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
@@ -634,9 +618,8 @@ class TaskSection(PDFSection):
         'description'
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if not needs_details(obj.registrations.all()):
             rows.remove('registrations_details')
@@ -648,8 +631,6 @@ def get_rows(self):
             rows.remove('registration_kinds_details')
         if not obj.feedback:
             rows.remove('feedback_details')
-        
-        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
@@ -696,9 +677,8 @@ class StudyOverviewSection(StudySection):
         'risk_details'
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         rows_to_remove = []
         for x in range(0, 7, 2):
@@ -711,8 +691,6 @@ def get_rows(self):
             rows.remove('deception_details')
         elif not obj.has_sessions:
             rows.remove('deception')
-        
-        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
@@ -721,27 +699,75 @@ class InformedConsentFormsSection(InterventionSection):
 
     section_title = _('Informed consent formulieren')
 
-    def get_rows(self):
-        obj = self.object
-
-        rows = []
-
-        rows.append(RowClass(obj.proposal, 'translated_forms'))
-        if obj.proposal.translated_forms:
-            rows.append(RowClass(obj.proposal, 'translated_forms_languages'))
-        if not obj.proposal.is_practice() and obj.informed_consent:
-            rows.append(RowClass(obj, 'informed_consent'))
-            rows.append(RowClass(obj, 'briefing'))
-        if obj.study.passive_consent is not None:
-            rows.append(RowClass(obj.study, 'passive_consent'))
-        if obj.study.passive_consent:
-            rows.append(RowClass(obj.study, 'passive_consent_details'))
-        if obj.director_consent_declaration:
-            rows.append(RowClass(obj, 'director_consent_declaration'))
-        if obj.director_consent_information:
-            rows.append(RowClass(obj, 'director_consent_information')) 
-        if obj.parents_information:
-            rows.append(RowClass(obj, 'parents_information'))
+    row_fields = [
+        'translated_forms',
+        'translated_forms_languages',
+        'informed_consent',
+        'briefing',
+        'passive_consent',
+        'passive_consent_details',
+        'director_consent_declaration',
+        'director_consent_information',
+        'parents_information'
+    ]
+
+    def make_rows(self):
+        '''A few fields here need to access different objects, therefore this complex
+        overriding of the make_rows function ... :( '''
+
+        proposal_list = ['translated_forms', 'translated_forms_languages']
+        study_list = ['passive_consent', 'passive_consent_details']
+        if self.object_2:
+            row_fields_1 = self.get_row_fields(self.object)
+            row_fields_2 = self.get_row_fields(self.object_2)
+
+            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
+
+            ordered_row_fields = [row for row in self.row_fields if row in row_fields_both]
+
+            rows = []
+
+            for field in ordered_row_fields:
+                if field in proposal_list:
+                    rows.append(RowClass(self.object.proposal, field, self.object_2.proposal))
+                if field in study_list:
+                    rows.append(RowClass(self.object.study, field, self.object_2.study))
+                else:
+                    rows.append(RowClass(self.object, field, self.object_2))
+                    
+        else:
+            row_fields = self.get_row_fields(self.object)
+
+            rows = []
+
+            for field in row_fields:
+                if field in proposal_list:
+                    rows.append(RowClass(self.object.proposal, field))
+                elif field in study_list:
+                    rows.append(RowClass(self.object.study, field))
+                else:
+                    rows.append(RowClass(self.object, field))
+    
+        return rows
+    
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not obj.proposal.translated_forms:
+            rows.remove('translated_forms_languages')
+        if obj.proposal.is_practice() or not obj.informed_consent:
+            rows.remove('informed_consent')
+            rows.remove('briefing')
+        if obj.study.passive_consent is None:
+            rows.remove('passive_consent')
+        if not obj.study.passive_consent:
+            rows.remove('passive_consent_details')
+        if not obj.director_consent_declaration:
+            rows.remove('director_consent_declaration')
+        if not obj.director_consent_information:
+            rows.remove('director_consent_information')
+        if not obj.parents_information:
+            rows.remove('parents_information')
 
         return rows
     
@@ -757,21 +783,19 @@ def __init__(self, object, count):
         super().__init__(object)
         self.section_title = _('Extra formulieren ') + str(count)
     
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if not obj.informed_consent:
             rows.remove('informed_consent')
         if not obj.briefing:
             rows.remove('briefing')
-        
-        rows = [RowClass(obj, field) for field in rows]
 
         return rows
     
 class DMPFileSection(PDFSection):
-    '''Gets passed a proposal object.'''
+    '''Gets passed a proposal object.
+    Also unnecessary I suppose. But I though why not ...'''
 
     section_title = _('Data Management Plan')
     
@@ -787,14 +811,53 @@ class EmbargoSection(PDFSection):
         'embargo_end_date'
     ]
 
-    def get_rows(self):
-        obj = self.object
-        rows = self._row_fields
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
 
         if not obj.embargo:
             rows.remove('embargo_end_date')
-        
-        rows = [RowClass(obj, field) for field in rows]
 
         return rows
 
+def create_context_pdf_diff(context, model):
+    from studies.models import Documents
+
+    context['general'] = GeneralSection(model)
+    context['wmo'] = WMOSection(model.wmo)
+    if model.wmo.status != model.wmo.NO_WMO:
+        context['metc'] = METCSection(model.wmo)
+    context['trajectories'] = TrajectoriesSection(model)
+    if model.wmo.status == model.wmo.NO_WMO:
+        context['studies'] = []
+        for study in model.study_set.all():
+            study_sections = []
+            study_sections.append(StudySection(study))
+            if study.has_intervention:
+                study_sections.append(InterventionSection(study.intervention))
+            if study.has_observation:
+                study_sections.append(ObservationSection(study.observation))
+            if study.has_sessions:
+                study_sections.append(SessionsSection(study))
+                for session in study.session_set.all():
+                    study_sections.append(SessionSection(session))
+                    for task in session.task_set.all():
+                        study_sections.append(TaskSection(task))
+                study_sections.append(TasksOverviewSection(session))
+            study_sections.append(StudyOverviewSection(study))
+            study_sections.append(InformedConsentFormsSection(study.documents))
+            context['studies'].append(study_sections)
+        extra_documents = []
+        for count, document in enumerate(Documents.objects.filter(
+            proposal = model,
+            study__isnull = True
+        )):
+            extra_documents.append(ExtraDocumentsSection(document, count+1))
+        if extra_documents:
+            context['extra_documents'] = extra_documents
+        if model.dmp_file:
+            context['dmp_file'] = DMPFileSection(model)
+        context['embargo'] = EmbargoSection(model)
+    
+    return context
+    
+
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 78bc1e5e2..c7707a36c 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -609,41 +609,8 @@ class NewPDFViewTest(generic.TemplateView):
     def get_context_data(self, **kwargs):
         model = Proposal.objects.last()
         context = super().get_context_data(**kwargs)
-        context['general'] = GeneralSection(model)
-        context['wmo'] = WMOSection(model.wmo)
-        if model.wmo.status != model.wmo.NO_WMO:
-            context['metc'] = METCSection(model.wmo)
-        context['trajectories'] = TrajectoriesSection(model)
-        if model.wmo.status == model.wmo.NO_WMO:
-            context['studies'] = []
-            for study in model.study_set.all():
-                study_sections = []
-                study_sections.append(StudySection(study))
-                if study.has_intervention:
-                    study_sections.append(InterventionSection(study.intervention))
-                if study.has_observation:
-                    study_sections.append(ObservationSection(study.observation))
-                if study.has_sessions:
-                    study_sections.append(SessionsSection(study))
-                    for session in study.session_set.all():
-                        study_sections.append(SessionSection(session))
-                        for task in session.task_set.all():
-                            study_sections.append(TaskSection(task))
-                    study_sections.append(TasksOverviewSection(session))
-                study_sections.append(StudyOverviewSection(study))
-                study_sections.append(InformedConsentFormsSection(study.documents))
-                context['studies'].append(study_sections)
-        extra_documents = []
-        for count, document in enumerate(Documents.objects.filter(
-            proposal = model,
-            study__isnull = True
-        )):
-            extra_documents.append(ExtraDocumentsSection(document, count+1))
-        if extra_documents:
-            context['extra_documents'] = extra_documents
-        if model.dmp_file:
-            context['dmp_file'] = DMPFileSection(model)
-        context['embargo'] = EmbargoSection(model)
+
+        context = create_context_pdf_diff(context, model)
                
         return context
 

From 51fc86a6b07043f3344f63d7e4223389a5eaf200 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Sep 2023 16:15:48 +0200
Subject: [PATCH 022/148] last commit of the day

---
 proposals/templates/proposals/pdf/new_pdf_test.html | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
index 917b9bc64..deaa433ad 100644
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ b/proposals/templates/proposals/pdf/new_pdf_test.html
@@ -40,7 +40,9 @@
         {% include dmp_file %}
     {% endif %}
 
-    {% include embargo %}
+    {% if embargo %}
+        {% include embargo %}
+    {% endif %}
 
     {% comment %} Code to copy into pdf file
 

From 0577060770b7839e0cdc12a631d3dcc8c8a5f6ed Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 19 Sep 2023 17:01:25 +0200
Subject: [PATCH 023/148] Wooops. Forgot to commit a lot again ... Mainly
 implemented Diff

---
 .../templates/proposals/diff/sessions.html    |   3 +-
 .../proposals/new_proposal_diff.html          | 131 ++-----
 .../proposals/pdf/diff_table_with_header.html |  56 ++-
 .../pdf/single_object_diff_table.html         |  23 ++
 .../templates/proposals/proposal_pdf.html     | 323 +-----------------
 proposals/templatetags/diff_tags.py           |  11 +-
 proposals/utils/pdf_diff_logic.py             | 214 +++++++++++-
 proposals/views/proposal_views.py             |  53 +--
 8 files changed, 329 insertions(+), 485 deletions(-)
 create mode 100644 proposals/templates/proposals/pdf/single_object_diff_table.html

diff --git a/proposals/templates/proposals/diff/sessions.html b/proposals/templates/proposals/diff/sessions.html
index 84b1ec92c..0021a51d0 100644
--- a/proposals/templates/proposals/diff/sessions.html
+++ b/proposals/templates/proposals/diff/sessions.html
@@ -175,7 +175,8 @@ <h3 class="mt-5 mb-1">{% trans "Overzicht van het takenonderzoek" %}</h3>
                 <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
             </tr>
             <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "tasks_duration" session.net_duration %}</th>
+                {% comment %} Hardcoded this, to get over an annoying error {% endcomment %}
+                <th>{% get_verbose_field_name "tasks" "session" "tasks_duration" 45 %}</th> 
                 <td>{{ p_session.tasks_duration }}</td>
                 <td>{{ session.tasks_duration }}</td>
             </tr>
diff --git a/proposals/templates/proposals/new_proposal_diff.html b/proposals/templates/proposals/new_proposal_diff.html
index e5fee7cad..08e36f84a 100644
--- a/proposals/templates/proposals/new_proposal_diff.html
+++ b/proposals/templates/proposals/new_proposal_diff.html
@@ -48,76 +48,29 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
             {% with p_proposal=proposal.parent %}
 
                 {% include general %}
-                
-                {% with wmo=proposal.wmo %}
-                    {% with p_wmo=p_proposal.wmo %}
-                        <h2 class="mt-5 mb-1">{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
-                        <table class="proposals-diff ">
-                            <tr>
-                                <th class="proposals-diff-question"></th>
-                                <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                                <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                            </tr>
-                            <tr>
-                                <th>{% get_verbose_field_name "proposals" "wmo" "metc" %}</th>
-                                <td>{{ p_wmo.get_metc_display }}</td>
-                                <td>{{ wmo.get_metc_display }}</td>
-                            </tr>
-                            {% if wmo.metc == 'Y' or p_wmo.metc == 'Y' %}
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_details" %}</th>
-                                    <td>{{ p_wmo.metc_details }}</td>
-                                    <td>{{ wmo.metc_details }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_institution" %}</th>
-                                    <td>{{ p_wmo.metc_institution }}</td>
-                                    <td>{{ wmo.metc_institution }}</td>
-                                </tr>
-                            {% else %}
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "is_medical" %}</th>
-                                    <td>{{ p_wmo.get_is_medical_display }}</td>
-                                    <td>{{ wmo.get_is_medical_display }}</td>
-                                </tr>
-                            {% endif %}
-                        </table>
 
-                        {% if wmo.status != wmo.NO_WMO or p_wmo.status != p_wmo.NO_WMO %}
-                            <h2 class="mt-5 mb-1">{% trans "Aanmelding bij de METC" %}</h2>
-                            <table class="proposals-diff ">
-                                <tr>
-                                    <th class="proposals-diff-question"></th>
-                                    <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                                    <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_application" %}</th>
-                                    <td>{{ p_wmo.metc_application|yesno:_("ja,nee") }}</td>
-                                    <td>{{ wmo.metc_application|yesno:_("ja,nee") }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision" %}</th>
-                                    <td>{{ p_wmo.metc_decision|yesno:_("ja,nee") }}</td>
-                                    <td>{{ wmo.metc_decision|yesno:_("ja,nee") }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision_pdf" %}</th>
-                                    {% if p_wmo.metc_decision_pdf %}
-                                        <td><a href="{{ p_wmo.metc_decision_pdf.url }}"
-                                               target="_blank">{% trans "Download" %}</a></td>
-                                    {% endif %}
-                                    {% if wmo.metc_decision_pdf %}
-                                        <td><a href="{{ wmo.metc_decision_pdf.url }}"
-                                               target="_blank">{% trans "Download" %}</a></td>
-                                    {% endif %}
-                                </tr>
-                            </table>
-                        {% endif %}
-                    {% endwith %}
-                {% endwith %}
+                {% include wmo %}
+
+                {% if metc %}
+                  {% include metc %}
+                {% endif %}
+          
+                {% include trajectories %}
 
-                <h2 class="mt-5 mb-1">{% trans "Eén of meerdere trajecten?" %}</h2>
+                {% if studies %}
+                {% for study in studies %}
+                  {% for study_section in study %}
+                    {% include study_section %}
+                  {% endfor %}
+                {% endfor %}
+
+                {% if dmp_file %}
+                    {% include dmp_file %}
+                {% endif %}
+
+                {% include embargo %}
+                
+                <h2 class="mt-5 mb-1">{% trans "Eventuele opmerkingen" %}</h2>
                 <table class="proposals-diff ">
                     <tr>
                         <th class="proposals-diff-question"></th>
@@ -125,47 +78,11 @@ <h2 class="mt-5 mb-1">{% trans "Eén of meerdere trajecten?" %}</h2>
                         <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
                     </tr>
                     <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "studies_similar" %}</th>
-                        <td>{{ p_proposal.studies_similar|yesno:_("ja,nee") }}</td>
-                        <td>{{ proposal.studies_similar|yesno:_("ja,nee") }}</td>
+                        <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
+                        <td>{{ p_proposal.comments }}</td>
+                        <td>{{ proposal.comments }}</td>
                     </tr>
-                    {% if not proposal.studies_similar or not p_proposal.studies_similar %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "studies_number" %}</th>
-                            <td>{{ p_proposal.studies_number }}</td>
-                            <td>{{ proposal.studies_number }}</td>
-                        </tr>
-                    {% endif %}
                 </table>
-
-                {% if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED %}
-                    {% include 'proposals/diff/study.html' %}
-
-                    <h2 class="mt-5 mb-1">{% trans "Concept-aanmelding versturen" %}</h2>
-                    <table class="proposals-diff ">
-                        <tr>
-                            <th class="proposals-diff-question"></th>
-                            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                        </tr>
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "embargo" %}</th>
-                            <td>{{ p_proposal.embargo|yesno:_("ja,nee") }}</td>
-                            <td>{{ proposal.embargo|yesno:_("ja,nee") }}</td>
-                        </tr>
-                        {% if proposal.embargo or p_proposal.embargo %}
-                            <tr>
-                                <th>{% get_verbose_field_name "proposals" "proposal" "embargo_end_date" %}</th>
-                                <td>{{ p_proposal.embargo_end_date }}</td>
-                                <td>{{ proposal.embargo_end_date }}</td>
-                            </tr>
-                        {% endif %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
-                            <td>{{ p_proposal.comments }}</td>
-                            <td>{{ proposal.comments }}</td>
-                        </tr>
-                    </table>
                 {% endif %}
             {% endwith %}
 
diff --git a/proposals/templates/proposals/pdf/diff_table_with_header.html b/proposals/templates/proposals/pdf/diff_table_with_header.html
index 6c7c0b787..1f1d154e9 100644
--- a/proposals/templates/proposals/pdf/diff_table_with_header.html
+++ b/proposals/templates/proposals/pdf/diff_table_with_header.html
@@ -1,9 +1,5 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load static %}
-{% load uil_filters %}
-{% load get_field_name %}
 {% load diff_tags %}
+{% load i18n %}
 
 {% if section_title %}
     <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
@@ -17,17 +13,41 @@ <h3> {{ study_title }} </h3>
         <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
         <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
     </tr>
-{% for row in rows %}
-<tr>
-<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td><td>{{row.value_2}}</td>
-</tr>
-{% endfor %}
-</table>
-
-<h2 class="mt-3 mb-1">{% trans "Algemene informatie over de aanvraag" %}</h2>
-<table class="proposals-diff ">
+{% if warning and missing_object == 0 %}
     <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-    </tr>
\ No newline at end of file
+        <th>{{ rows.0.verbose_name }}</th>
+        <td rowspan='{{rows|length}}'>
+            <div class='warning'>
+                {{ warning }}
+            </div>
+        </td>
+        <td>{{rows.0.value_2}}</td>
+    </tr>
+    {%for row in rows|slice:"1:"%}
+    <tr>
+        <th>{{row.verbose_name}}</th><td>{{row.value_2}}
+    </tr>
+    {% endfor %}
+{% elif warning and missing_object == 1 %}
+    <tr>
+        <th>{{ rows.0.verbose_name }}</th>
+        <td>{{rows.0.value}}</td>
+        <td rowspan='{{rows|length}}'>
+            <div class='warning'>
+                {{ warning }}
+            </div>
+        </td>
+    </tr>
+    {%for row in rows|slice:"1:"%}
+    <tr>
+        <th>{{row.verbose_name}}</th><td>{{row.value}}
+    </tr>
+    {% endfor %}
+{% else %}
+    {% for row in rows %}
+        <tr>
+            <th>{{ row.verbose_name }}</th><td>{{ row.value }}</td><td>{{row.value_2}}</td>
+        </tr>
+    {% endfor %}
+{% endif %}
+</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/single_object_diff_table.html b/proposals/templates/proposals/pdf/single_object_diff_table.html
new file mode 100644
index 000000000..dfbb1728b
--- /dev/null
+++ b/proposals/templates/proposals/pdf/single_object_diff_table.html
@@ -0,0 +1,23 @@
+{% load diff_tags %}
+
+
+{% if section_title %}
+    <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
+{% endif %}
+{% if study_title %}
+    <h3> {{ study_title }} </h3>
+{% endif %}
+<div class="warning">
+    {{ warning }}
+</div>
+<table class="proposals-diff ">
+    <tr>
+        <th class="proposals-diff-question"></th>
+        <th class="proposals-diff-answer">{{ diff_answer_header }}</th>
+    </tr>
+{% for row in rows %}
+<tr>
+<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
+</tr>
+{% endfor %}
+</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 1dbbd27b0..eed9d45bc 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -79,7 +79,9 @@ <h2>{% trans 'Indiener' %}</h2>
           <th>{% trans 'E-mail' %}</th><td>{{ proposal.created_by.email }}</td>
         </tr>
       </table>
+
       {% include general %}
+
       <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
       <p>{{ proposal.summary|linebreaks }}</p>
 
@@ -91,321 +93,30 @@ <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
 
       {% include trajectories %}
 
-      {% if proposal.wmo.status == proposal.wmo.NO_WMO %}
-        {% for study in proposal.study_set.all %}
-          <h2>{% trans "De deelnemers" %}</h2>
-          {% include "studies/study_title.html" %}
-          <table>
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "age_groups" %}</th><td>{{ study.age_groups.all|unordered_list }}</td>
-            </tr>
-            {% if study|has_adults %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "legally_incapable" %}</th><td>{{ study.legally_incapable|yesno:_("ja,nee") }}</td>
-              </tr>
-              {% if study.legally_incapable %}
-                <tr>
-                  <th>{% get_verbose_field_name "studies" "study" "legally_incapable_details" %}</th><td>{{ study.legally_incapable_details }}</td>
-                </tr>
-              {% endif %}
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "has_special_details" %}</th><td>{{ study.has_special_details|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if study.has_special_details %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "special_details" %}</th><td>{{ study.special_details.all|unordered_list }}</td>
-              </tr>
-              {% if study.special_details.all|medical_traits %}
-                <tr>
-                  <th>{% get_verbose_field_name "studies" "study" "traits" %}</th><td>{{ study.traits.all|unordered_list }}</td>
-                </tr>
-                {% if study.traits.all|needs_details %}
-                  <tr>
-                    <th>{% get_verbose_field_name "studies" "study" "traits_details" %}</th><td>{{ study.traits_details }}</td>
-                  </tr>
-                {% endif %}
-              {% endif %}
-            {% endif %}
-            {% if study|necessity_required %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "necessity" %}</th><td>{{ study.get_necessity_display }}</td>
-              </tr>
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "necessity_reason" %}</th><td>{{ study.necessity_reason }}</td>
-              </tr>
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "recruitment" %}</th><td>{{ study.recruitment.all|unordered_list }}</td>
-            </tr>
-            {% if study.recruitment.all|needs_details %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "recruitment_details" %}</th><td>{{ study.recruitment_details }}</td>
-              </tr>
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "compensation" %}</th><td>{{ study.compensation }}</td>
-            </tr>
-            {% if study.compensation.needs_details %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "compensation_details" %}</th><td>{{ study.compensation_details }}</td>
-              </tr>
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "hierarchy" %}</th><td>{{ study.hierarchy|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if study.hierarchy %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "hierarchy_details" %}</th><td>{{ study.hierarchy_details }}</td>
-              </tr>
-            {% endif %}
-          </table>
-
-          {% if study.has_intervention %}
-            {% with intervention=study.intervention %}
-              <h2>{% trans "Het interventieonderzoek" %}</h2>
-              {% include "studies/study_title.html" %}
-              {% if intervention.version == 1 %}
-                {% include 'proposals/pdf/intervention_v1.html' %}
-              {% elif intervention.version == 2 %}
-                {% include 'proposals/pdf/intervention_v2.html' %}
-              {% endif %}
-            {% endwith %}
-          {% endif %}
-
-          {% if study.has_observation %}
-            {% with observation=study.observation %}
-              <h2>{% trans "Het observatieonderzoek" %}</h2>
-              {% include "studies/study_title.html" %}
-              {% if observation.version == 1 %}
-                {% include 'proposals/pdf/observation_v1.html' %}
-              {% elif observation.version == 2 %}
-                {% include 'proposals/pdf/observation_v2.html' %}
-              {% endif %}
-            {% endwith %}
-          {% endif %}
-
-          {% if study.has_sessions %}
-            <h2>{% trans "Het takenonderzoek en interviews" %}</h2>
-            {% include "studies/study_title.html" %}
-            <table>
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "sessions_number" %}</th><td>{{ study.sessions_number }}</td>
-              </tr>
-            </table>
-
-            {% for session in study.session_set.all %}
-              {% include "tasks/session_title.html" %}
-              <table>
-                <tr>
-                  <th>{% get_verbose_field_name "tasks" "session" "setting" %}</th><td>{{ session.setting.all|unordered_list }}</td>
-                </tr>
-                {% if session.setting.all|needs_details %}
-                  <tr>
-                    <th>{% get_verbose_field_name "tasks" "session" "setting_details" %}</th><td>{{ session.setting_details }}</td>
-                  </tr>
-                {% endif %}
-                {% if study.has_children and session.setting.all|needs_details:"needs_supervision" %}
-                  <tr>
-                    <th>{% get_verbose_field_name "tasks" "session" "supervision" %}</th><td>{{ session.supervision|yesno:_("ja,nee") }}</td>
-                  </tr>
-                  {% if not session.supervision %}
-                    <tr>
-                      <th>{% get_verbose_field_name "tasks" "session" "leader_has_coc" %}</th><td>{{ session.leader_has_coc|yesno:_("ja,nee") }}</td>
-                    </tr>
-                  {% endif %}
-                {% endif %}
-                <tr>
-                  <th>{% get_verbose_field_name "tasks" "session" "tasks_number" %}</th><td>{{ session.tasks_number }}</td>
-                </tr>
-              </table>
-              {% for task in session.task_set.all %}
-                {% include "tasks/task_title.html" %}
-                <table>
-                  <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "name" %}</th><td>{{ task.name }}</td>
-                  </tr>
-                  <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "duration" %}</th><td>{{ task.duration }}</td>
-                  </tr>
-                  <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "registrations" %}</th><td>{{ task.registrations.all|unordered_list }}</td>
-                  </tr>
-                  {% if task.registrations.all|needs_details %}
-                    <tr>
-                      <th>{% get_verbose_field_name "tasks" "task" "registrations_details" %}</th><td>{{ task.registrations_details }}</td>
-                    </tr>
-                  {% endif %}
-                  {% if task.registrations.all|needs_details:"needs_kind" %}
-                    <tr>
-                      <th>{% get_verbose_field_name "tasks" "task" "registration_kinds" %}</th><td>{{ task.registration_kinds.all|unordered_list }}</td>
-                    </tr>
-                    {% if task.registration_kinds.all|needs_details %}
-                      <tr>
-                        <th>{% get_verbose_field_name "tasks" "task" "registration_kinds_details" %}</th><td>{{ task.registration_kinds_details }}</td>
-                      </tr>
-                    {% endif %}
-                  {% endif %}
-                  <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "feedback" %}</th><td>{{ task.feedback|yesno:_("ja,nee") }}</td>
-                  </tr>
-                  {% if task.feedback %}
-                    <tr>
-                      <th>{% get_verbose_field_name "tasks" "task" "feedback_details" %}</th><td>{{ task.feedback_details }}</td>
-                    </tr>
-                  {% endif %}
-                </table>
-                <h3>{% get_verbose_field_name "tasks" "task" "description" %}</h3>
-                <p>{{ task.description|linebreaks }}</p>
-              {% endfor %}
-
-              <h3>{% trans "Overzicht van het takenonderzoek" %}</h3>
-              <table>
-                <tr>
-                  <th>{% get_verbose_field_name "tasks" "session" "tasks_duration" session.net_duration %}</th><td>{{ session.tasks_duration }}</td>
-                </tr>
-              </table>
-
-            {% endfor %}
-          {% endif %}
-
-          <h2>{% trans "Overzicht en eigen beoordeling van het gehele onderzoek" %}</h2>
-          {% include "studies/study_title.html" %}
-          <table>
-            {% if study.has_sessions %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "deception" %}</th><td>{{ study.get_deception_display }}</td>
-              </tr>
-              {% if study.deception == 'Y' or study.deception == '?' %}
-                <tr>
-                  <th>{% get_verbose_field_name "studies" "study" "deception_details" %}</th><td>{{ study.deception_details }}</td>
-                </tr>
-              {% endif %}
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "negativity" %}</th><td>{{ study.get_negativity_display }}</td>
-            </tr>
-            {% if study.negativity == 'Y' or study.negativity == '?' %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "negativity_details" %}</th><td>{{ study.negativity_details }}</td>
-              </tr>
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "stressful" %}</th><td>{{ study.get_stressful_display }}</td>
-            </tr>
-            {% if study.stressful == 'Y' or study.stressful == '?' %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "stressful_details" %}</th><td>{{ study.stressful_details }}</td>
-              </tr>
-            {% endif %}
-            <tr>
-              <th>{% get_verbose_field_name "studies" "study" "risk" %}</th><td>{{ study.get_risk_display }}</td>
-            </tr>
-            {% if study.risk == 'Y' or study.risk == '?' %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "risk_details" %}</th><td>{{ study.risk_details }}</td>
-              </tr>
-            {% endif %}
-          </table>
-
-          <h2>{% trans "Informed consent formulieren" %}</h2>
-          {% include "studies/study_title.html" %}
-          {% get_study_documents study_documents study %}
-          <table>
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "proposal" "translated_forms" %}</th><td>{{ proposal.translated_forms|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if proposal.translated_forms %}
-              <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "translated_forms_languages" %}</th><td>{{ proposal.translated_forms_languages }}</td>
-              </tr>
-            {% endif %}
-            {% if not proposal.is_practice and study_documents.informed_consent %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "informed_consent" %}</th><td><a href="{{ BASE_URL }}{{ study_documents.informed_consent.url }}">{% trans "Download" %}</a></td>
-              </tr>
-              <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "briefing" %}</th><td><a href="{{ BASE_URL }}{{ study_documents.briefing.url }}">{% trans "Download" %}</a></td>
-              </tr>
-            {% endif %}
-            {% if study.passive_consent is not None %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "study" "passive_consent" %}</th><td>{{ study.passive_consent|yesno:_("ja,nee") }}</td>
-              </tr>
-              {% if study.passive_consent %}
-                <tr>
-                  <th>{% get_verbose_field_name "studies" "study" "passive_consent_details" %}</th><td>{{ study.passive_consent_details }}</td>
-                </tr>
-              {% endif %}
-            {% endif %}
-            {% if study_documents.director_consent_declaration %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "director_consent_declaration" %}</th><td><a href="{{ BASE_URL }}{{ study_documents.director_consent_declaration.url }}">{% trans "Download" %}</a></td>
-              </tr>
-            {% endif %}
-            {% if study_documents.director_consent_information %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "director_consent_information" %}</th><td><a href="{{ BASE_URL }}{{ study_documents.director_consent_information.url }}">{% trans "Download" %}</a></td>
-              </tr>
-            {% endif %}
-            {% if study_documents.parents_information %}
-              <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "parents_information" %}</th><td><a href="{{ BASE_URL }}{{ study_documents.parents_information.url }}">{% trans "Download" %}</a></td>
-              </tr>
-            {% endif %}
-          </table>
+      {% if studies %}
+        {% for study in studies %}
+          {% for study_section in study %}
+            {% include study_section %}
+          {% endfor %}
         {% endfor %}
 
-        {% if documents.extra %}
-          {% counter extra_form_counter create 1 %}
-          {% for extra_documents in documents.extra %}
-            <h2>{% trans 'Extra formulieren' %} {% counter extra_form_counter value %}</h2>
-            {% counter extra_form_counter increment 1 %}
-            <table>
-              {% if extra_documents.informed_consent %}
-                <tr>
-                  <th>{% get_verbose_field_name "studies" "documents" "informed_consent" %}</th><td><a href="{{ BASE_URL }}{{ extra_documents.informed_consent.url }}">{% trans "Download" %}</a></td>
-                </tr>
-              {% endif %}
-              {% if extra_documents.briefing %}
-                <tr>
-                  <th>{% get_verbose_field_name "studies" "documents" "briefing" %}</th><td><a href="{{ BASE_URL }}{{ extra_documents.briefing.url }}">{% trans "Download" %}</a></td>
-                </tr>
-              {% endif %}
-            </table>
-            {{ extra_form_counter.increment }}
+        {% if extra_documents %}
+          {% for document in extra_documents %}
+            {% include document %}
           {% endfor %}
         {% endif %}
-        {% if proposal.dmp_file %}
-          <h2>{% trans "Data Management Plan" %}</h2>
-          <table>
-            <tr>
-              <th>
-                {% get_verbose_field_name "proposals" "proposal" "dmp_file" %}
-              </th>
-              <td>
-                <a href="{{ BASE_URL }}{{ proposal.dmp_file.url }}">
-                  {% trans "Download" %}
-                </a>
-              </td>
-            </tr>
-          </table>
+
+        {% if dmp_file %}
+          {% include dmp_file %}
         {% endif %}
-        <h2>{% trans "Aanmelding versturen" %}</h2>
-        <table>
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "embargo" %}</th><td>{{ proposal.embargo|yesno:_("ja,nee") }}</td>
-          </tr>
-          {%if proposal.embargo %}
-          <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "embargo_end_date" %}</th><td>{{ proposal.date_start|default:_("onbekend") }}</td>
-          </tr>
-          {% endif %}
-        </table>
+
+        {% include embargo %}
+
         <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
         <p>
           {{ proposal.comments }}
         </p>
+
       {% endif %}
     </div>
   </div>
diff --git a/proposals/templatetags/diff_tags.py b/proposals/templatetags/diff_tags.py
index 30ea8da32..c283f3b21 100644
--- a/proposals/templatetags/diff_tags.py
+++ b/proposals/templatetags/diff_tags.py
@@ -10,8 +10,15 @@ def zip_equalize_lists(a, b):
     A zip implementation which will not stop when reaching the end of the
     smallest list, but will append None's to the smaller list to fill the gap
     """
-    a = list(a)
-    b = list(b)
+    try:
+        a = list(a)
+    except TypeError:
+        a = [a]
+    try:
+        b = list(b)
+    except TypeError:
+        b = [b]
+
     a_len = len(a)
     b_len = len(b)
     diff = abs(a_len - b_len)
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 0f2fe96ba..61ac43969 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -21,7 +21,7 @@ class PDFSection:
     row_fields = None
 
     def __init__(self, object):
-        if type(object) == list:
+        if type(object) == tuple:
             self.object = object[0]
             self.object_2 = object[1]
         else:
@@ -50,9 +50,10 @@ def make_rows(self):
             row_fields_both = list(set(row_fields_1) | set(row_fields_2))
 
             #The merging above messes with the order, so I reorder it here
-            ordered_row_fields = [row for row in self.row_fields if row in row_fields_both]
+            row_fields = [row for row in self.row_fields if row in row_fields_both]
+
 
-            rows = [RowClass(self.object, field, self.object_2) for field in ordered_row_fields]
+            rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
         else:
             row_fields = self.get_row_fields(self.object)
 
@@ -416,6 +417,59 @@ def render(self, context):
                 }
             )
         return super().render(context)
+    
+class DiffSectionPossibleMissingObjects(PDFSection):
+    '''This exists for instances of tables in the diff, where it is possible
+    for objects to be entirely missing from one version or the other.
+    Mostly used for studies and sub-sections of studies'''
+
+    def __init__(self, objects_list):
+        '''The None object always needs to become object_2.'''
+        if objects_list[0] is None:
+            self.warning = _(
+                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
+                )
+            self.missing_object = 0
+        elif objects_list[1] is None:
+            self.warning = _(
+                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+            )
+            self.missing_object = 1
+        else:
+            self.warning = None
+            self.missing_object = None
+        self.object = objects_list[0]
+        self.object_2 = objects_list[1]
+    
+    def render(self, context):
+        context = context.flatten()
+        template = get_template("proposals/pdf/diff_table_with_header.html")
+
+        if self.warning and self.missing_object:
+            context.update(
+                {
+                    "warning": self.warning,
+                    "missing_object": self.missing_object
+                }
+            )
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.make_rows(),
+            }
+        )
+        return template.render(context)
+    
+class StudySectionDiff(DiffSectionPossibleMissingObjects, StudySection):
+
+    def render(self,context):
+        if self.object.proposal.studies_number > 1:
+            context.update(
+                {
+                    'study_title': super().get_study_title(self.object)
+                }
+            )
+        return super().render(context)
 
 class InterventionSection(PDFSection):
     '''This class will receive a intervention object'''
@@ -476,6 +530,17 @@ def render(self, context):
             )
         return super().render(context)
     
+class InterventionSectionDiff(DiffSectionPossibleMissingObjects, InterventionSection):
+
+    def render(self, context):
+        if self.object.study.proposal.studies_number > 1:
+            context.update(
+                {
+                    'study_title': super().get_study_title(self.object.study)
+                }
+            )
+        return super().render(context)
+    
 class ObservationSection(InterventionSection):
     '''Gets passed an observation object'''
     section_title = _('Het observatieonderzoek')
@@ -557,8 +622,11 @@ def get_row_fields(self, obj):
             rows.remove('registrations_details')
 
         return rows
+    
+class ObservationSectionDiff(InterventionSectionDiff, ObservationSection):
+    pass
 
-class SessionsSection(StudySection):
+class SessionsOverviewSection(StudySection):
     '''Gets passed a study object
     This Section looks maybe a bit unnecessary, but it does remove some logic, plus
     the study_title.html from the template.'''
@@ -567,9 +635,11 @@ class SessionsSection(StudySection):
 
     row_fields = ['sessions_number']
 
+class SessionsSectionDiff(StudySectionDiff, SessionsOverviewSection):
+    
     def get_row_fields(self, obj):
         return self.row_fields
-    
+
 class SessionSection(PDFSection):
     '''Gets passed a session object'''
     
@@ -602,6 +672,16 @@ def render(self, context):
             }
         )
         return super().render(context)
+
+class SessionSectionDiff(DiffSectionPossibleMissingObjects, SessionSection):
+
+    def render(self, context):
+        context.update(
+            {
+                'study_title': super().get_session_title(self.object)
+            }
+        )
+        return super().render(context)
     
 class TaskSection(PDFSection):
     '''Gets passed a task object'''
@@ -642,6 +722,16 @@ def render(self, context):
         )
         return super().render(context)
     
+class TaskSectionDiff(DiffSectionPossibleMissingObjects, TaskSection):
+
+    def render(self, context):
+        context.update(
+            {
+                'study_title': super().get_task_title(self.object)
+            }
+        )
+        return super().render(context)
+    
 class TasksOverviewSection(PDFSection):
     '''Gets passed a session object
     This might be unecessary ... Maybe just use the existing template language ...
@@ -653,8 +743,16 @@ class TasksOverviewSection(PDFSection):
     ]
 
     def render(self, context):
-        '''Here I am just overriding the render function, to get the correct formatting
-        The naming is a bit confusing, might fix later'''
+        context.update(
+            {
+                'study_title': _('Overzicht van het takenonderzoek')
+            }
+        )
+        return super().render(context)
+    
+class TasksOverviewSectionDiff(DiffSectionPossibleMissingObjects, TaskSection):
+
+    def render(self, context):
         context.update(
             {
                 'study_title': _('Overzicht van het takenonderzoek')
@@ -693,6 +791,9 @@ def get_row_fields(self, obj):
             rows.remove('deception')
 
         return rows
+
+class StudyOverviewSectionDiff(StudySectionDiff, StudyOverviewSection):
+    pass
     
 class InformedConsentFormsSection(InterventionSection):
     '''Receives a Documents object'''
@@ -714,7 +815,6 @@ class InformedConsentFormsSection(InterventionSection):
     def make_rows(self):
         '''A few fields here need to access different objects, therefore this complex
         overriding of the make_rows function ... :( '''
-
         proposal_list = ['translated_forms', 'translated_forms_languages']
         study_list = ['passive_consent', 'passive_consent_details']
         if self.object_2:
@@ -730,7 +830,7 @@ def make_rows(self):
             for field in ordered_row_fields:
                 if field in proposal_list:
                     rows.append(RowClass(self.object.proposal, field, self.object_2.proposal))
-                if field in study_list:
+                elif field in study_list:
                     rows.append(RowClass(self.object.study, field, self.object_2.study))
                 else:
                     rows.append(RowClass(self.object, field, self.object_2))
@@ -771,6 +871,9 @@ def get_row_fields(self, obj):
 
         return rows
     
+class InformedConsentSectionDiff(InterventionSectionDiff, InformedConsentFormsSection):
+    pass
+    
 class ExtraDocumentsSection(PDFSection):
     '''gets a documents object'''
 
@@ -818,17 +921,25 @@ def get_row_fields(self, obj):
             rows.remove('embargo_end_date')
 
         return rows
-
-def create_context_pdf_diff(context, model):
+    
+def get_extra_documents(object):
+    pass
+    
+def create_context_pdf(context, model):
     from studies.models import Documents
 
     context['general'] = GeneralSection(model)
     context['wmo'] = WMOSection(model.wmo)
+
     if model.wmo.status != model.wmo.NO_WMO:
         context['metc'] = METCSection(model.wmo)
+    
     context['trajectories'] = TrajectoriesSection(model)
+
     if model.wmo.status == model.wmo.NO_WMO:
+
         context['studies'] = []
+
         for study in model.study_set.all():
             study_sections = []
             study_sections.append(StudySection(study))
@@ -837,7 +948,7 @@ def create_context_pdf_diff(context, model):
             if study.has_observation:
                 study_sections.append(ObservationSection(study.observation))
             if study.has_sessions:
-                study_sections.append(SessionsSection(study))
+                study_sections.append(SessionsOverviewSection(study))
                 for session in study.session_set.all():
                     study_sections.append(SessionSection(session))
                     for task in session.task_set.all():
@@ -846,18 +957,97 @@ def create_context_pdf_diff(context, model):
             study_sections.append(StudyOverviewSection(study))
             study_sections.append(InformedConsentFormsSection(study.documents))
             context['studies'].append(study_sections)
+
         extra_documents = []
+
         for count, document in enumerate(Documents.objects.filter(
             proposal = model,
             study__isnull = True
         )):
             extra_documents.append(ExtraDocumentsSection(document, count+1))
+
         if extra_documents:
             context['extra_documents'] = extra_documents
         if model.dmp_file:
             context['dmp_file'] = DMPFileSection(model)
+            
         context['embargo'] = EmbargoSection(model)
     
     return context
+
+from proposals.templatetags.diff_tags import zip_equalize_lists
+
+def create_context_diff(context, models):
     
 
+    p_proposal = models[0]
+    proposal = models[1]
+
+    context['general'] = GeneralSection(models)
+    context['wmo'] = WMOSection((p_proposal.wmo, proposal.wmo))
+
+    if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
+        context['metc'] = METCSection((p_proposal.wmo, proposal.wmo))
+    
+    context['trajectories'] = TrajectoriesSection(models)
+
+    if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
+
+        context['studies'] = []
+
+        for diff_studies in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
+
+            p_study = diff_studies[0]
+            study = diff_studies[1]
+
+            study_sections = []
+            study_sections.append(StudySectionDiff((diff_studies)))
+
+            if p_study is not None and p_study.has_intervention or \
+                study is not None and study.has_intervention:
+                interventions = tuple((study.intervention if study is not None \
+                                       else study for study in diff_studies))
+                study_sections.append(InterventionSectionDiff(interventions))
+            if p_study is not None and p_study.has_observation or \
+                study is not None and study.has_observation:
+                observations = tuple((study.observation if study is not None \
+                                       else study for study in diff_studies))
+                study_sections.append(ObservationSectionDiff(observations))
+            if p_study is not None and p_study.has_sessions or \
+                study is not None and study.has_sessions:
+                study_sections.append(SessionsSectionDiff(diff_studies))
+                p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
+                                       else study for study in diff_studies))
+                for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
+                    p_sessions = diff_sessions[0]
+                    sessions = diff_sessions[1]
+                    study_sections.append(SessionSectionDiff(diff_sessions))
+                    p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
+                                       else session for session in diff_sessions))
+                    for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+                        study_sections.append(TaskSectionDiff(diff_tasks))
+                study_sections.append(TasksOverviewSection(diff_sessions))
+            study_sections.append(StudyOverviewSectionDiff(diff_studies))
+            documents = tuple(study.documents if study is not None \
+                              else study for study in diff_studies)
+            study_sections.append(InformedConsentSectionDiff(documents))
+            context['studies'].append(study_sections)
+
+        extra_documents = []
+
+        # for count, document in enumerate(Documents.objects.filter(
+        #     proposal = models,
+        #     study__isnull = True
+        # )):
+        #     extra_documents.append(ExtraDocumentsSection(document, count+1))
+
+        # if extra_documents:
+        #     context['extra_documents'] = extra_documents
+        if p_proposal.dmp_file or proposal.dmp_file:
+            context['dmp_file'] = DMPFileSection(models)
+            
+        context['embargo'] = EmbargoSection(models)
+
+    return context
+
+
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index c7707a36c..7760a9dc0 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -552,43 +552,9 @@ class ProposalAsPdf(LoginRequiredMixin, PDFTemplateResponseMixin,
 
     def get_context_data(self, **kwargs):
         """Adds 'BASE_URL' to template context"""
-        context = super(ProposalAsPdf, self).get_context_data(**kwargs)
-
-        context['general'] = GeneralSection(self.object)
-        context['wmo'] = WMOSection(self.object.wmo)
-        if self.object.wmo.status != self.object.wmo.NO_WMO:
-            context['metc'] = METCSection(self.object.wmo)
-        context['trajectories'] = TrajectoriesSection(self.object)
-        if self.object.wmo.status == self.object.wmo.NO_WMO:
-            context['studies'] = []
-            for study in self.object.study_set.all():
-                study_sections = []
-                study_sections.append(StudySection(study))
-                if study.has_intervention:
-                    study_sections.append(InterventionSection(study.intervention))
-                if study.has_observation:
-                    study_sections.append(ObservationSection(study.observation))
-                if study.has_sessions:
-                    study_sections.append(SessionsSection(study))
-                    for session in study.session_set.all():
-                        study_sections.append(SessionSection(session))
-                        for task in session.task_set.all():
-                            study_sections.append(TaskSection(task))
-                    study_sections.append(TasksOverviewSection(session))
-                study_sections.append(StudyOverviewSection(study))
-                study_sections.append(InformedConsentFormsSection(study.documents))
-                context['studies'].append(study_sections)
-        extra_documents = []
-        for count, document in enumerate(Documents.objects.filter(
-            proposal = self.object,
-            study__isnull = True
-        )):
-            extra_documents.append(ExtraDocumentsSection(document, count+1))
-        if extra_documents:
-            context['extra_documents'] = extra_documents
-        if self.object.dmp_file:
-            context['dmp_file'] = DMPFileSection(self.object)
-        context['embargo'] = EmbargoSection(self.object)
+        context = super().get_context_data(**kwargs)
+
+        context = create_context_pdf(context, self.object)
 
         return context
 
@@ -599,8 +565,17 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['general'] = GeneralSection(self.object.parent, self.object)
+
+        context = create_context_diff(context, (self.object.parent, self.object))
+
         return context
+       
+
+# class ProposalDifference(LoginRequiredMixin, generic.DetailView):
+#     model = Proposal
+#     template_name = 'proposals/proposal_diff.html'
+
+
 
 class NewPDFViewTest(generic.TemplateView):
 
@@ -610,7 +585,7 @@ def get_context_data(self, **kwargs):
         model = Proposal.objects.last()
         context = super().get_context_data(**kwargs)
 
-        context = create_context_pdf_diff(context, model)
+        context = create_context_pdf(context, model)
                
         return context
 

From cffbf66566083402937ec1a41918f9246f684589 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 20 Sep 2023 16:14:47 +0200
Subject: [PATCH 024/148] Extra documents and documentation

---
 .../proposals/diff_table_with_header.html     |  53 ++++
 .../proposals/new_proposal_diff.html          |  55 ++--
 .../proposals/pdf/diff_table_with_header.html |   4 +-
 .../proposals/table_with_header.html          |  13 +
 proposals/utils/pdf_diff_logic.py             | 268 +++++++++++-------
 proposals/views/proposal_views.py             |  22 --
 6 files changed, 271 insertions(+), 144 deletions(-)
 create mode 100644 proposals/templates/proposals/diff_table_with_header.html
 create mode 100644 proposals/templates/proposals/table_with_header.html

diff --git a/proposals/templates/proposals/diff_table_with_header.html b/proposals/templates/proposals/diff_table_with_header.html
new file mode 100644
index 000000000..46bcbea30
--- /dev/null
+++ b/proposals/templates/proposals/diff_table_with_header.html
@@ -0,0 +1,53 @@
+{% load diff_tags %}
+{% load i18n %}
+
+{% if section_title %}
+    <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
+{% endif %}
+{% if study_title %}
+    <h3> {{ study_title }} </h3>
+{% endif %}
+<table class="proposals-diff ">
+    <tr>
+        <th class="proposals-diff-question"></th>
+        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+    </tr>
+{% if warning and missing_object == 0 %}
+    <tr>
+        <th>{{ rows.0.verbose_name }}</th>
+        <td rowspan='{{rows|length}}'>
+            <div class='warning'>
+                {{ warning }}
+            </div>
+        </td>
+        <td>{{rows.0.value}}</td>
+    </tr>
+    {%for row in rows|slice:"1:"%}
+    <tr>
+        <th>{{row.verbose_name}}</th><td>{{row.value}}
+    </tr>
+    {% endfor %}
+{% elif warning and missing_object == 1 %}
+    <tr>
+        <th>{{ rows.0.verbose_name }}</th>
+        <td>{{rows.0.value}}</td>
+        <td rowspan='{{rows|length}}'>
+            <div class='warning'>
+                {{ warning }}
+            </div>
+        </td>
+    </tr>
+    {%for row in rows|slice:"1:"%}
+    <tr>
+        <th>{{row.verbose_name}}</th><td>{{row.value}}
+    </tr>
+    {% endfor %}
+{% else %}
+    {% for row in rows %}
+        <tr>
+            <th>{{ row.verbose_name }}</th><td>{{ row.value }}</td><td>{{row.value_2}}</td>
+        </tr>
+    {% endfor %}
+{% endif %}
+</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/new_proposal_diff.html b/proposals/templates/proposals/new_proposal_diff.html
index 08e36f84a..f7d1a3e15 100644
--- a/proposals/templates/proposals/new_proposal_diff.html
+++ b/proposals/templates/proposals/new_proposal_diff.html
@@ -45,7 +45,6 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
             <div class="col-12 text-center mt-5 mb-5" id="loading-icon">
                 <img src="{% static 'main/images/loading.gif' %}"/>
             </div>
-            {% with p_proposal=proposal.parent %}
 
                 {% include general %}
 
@@ -58,33 +57,39 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
                 {% include trajectories %}
 
                 {% if studies %}
-                {% for study in studies %}
-                  {% for study_section in study %}
-                    {% include study_section %}
-                  {% endfor %}
-                {% endfor %}
+                    {% for study in studies %}
+                        {% for study_section in study %}
+                            {% include study_section %}
+                        {% endfor %}
+                    {% endfor %}
 
-                {% if dmp_file %}
-                    {% include dmp_file %}
-                {% endif %}
+                    {% if extra_documents %}
+                        {% for document in extra_documents %}
+                            {% include document %}
+                        {% endfor %}
+                    {% endif %}
+
+                    {% if dmp_file %}
+                        {% include dmp_file %}
+                    {% endif %}
+
+                    {% include embargo %}
 
-                {% include embargo %}
-                
-                <h2 class="mt-5 mb-1">{% trans "Eventuele opmerkingen" %}</h2>
-                <table class="proposals-diff ">
-                    <tr>
-                        <th class="proposals-diff-question"></th>
-                        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
-                        <td>{{ p_proposal.comments }}</td>
-                        <td>{{ proposal.comments }}</td>
-                    </tr>
-                </table>
+                    
+                    <h2 class="mt-5 mb-1">{% trans "Eventuele opmerkingen" %}</h2>
+                    <table class="proposals-diff ">
+                        <tr>
+                            <th class="proposals-diff-question"></th>
+                            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+                            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+                        </tr>
+                        <tr>
+                            <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
+                            <td>{{ p_proposal.comments }}</td>
+                            <td>{{ proposal.comments }}</td>
+                        </tr>
+                    </table>
                 {% endif %}
-            {% endwith %}
 
             <p class="mt-5 float-right">
                 <button class="button" onclick="window.history.back();">
diff --git a/proposals/templates/proposals/pdf/diff_table_with_header.html b/proposals/templates/proposals/pdf/diff_table_with_header.html
index 1f1d154e9..46bcbea30 100644
--- a/proposals/templates/proposals/pdf/diff_table_with_header.html
+++ b/proposals/templates/proposals/pdf/diff_table_with_header.html
@@ -21,11 +21,11 @@ <h3> {{ study_title }} </h3>
                 {{ warning }}
             </div>
         </td>
-        <td>{{rows.0.value_2}}</td>
+        <td>{{rows.0.value}}</td>
     </tr>
     {%for row in rows|slice:"1:"%}
     <tr>
-        <th>{{row.verbose_name}}</th><td>{{row.value_2}}
+        <th>{{row.verbose_name}}</th><td>{{row.value}}
     </tr>
     {% endfor %}
 {% elif warning and missing_object == 1 %}
diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
new file mode 100644
index 000000000..6b491d820
--- /dev/null
+++ b/proposals/templates/proposals/table_with_header.html
@@ -0,0 +1,13 @@
+{% if section_title %}
+    <h2> {{ section_title }} </h2>
+{% endif %}
+{% if study_title %}
+    <h3> {{ study_title }} </h3>
+{% endif %}
+<table>
+{% for row in rows %}
+<tr>
+<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
+</tr>
+{% endfor %}
+</table>
\ No newline at end of file
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 61ac43969..cef84d40f 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -11,11 +11,20 @@
 
 from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
 necessity_required, has_adults
+from proposals.templatetags.diff_tags import zip_equalize_lists
 
 '''NOTE: The current implementation does not account for page break formatting, present 
-in the previous pdf template'''
+in the previous pdf template
+NOTE: As of now, the diff has no workaround for when observations or interventions are of a
+different version, in the different proposals.'''
 
 class PDFSection:
+    '''This is the main class, from which most classes are constructed.
+    It can take one object or two objects in a tuple, and produce html tables accordingly.
+    The most important methods are render and make_rows. Make rows makes use of get_row_field,
+    which is mostly overwritten for specific sections.
+    If this class is used in the diff, object should be the parent object and object_2 the 
+    revision/amendment.'''
     
     section_title = None
     row_fields = None
@@ -31,9 +40,9 @@ def __init__(self, object):
     def render(self, context):
         context = context.flatten()
         if self.object_2:
-            template = get_template("proposals/pdf/diff_table_with_header.html")
+            template = get_template("proposals/diff_table_with_header.html")
         else:
-            template = get_template("proposals/pdf/table_with_header.html")
+            template = get_template("proposals/table_with_header.html")
         context.update(
             {
                 "section_title": self.section_title,
@@ -43,7 +52,7 @@ def render(self, context):
         return template.render(context)
 
     def make_rows(self):
-        if self.object_2:
+        if self.object and self.object_2:
             row_fields_1 = self.get_row_fields(self.object)
             row_fields_2 = self.get_row_fields(self.object_2)
 
@@ -52,12 +61,16 @@ def make_rows(self):
             #The merging above messes with the order, so I reorder it here
             row_fields = [row for row in self.row_fields if row in row_fields_both]
 
-
             rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
         else:
-            row_fields = self.get_row_fields(self.object)
+            if self.object is None:
+                obj = self.object_2
+            else:
+                obj = self.object          
+
+            row_fields = self.get_row_fields(obj)
 
-            rows = [RowClass(self.object, field) for field in row_fields]
+            rows = [RowClass(obj, field) for field in row_fields]
         return rows
     
     def get_row_fields(self, obj):
@@ -80,7 +93,6 @@ def get_study_title(self, study):
         return study_title
     
     def get_session_title(self, session):
-
         order = session.order 
         study_order = session.study.order 
         study_name = session.study.name 
@@ -140,6 +152,9 @@ def get_task_title(self, task):
         return task_title
 
 class RowClass:
+    '''This class creates rows for either one or two objects, and gets initated
+    in the make_rows method of Section classes. The classmethods of Rowclass
+    are called in the templates of the render method of the PDF class.'''
 
     verbose_name_diff_field_dict = {
         'get_metc_display': 'metc',
@@ -160,10 +175,10 @@ def verbose_name(self):
         return verbose_name   
     
     def value(self):
-        return RowValueClass(self.object, self.field).render()
+        return RowValueClass(self.object, self.field).get_field_value()
     
     def value_2(self):
-        return RowValueClass(self.object_2, self.field).render()
+        return RowValueClass(self.object_2, self.field).get_field_value()
     
     def get_verbose_name(self, field):
         if field != 'tasks_duration':
@@ -172,13 +187,16 @@ def get_verbose_name(self, field):
             return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
 
 class RowValueClass:
+    '''The RowValueClass manages the values of fields and correctly retrieves and/or formats
+    the right values per field. This class get initiated in the value and value_2 methods
+    of the RowClass. It returns mostly strings, but sometimes some html as well.'''
 
     def __init__(self, object, field):
 
         self.object = object
         self.field = field
 
-    def render(self):
+    def get_field_value(self):
         from ..models import Relation
 
         value = getattr(self.object, self.field)
@@ -260,9 +278,57 @@ def yes_no_doubt(self, value):
         d = dict(YES_NO_DOUBT)
         return d[value]
     
+class DiffSection(PDFSection):
+    '''The DiffSection class overrides the __init__ and render methods of the PDFSection.
+    This exists for instances of tables in the diff, where it is possible
+    for objects to be entirely missing from one version or the other, such as studies.
+    If Neccesary, it provides an object is missing warning and some info for formatting the
+    diff table. (self.missing_object)
+    The resulting diff section class inherit from this class, plus their own section class.
+
+    eg. class StudySectionDiff(DiffSection, StudySection)'''
+
+    def __init__(self, objects_tuple):
+        if objects_tuple[0] is None:
+            self.warning = _(
+                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
+                )
+            self.missing_object = 0
+        elif objects_tuple[1] is None:
+            self.warning = _(
+                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+            )
+            self.missing_object = 1
+        else:
+            self.warning = None
+            self.missing_object = None
+        self.object = objects_tuple[0]
+        self.object_2 = objects_tuple[1]
+    
+    def render(self, context):
+        context = context.flatten()
+        template = get_template("proposals/pdf/diff_table_with_header.html")
+
+        if self.warning is not None:
+            context.update(
+                {
+                    "warning": self.warning,
+                    "missing_object": self.missing_object
+                }
+            )
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.make_rows(),
+            }
+        )
+
+        return template.render(context)
 class GeneralSection(PDFSection):
-    '''This class generates the data for the general section of 
-    the PDF page.'''
+    '''This class generates the data for the general section of a proposal and showcases
+    the general workflow for creating sections. All possible row fields are provided, and
+    removed according to the logic in the get_row_fields method.
+    This class receives a proposal object.'''
 
     section_title = _("Algemene informatie over de aanvraag")
     row_fields = [
@@ -310,7 +376,7 @@ def get_row_fields(self, obj):
         return rows
     
 class WMOSection(PDFSection):
-    '''Object for this section is proposal.wmo'''
+    '''This class receives a proposal.wmo object.'''
     section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
     row_fields = [
         'get_metc_display',
@@ -331,7 +397,7 @@ def get_row_fields(self, obj):
         return rows
     
 class METCSection(PDFSection):
-    '''Object for this section is proposal.wmo
+    '''This class receives a proposal.wmo object.
     This class exists because the RowValueClass does some
     funky things for working with the metc_decision_pdf field'''
     section_title = _("Aanmelding bij de METC")
@@ -343,6 +409,7 @@ class METCSection(PDFSection):
     ]
     
 class TrajectoriesSection(PDFSection):
+    '''This class receives a proposal object.'''
 
     section_title = _("Eén of meerdere trajecten?")
 
@@ -360,7 +427,7 @@ def get_row_fields(self, obj):
         return rows
     
 class StudySection(PDFSection):
-    '''object for this study is proposal.study'''
+    '''This class receives a proposal.study object.'''
     section_title = _('De Deelnemers')
     row_fields = [
         'age_groups',
@@ -410,6 +477,7 @@ def get_row_fields(self, obj):
         return rows
         
     def render(self, context):
+        '''Overriding the render function to pass study_title to the context.'''
         if self.object.proposal.studies_number > 1:
             context.update(
                 {
@@ -418,49 +486,10 @@ def render(self, context):
             )
         return super().render(context)
     
-class DiffSectionPossibleMissingObjects(PDFSection):
-    '''This exists for instances of tables in the diff, where it is possible
-    for objects to be entirely missing from one version or the other.
-    Mostly used for studies and sub-sections of studies'''
-
-    def __init__(self, objects_list):
-        '''The None object always needs to become object_2.'''
-        if objects_list[0] is None:
-            self.warning = _(
-                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
-                )
-            self.missing_object = 0
-        elif objects_list[1] is None:
-            self.warning = _(
-                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
-            )
-            self.missing_object = 1
-        else:
-            self.warning = None
-            self.missing_object = None
-        self.object = objects_list[0]
-        self.object_2 = objects_list[1]
-    
-    def render(self, context):
-        context = context.flatten()
-        template = get_template("proposals/pdf/diff_table_with_header.html")
-
-        if self.warning and self.missing_object:
-            context.update(
-                {
-                    "warning": self.warning,
-                    "missing_object": self.missing_object
-                }
-            )
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": self.make_rows(),
-            }
-        )
-        return template.render(context)
     
-class StudySectionDiff(DiffSectionPossibleMissingObjects, StudySection):
+class StudySectionDiff(DiffSection, StudySection):
+    '''An example of a DiffSection. Unfortunately I found myself having to repeat the overriding
+    of the render function from the studySection, due to the mro.'''
 
     def render(self,context):
         if self.object.proposal.studies_number > 1:
@@ -472,7 +501,7 @@ def render(self,context):
         return super().render(context)
 
 class InterventionSection(PDFSection):
-    '''This class will receive a intervention object'''
+    '''This class receives an intervention object'''
     section_title = _('Het interventieonderzoek')
     row_fields = [
         'setting',
@@ -530,7 +559,7 @@ def render(self, context):
             )
         return super().render(context)
     
-class InterventionSectionDiff(DiffSectionPossibleMissingObjects, InterventionSection):
+class InterventionSectionDiff(DiffSection, InterventionSection):
 
     def render(self, context):
         if self.object.study.proposal.studies_number > 1:
@@ -542,7 +571,9 @@ def render(self, context):
         return super().render(context)
     
 class ObservationSection(InterventionSection):
-    '''Gets passed an observation object'''
+    '''This class receives an observation object
+    It inherits from the InterventionSection, as it can repurpose the same overridden
+    render method.'''
     section_title = _('Het observatieonderzoek')
     row_fields = [
         'setting',
@@ -624,10 +655,20 @@ def get_row_fields(self, obj):
         return rows
     
 class ObservationSectionDiff(InterventionSectionDiff, ObservationSection):
+    '''Note that the diff sections follow a similar pattern of inheritance as 
+    the regular sections, due to repurposing overriden methods, when applicable, 
+    eg.:
+
+    class InterventionSection(PDFSection)
+    class InterventionSectionDiff(DiffSection, InterventionSection)
+
+    class ObservationSection(InterventionSection)
+    class ObservationSectionDiff(InterventionSectionDiff, ObservationSection)
+    '''
     pass
 
 class SessionsOverviewSection(StudySection):
-    '''Gets passed a study object
+    '''This class receives an study object
     This Section looks maybe a bit unnecessary, but it does remove some logic, plus
     the study_title.html from the template.'''
 
@@ -635,13 +676,18 @@ class SessionsOverviewSection(StudySection):
 
     row_fields = ['sessions_number']
 
+    def get_row_fields(self, obj):
+        return self.row_fields
+
+
 class SessionsSectionDiff(StudySectionDiff, SessionsOverviewSection):
+    '''Needed to override get_row_fields, due to mro issue'''
     
     def get_row_fields(self, obj):
         return self.row_fields
 
 class SessionSection(PDFSection):
-    '''Gets passed a session object'''
+    '''This class receives a session object'''
     
     row_fields = [
         'setting',
@@ -673,7 +719,7 @@ def render(self, context):
         )
         return super().render(context)
 
-class SessionSectionDiff(DiffSectionPossibleMissingObjects, SessionSection):
+class SessionSectionDiff(DiffSection, SessionSection):
 
     def render(self, context):
         context.update(
@@ -684,7 +730,7 @@ def render(self, context):
         return super().render(context)
     
 class TaskSection(PDFSection):
-    '''Gets passed a task object'''
+    '''This class receives an task object'''
     
     row_fields = [
         'name',
@@ -722,7 +768,7 @@ def render(self, context):
         )
         return super().render(context)
     
-class TaskSectionDiff(DiffSectionPossibleMissingObjects, TaskSection):
+class TaskSectionDiff(DiffSection, TaskSection):
 
     def render(self, context):
         context.update(
@@ -750,7 +796,7 @@ def render(self, context):
         )
         return super().render(context)
     
-class TasksOverviewSectionDiff(DiffSectionPossibleMissingObjects, TaskSection):
+class TasksOverviewSectionDiff(DiffSection, TaskSection):
 
     def render(self, context):
         context.update(
@@ -761,7 +807,7 @@ def render(self, context):
         return super().render(context)
     
 class StudyOverviewSection(StudySection):
-    '''Receives a Study object'''
+    '''This class receives a Study object.'''
 
     section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
     row_fields = [
@@ -796,7 +842,7 @@ class StudyOverviewSectionDiff(StudySectionDiff, StudyOverviewSection):
     pass
     
 class InformedConsentFormsSection(InterventionSection):
-    '''Receives a Documents object'''
+    '''This class receives a Documents object'''
 
     section_title = _('Informed consent formulieren')
 
@@ -813,8 +859,10 @@ class InformedConsentFormsSection(InterventionSection):
     ]
 
     def make_rows(self):
+
         '''A few fields here need to access different objects, therefore this complex
         overriding of the make_rows function ... :( '''
+
         proposal_list = ['translated_forms', 'translated_forms_languages']
         study_list = ['passive_consent', 'passive_consent_details']
         if self.object_2:
@@ -875,7 +923,8 @@ class InformedConsentSectionDiff(InterventionSectionDiff, InformedConsentFormsSe
     pass
     
 class ExtraDocumentsSection(PDFSection):
-    '''gets a documents object'''
+    '''This class receives an Documents object.
+    Overrides the __init__ to create a formatted section title'''
 
     row_fields = [
         'informed_consent',
@@ -884,7 +933,7 @@ class ExtraDocumentsSection(PDFSection):
 
     def __init__(self, object, count):
         super().__init__(object)
-        self.section_title = _('Extra formulieren ') + str(count)
+        self.section_title = _('Extra formulieren ') + str(count + 1)
     
     def get_row_fields(self, obj):
         rows = copy(self.row_fields)
@@ -896,8 +945,14 @@ def get_row_fields(self, obj):
 
         return rows
     
+class ExtraDocumentsSectionDiff(DiffSection, ExtraDocumentsSection):
+
+    def __init__(self, objects_tuple, count):
+        super().__init__(objects_tuple)
+        self.section_title = _('Extra formulieren ') + str(count+1)     
+    
 class DMPFileSection(PDFSection):
-    '''Gets passed a proposal object.
+    '''This class receives a proposal object
     Also unnecessary I suppose. But I though why not ...'''
 
     section_title = _('Data Management Plan')
@@ -923,10 +978,21 @@ def get_row_fields(self, obj):
         return rows
     
 def get_extra_documents(object):
-    pass
+    '''A function to retrieve all extra documents for a specific proposal.'''
+    from studies.models import Documents
+
+    extra_documents = []
+
+    for document in Documents.objects.filter(
+        proposal = object,
+        study__isnull = True
+    ):
+        extra_documents.append(document)
+    
+    return extra_documents
     
 def create_context_pdf(context, model):
-    from studies.models import Documents
+    '''A function to create the context for the PDF.'''
 
     context['general'] = GeneralSection(model)
     context['wmo'] = WMOSection(model.wmo)
@@ -958,16 +1024,14 @@ def create_context_pdf(context, model):
             study_sections.append(InformedConsentFormsSection(study.documents))
             context['studies'].append(study_sections)
 
-        extra_documents = []
+        extra_documents = get_extra_documents(model)
+
+        extra_documents_objects = [ExtraDocumentsSection(document, count) for count, document \
+                                   in enumerate(extra_documents)]
 
-        for count, document in enumerate(Documents.objects.filter(
-            proposal = model,
-            study__isnull = True
-        )):
-            extra_documents.append(ExtraDocumentsSection(document, count+1))
+        if extra_documents_objects:
+            context['extra_documents'] = extra_documents_objects
 
-        if extra_documents:
-            context['extra_documents'] = extra_documents
         if model.dmp_file:
             context['dmp_file'] = DMPFileSection(model)
             
@@ -975,10 +1039,8 @@ def create_context_pdf(context, model):
     
     return context
 
-from proposals.templatetags.diff_tags import zip_equalize_lists
-
 def create_context_diff(context, models):
-    
+    '''A function to create the context for the diff page.'''
 
     p_proposal = models[0]
     proposal = models[1]
@@ -1005,44 +1067,60 @@ def create_context_diff(context, models):
 
             if p_study is not None and p_study.has_intervention or \
                 study is not None and study.has_intervention:
+
                 interventions = tuple((study.intervention if study is not None \
                                        else study for study in diff_studies))
+                
                 study_sections.append(InterventionSectionDiff(interventions))
+
             if p_study is not None and p_study.has_observation or \
                 study is not None and study.has_observation:
+
                 observations = tuple((study.observation if study is not None \
                                        else study for study in diff_studies))
+                
                 study_sections.append(ObservationSectionDiff(observations))
+
             if p_study is not None and p_study.has_sessions or \
                 study is not None and study.has_sessions:
+
                 study_sections.append(SessionsSectionDiff(diff_studies))
+
                 p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
                                        else study for study in diff_studies))
+                
                 for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
-                    p_sessions = diff_sessions[0]
-                    sessions = diff_sessions[1]
+
                     study_sections.append(SessionSectionDiff(diff_sessions))
+
                     p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
                                        else session for session in diff_sessions))
+                    
                     for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+
                         study_sections.append(TaskSectionDiff(diff_tasks))
+
                 study_sections.append(TasksOverviewSection(diff_sessions))
+
             study_sections.append(StudyOverviewSectionDiff(diff_studies))
+
             documents = tuple(study.documents if study is not None \
                               else study for study in diff_studies)
+            
             study_sections.append(InformedConsentSectionDiff(documents))
+
             context['studies'].append(study_sections)
 
-        extra_documents = []
+        p_extra_docs = get_extra_documents(p_proposal)
+        extra_docs = get_extra_documents(proposal)
+
+        extra_docs_objects = []
 
-        # for count, document in enumerate(Documents.objects.filter(
-        #     proposal = models,
-        #     study__isnull = True
-        # )):
-        #     extra_documents.append(ExtraDocumentsSection(document, count+1))
+        for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
+            extra_docs_objects.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
+        if extra_docs_objects:
+            context['extra_documents'] = extra_docs_objects
 
-        # if extra_documents:
-        #     context['extra_documents'] = extra_documents
         if p_proposal.dmp_file or proposal.dmp_file:
             context['dmp_file'] = DMPFileSection(models)
             
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 7760a9dc0..b2b64755e 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -558,7 +558,6 @@ def get_context_data(self, **kwargs):
 
         return context
 
-
 class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
     template_name = 'proposals/new_proposal_diff.html'
@@ -569,27 +568,6 @@ def get_context_data(self, **kwargs):
         context = create_context_diff(context, (self.object.parent, self.object))
 
         return context
-       
-
-# class ProposalDifference(LoginRequiredMixin, generic.DetailView):
-#     model = Proposal
-#     template_name = 'proposals/proposal_diff.html'
-
-
-
-class NewPDFViewTest(generic.TemplateView):
-
-    template_name = 'proposals/pdf/new_pdf_test.html'
-
-    def get_context_data(self, **kwargs):
-        model = Proposal.objects.last()
-        context = super().get_context_data(**kwargs)
-
-        context = create_context_pdf(context, model)
-               
-        return context
-
-
 
 ########################
 # Preliminary assessment

From 874565a12fcf37d1db8d7ab9ba0a83c9241cda0a Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 20 Sep 2023 17:04:49 +0200
Subject: [PATCH 025/148] tiny bugfix

---
 proposals/urls.py                 | 4 +---
 proposals/utils/pdf_diff_logic.py | 9 +++++----
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/proposals/urls.py b/proposals/urls.py
index 7a4e5e3d5..d7dcd56e5 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -15,8 +15,7 @@
     ProposalSubmitPreApproved, ProposalUpdatePreApproved, \
     ProposalUsersOnlyArchiveView, \
     ProposalCopyAmendment, ProposalsPublicArchiveView, \
-    ProposalUpdateDataManagement, TranslatedConsentFormsView, \
-    NewPDFViewTest
+    ProposalUpdateDataManagement, TranslatedConsentFormsView
 
 from .views.study_views import StudyStart, StudyConsent
 from .views.wmo_views import WmoCreate, WmoUpdate, \
@@ -122,7 +121,6 @@
     path('diff/<int:pk>/', ProposalDifference.as_view(), name='diff'),
 
     path('pdf/<int:pk>/', ProposalAsPdf.as_view(), name='pdf'),
-    path('new_pdf/', NewPDFViewTest.as_view(), name='new_pdf'),
 
     # WMO
     path('wmo/create/<int:pk>/', include([
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index cef84d40f..9ef95899c 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -198,14 +198,15 @@ def __init__(self, object, field):
 
     def get_field_value(self):
         from ..models import Relation
-
+        from studies.models import Compensation
+        
         value = getattr(self.object, self.field)
 
         User = get_user_model()
 
         if value in ('Y', 'N', '?'):
             return self.yes_no_doubt(value)
-        if type(value) in (str, int, date):
+        elif type(value) in (str, int, date):
             return value
         elif value is None:
             return _('Onbekend')
@@ -213,7 +214,7 @@ def get_field_value(self):
             return _('Ja') if value else _('Nee')
         elif type(value) == User:
             return self.handle_user(value)
-        elif type(value) == Relation:
+        elif type(value) == Relation or type(value) == Compensation:
             return value.description
         elif value.__class__.__name__ == 'ManyRelatedManager':
             if value.all().model == User:
@@ -425,7 +426,7 @@ def get_row_fields(self, obj):
             rows.remove('studies_number')
 
         return rows
-    
+
 class StudySection(PDFSection):
     '''This class receives a proposal.study object.'''
     section_title = _('De Deelnemers')

From b88675cd888f2138f3f5fce692a3c4af7a3b7df9 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 21 Sep 2023 10:15:26 +0200
Subject: [PATCH 026/148] Removing now obsolete files

---
 .../proposals/diff/intervention.html          |  32 --
 .../proposals/diff/intervention_v1.html       | 103 -------
 .../proposals/diff/intervention_v2.html       | 125 --------
 .../templates/proposals/diff/observation.html |  33 ---
 .../proposals/diff/observation_v1.html        | 155 ----------
 .../proposals/diff/observation_v2.html        | 174 -----------
 .../templates/proposals/diff/sessions.html    | 186 ------------
 proposals/templates/proposals/diff/study.html | 279 ------------------
 .../proposals/new_proposal_diff.html          | 102 -------
 .../proposals/pdf/diff_table_with_header.html |  53 ----
 .../proposals/pdf/intervention_v1.html        |  50 ----
 .../proposals/pdf/intervention_v2.html        |  60 ----
 .../templates/proposals/pdf/new_pdf_test.html |  83 ------
 .../proposals/pdf/observation_v1.html         |  65 ----
 .../proposals/pdf/observation_v2.html         |  83 ------
 .../pdf/single_object_diff_table.html         |  23 --
 .../proposals/pdf/table_with_header.html      |  13 -
 .../templates/proposals/proposal_diff.html    | 238 ++-------------
 ...eader.html => table_with_header_diff.html} |   0
 proposals/utils/pdf_diff_logic.py             |   6 +-
 proposals/views/proposal_views.py             |   3 +-
 21 files changed, 33 insertions(+), 1833 deletions(-)
 delete mode 100644 proposals/templates/proposals/diff/intervention.html
 delete mode 100644 proposals/templates/proposals/diff/intervention_v1.html
 delete mode 100644 proposals/templates/proposals/diff/intervention_v2.html
 delete mode 100644 proposals/templates/proposals/diff/observation.html
 delete mode 100644 proposals/templates/proposals/diff/observation_v1.html
 delete mode 100644 proposals/templates/proposals/diff/observation_v2.html
 delete mode 100644 proposals/templates/proposals/diff/sessions.html
 delete mode 100644 proposals/templates/proposals/diff/study.html
 delete mode 100644 proposals/templates/proposals/new_proposal_diff.html
 delete mode 100644 proposals/templates/proposals/pdf/diff_table_with_header.html
 delete mode 100644 proposals/templates/proposals/pdf/intervention_v1.html
 delete mode 100644 proposals/templates/proposals/pdf/intervention_v2.html
 delete mode 100644 proposals/templates/proposals/pdf/new_pdf_test.html
 delete mode 100644 proposals/templates/proposals/pdf/observation_v1.html
 delete mode 100644 proposals/templates/proposals/pdf/observation_v2.html
 delete mode 100644 proposals/templates/proposals/pdf/single_object_diff_table.html
 delete mode 100644 proposals/templates/proposals/pdf/table_with_header.html
 rename proposals/templates/proposals/{diff_table_with_header.html => table_with_header_diff.html} (100%)

diff --git a/proposals/templates/proposals/diff/intervention.html b/proposals/templates/proposals/diff/intervention.html
deleted file mode 100644
index c29f558f7..000000000
--- a/proposals/templates/proposals/diff/intervention.html
+++ /dev/null
@@ -1,32 +0,0 @@
-{% load i18n %}
-
-{% if study.has_intervention or p_study.has_intervention %}
-    <h2 class="mt-5 mb-1">{% trans "Het interventieonderzoek" %}</h2>
-
-    {% if study.has_intervention and not p_study.has_intervention %}
-        <div class="warning">
-            {% trans "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat niet bevat." %}
-        </div>
-    {% elif not study.has_intervention and p_study.has_intervention %}
-        <div class="warning">
-            {% trans "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag dat wel bevat." %}
-        </div>
-    {% endif %}
-
-    {% with intervention=study.intervention p_intervention=p_study.intervention %}
-        {% if not intervention or not p_intervention or intervention.version == p_intervention.version %}
-            {% include "studies/study_title.html" %}
-
-            {% if intervention.version == 1 %}
-                {% include "proposals/diff/intervention_v1.html" %}
-            {% elif intervention.version == 2 %}
-                {% include "proposals/diff/intervention_v2.html" %}
-            {% endif %}
-
-        {% else %}
-            <div class="warning">
-                {% trans "De revisie en de originele aanvraag hebben beide een interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere versie van het formulier gebruikt." %}
-            </div>
-        {% endif %}
-    {% endwith %}
-{% endif %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/diff/intervention_v1.html b/proposals/templates/proposals/diff/intervention_v1.html
deleted file mode 100644
index 523a83b85..000000000
--- a/proposals/templates/proposals/diff/intervention_v1.html
+++ /dev/null
@@ -1,103 +0,0 @@
-{% load i18n %}
-{% load get_field_name %}
-{% load proposal_filters %}
-
-<table class="proposals-diff pure-table pure-table-horizontal">
-    <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "setting" %}</th>
-        <td>{{ p_intervention.setting.all|unordered_list }}</td>
-        <td>{{ intervention.setting.all|unordered_list }}</td>
-    </tr>
-    {% if intervention.setting.all|needs_details or p_intervention.setting.all|needs_details %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "setting_details" %}</th>
-            <td>{{ p_intervention.setting_details }}</td>
-            <td>{{ intervention.setting_details }}</td>
-        </tr>
-    {% endif %}
-    {% if study.has_children and intervention.setting.all|needs_details:"needs_supervision" or p_study.has_children and p_intervention.setting.all|needs_details:"needs_supervision" %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "supervision" %}</th>
-            <td>
-                {% if p_intervention %}
-                    {{ p_intervention.supervision|yesno:_("ja,nee,") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if intervention %}
-                    {{ intervention.supervision|yesno:_("ja,nee,") }}
-                {% endif %}
-            </td>
-        </tr>
-        {% if not intervention.supervision or not p_intervention.supervision %}
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}</th>
-                <td>
-                    {% if p_intervention %}
-                        {{ p_intervention.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if intervention %}
-                        {{ intervention.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-            </tr>
-        {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "period" %}</th>
-        <td>{{ p_intervention.period }}</td>
-        <td>{{ intervention.period }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "amount_per_week" %}</th>
-        <td>{{ p_intervention.amount_per_week }}</td>
-        <td>{{ intervention.amount_per_week }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "duration" %}</th>
-        <td>{{ p_intervention.duration }}</td>
-        <td>{{ intervention.duration }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "measurement" %}</th>
-        <td>{{ p_intervention.measurement }}</td>
-        <td>{{ intervention.measurement }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "experimenter" %}</th>
-        <td>{{ p_intervention.experimenter }}</td>
-        <td>{{ intervention.experimenter }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "description" %}</th>
-        <td>{{ p_intervention.description }}</td>
-        <td>{{ intervention.description }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "has_controls" %}</th>
-        <td>
-            {% if p_intervention %}
-                {{ p_intervention.has_controls|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if intervention %}
-                {{ intervention.has_controls|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if intervention.has_controls or p_intervention.has_controls %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "controls_description" %}</th>
-            <td>{{ p_intervention.controls_description }}</td>
-            <td>{{ intervention.controls_description }}</td>
-        </tr>
-    {% endif %}
-</table>
diff --git a/proposals/templates/proposals/diff/intervention_v2.html b/proposals/templates/proposals/diff/intervention_v2.html
deleted file mode 100644
index db9d05ebf..000000000
--- a/proposals/templates/proposals/diff/intervention_v2.html
+++ /dev/null
@@ -1,125 +0,0 @@
-{% load i18n %}
-{% load get_field_name %}
-{% load proposal_filters %}
-
-<table class="proposals-diff pure-table pure-table-horizontal">
-    <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "setting" %}</th>
-        <td>{{ p_intervention.setting.all|unordered_list }}</td>
-        <td>{{ intervention.setting.all|unordered_list }}</td>
-    </tr>
-    {% if intervention.setting.all|needs_details or p_intervention.setting.all|needs_details %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "setting_details" %}</th>
-            <td>{{ p_intervention.setting_details }}</td>
-            <td>{{ intervention.setting_details }}</td>
-        </tr>
-    {% endif %}
-    {% if study.has_children and intervention.setting.all|needs_details:"needs_supervision" or p_study.has_children and p_intervention.setting.all|needs_details:"needs_supervision" %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "supervision" %}</th>
-            <td>
-                {% if p_intervention %}
-                    {{ p_intervention.supervision|yesno:_("ja,nee,") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if intervention %}
-                    {{ intervention.supervision|yesno:_("ja,nee,") }}
-                {% endif %}
-            </td>
-        </tr>
-        {% if not intervention.supervision or not p_intervention.supervision %}
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}</th>
-                <td>
-                    {% if p_intervention %}
-                        {{ p_intervention.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if intervention %}
-                        {{ intervention.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-            </tr>
-        {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "period" %}</th>
-        <td>{{ p_intervention.period }}</td>
-        <td>{{ intervention.period }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "multiple_sessions" %}</th>
-        <td>
-            {% if p_intervention %}
-                {{ p_intervention.multiple_sessions|yesno:_("ja,nee,") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if intervention %}
-                {{ intervention.multiple_sessions|yesno:_("ja,nee,") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if  p_intervention.multiple_sessions or intervention.multiple_sessions %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "session_frequency" %}</th>
-            <td>{{ p_intervention.session_frequency }}</td>
-            <td>{{ intervention.session_frequency }}</td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "duration" %}</th>
-        <td>{{ p_intervention.duration }}</td>
-        <td>{{ intervention.duration }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "measurement" %}</th>
-        <td>{{ p_intervention.measurement }}</td>
-        <td>{{ intervention.measurement }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "experimenter" %}</th>
-        <td>{{ p_intervention.experimenter }}</td>
-        <td>{{ intervention.experimenter }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "description" %}</th>
-        <td>{{ p_intervention.description }}</td>
-        <td>{{ intervention.description }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "has_controls" %}</th>
-        <td>
-            {% if p_intervention %}
-                {{ p_intervention.has_controls|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if intervention %}
-                {{ intervention.has_controls|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if intervention.has_controls or p_intervention.has_controls %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "controls_description" %}</th>
-            <td>{{ p_intervention.controls_description }}</td>
-            <td>{{ intervention.controls_description }}</td>
-        </tr>
-    {% endif %}
-    {% if intervention.extra_task or p_intervention.extra_task %}
-        <tr>
-            <th>{% get_verbose_field_name "interventions" "intervention" "extra_task" %}</th>
-            <td>{{ p_intervention.extra_task }}</td>
-            <td>{{ intervention.extra_task }}</td>
-        </tr>
-    {% endif %}
-</table>
diff --git a/proposals/templates/proposals/diff/observation.html b/proposals/templates/proposals/diff/observation.html
deleted file mode 100644
index 8292c94ff..000000000
--- a/proposals/templates/proposals/diff/observation.html
+++ /dev/null
@@ -1,33 +0,0 @@
-{% load i18n %}
-
-{% if study.has_observation or p_study.has_observation %}
-    <h2 class="mt-5 mb-1">{% trans "Het observatieonderzoek" %}</h2>
-
-    {% if study.has_observation and not p_study.has_observation %}
-        <div class="warning">
-            {% trans "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet bevat." %}
-        </div>
-    {% elif not study.has_observation and p_study.has_observation %}
-        <div class="warning">
-            {% trans "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat wel bevat." %}
-        </div>
-    {% endif %}
-
-    {% with observation=study.observation p_observation=p_study.observation %}
-        {% if not observation or not p_observation or observation.version == p_observation.version %}
-            {% include "studies/study_title.html" %}
-
-            {% if observation.version == 1 %}
-                {% include "proposals/diff/observation_v1.html" %}
-            {% elif observation.version == 2 %}
-                {% include "proposals/diff/observation_v2.html" %}
-            {% endif %}
-
-        {% else %}
-            <div class="warning">
-                {% trans "De revisie en de originele aanvraag hebben beide een observatieonderzoek, maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere versie van het formulier gebruikt." %}
-            </div>
-        {% endif %}
-    {% endwith %}
-
-{% endif %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/diff/observation_v1.html b/proposals/templates/proposals/diff/observation_v1.html
deleted file mode 100644
index 74e3892da..000000000
--- a/proposals/templates/proposals/diff/observation_v1.html
+++ /dev/null
@@ -1,155 +0,0 @@
-{% load i18n %}
-{% load get_field_name %}
-{% load proposal_filters %}
-
-
-<table class="proposals-diff pure-table pure-table-horizontal">
-    <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "setting" %}</th>
-        <td>{{ p_observation.setting.all|unordered_list }}</td>
-        <td>{{ observation.setting.all|unordered_list }}</td>
-    </tr>
-    {% if observation.setting.all|needs_details or p_observation.setting.all|needs_details %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "setting_details" %}</th>
-            <td>{{ p_observation.setting_details }}</td>
-            <td>{{ observation.setting_details }}</td>
-        </tr>
-    {% endif %}
-    {% if study.has_children and observation.setting.all|needs_details:"needs_supervision" or p_study.has_children and p_observation.setting.all|needs_details:"needs_supervision" %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "supervision" %}</th>
-            <td>
-                {% if p_observation %}
-                    {{ p_observation.supervision|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if observation %}
-                    {{ observation.supervision|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-        </tr>
-        {% if not observation.supervision or not p_observation.supervision %}
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}</th>
-                <td>
-                    {% if p_observation %}
-                        {{ p_observation.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if observation %}
-                        {{ observation.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-            </tr>
-        {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "days" %}</th>
-        <td>{{ p_observation.days }}</td>
-        <td>{{ observation.days }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "mean_hours" %}</th>
-        <td>{{ p_observation.mean_hours }}</td>
-        <td>{{ observation.mean_hours }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_anonymous" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.is_anonymous|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.is_anonymous|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.is_in_target_group|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.is_in_target_group|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.is_nonpublic_space|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.is_nonpublic_space|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if observation.is_nonpublic_space or p_observation.is_nonpublic_space %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}</th>
-            <td>
-                {% if p_observation %}
-                    {{ p_observation.has_advanced_consent|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if observation %}
-                    {{ observation.has_advanced_consent|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "needs_approval" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.needs_approval|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.needs_approval|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if observation.needs_approval or p_observation.is_nonpublic_space %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "approval_institution" %}</th>
-            <td>{{ p_observation.approval_institution }}</td>
-            <td>{{ observation.approval_institution }}</td>
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "approval_document" %}</th>
-            <td><a href="{{ p_observation.approval_document.url }}" target="_blank">{% trans "Download" %}</a></td>
-            <td><a href="{{ observation.approval_document.url }}" target="_blank">{% trans "Download" %}</a></td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "registrations" %}</th>
-        <td>{{ p_observation.registrations.all|unordered_list }}</td>
-        <td>{{ observation.registrations.all|unordered_list }}</td>
-    </tr>
-    {% if observation.registrations.all|needs_details or p_observation.registrations.all|needs_details %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "registrations_details" %}</th>
-            <td>{{ p_observation.registrations_details }}</td>
-            <td>{{ observation.registrations_details }}</td>
-        </tr>
-    {% endif %}
-</table>
diff --git a/proposals/templates/proposals/diff/observation_v2.html b/proposals/templates/proposals/diff/observation_v2.html
deleted file mode 100644
index 3899ad06a..000000000
--- a/proposals/templates/proposals/diff/observation_v2.html
+++ /dev/null
@@ -1,174 +0,0 @@
-{% load i18n %}
-{% load get_field_name %}
-{% load proposal_filters %}
-
-
-<table class="proposals-diff pure-table pure-table-horizontal">
-    <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "setting" %}</th>
-        <td>{{ p_observation.setting.all|unordered_list }}</td>
-        <td>{{ observation.setting.all|unordered_list }}</td>
-    </tr>
-    {% if observation.setting.all|needs_details or p_observation.setting.all|needs_details %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "setting_details" %}</th>
-            <td>{{ p_observation.setting_details }}</td>
-            <td>{{ observation.setting_details }}</td>
-        </tr>
-    {% endif %}
-    {% if study.has_children and observation.setting.all|needs_details:"needs_supervision" or p_study.has_children and p_observation.setting.all|needs_details:"needs_supervision" %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "supervision" %}</th>
-            <td>
-                {% if p_observation %}
-                    {{ p_observation.supervision|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if observation %}
-                    {{ observation.supervision|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-        </tr>
-        {% if not observation.supervision or not p_observation.supervision %}
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}</th>
-                <td>
-                    {% if p_observation %}
-                        {{ p_observation.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if observation %}
-                        {{ observation.leader_has_coc|yesno:_("ja,nee,") }}
-                    {% endif %}
-                </td>
-            </tr>
-        {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "details_who" %}</th>
-        <td>{{ p_observation.details_who }}</td>
-        <td>{{ observation.details_who }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "details_why" %}</th>
-        <td>{{ p_observation.details_why }}</td>
-        <td>{{ observation.details_why }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "details_frequency" %}</th>
-        <td>{{ p_observation.details_frequency }}</td>
-        <td>{{ observation.details_frequency }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_anonymous" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.is_anonymous|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.is_anonymous|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if observation.is_anonymous or p_observation.is_anonymous %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "is_anonymous_details" %}</th>
-            <td>{{ p_observation.is_anonymous_details }}</td>
-            <td>{{ observation.is_anonymous_details }}</td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.is_in_target_group|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.is_in_target_group|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if observation.is_in_target_group or p_observation.is_in_target_group %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group_details" %}</th>
-            <td>{{ p_observation.is_in_target_group_details }}</td>
-            <td>{{ observation.is_in_target_group_details }}</td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.is_nonpublic_space|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.is_nonpublic_space|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if observation.is_nonpublic_space or p_observation.is_nonpublic_space %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space_details" %}</th>
-            <td>{{ p_observation.is_nonpublic_space_details }}</td>
-            <td>{{ observation.is_nonpublic_space_details }}</td>
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}</th>
-            <td>
-                {% if p_observation %}
-                    {{ p_observation.has_advanced_consent|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if observation %}
-                    {{ observation.has_advanced_consent|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "needs_approval" %}</th>
-        <td>
-            {% if p_observation %}
-                {{ p_observation.needs_approval|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-        <td>
-            {% if observation %}
-                {{ observation.needs_approval|yesno:_("ja,nee") }}
-            {% endif %}
-        </td>
-    </tr>
-    {% if observation.needs_approval or p_observation.is_nonpublic_space %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "approval_institution" %}</th>
-            <td>{{ p_observation.approval_institution }}</td>
-            <td>{{ observation.approval_institution }}</td>
-        </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "registrations" %}</th>
-        <td>{{ p_observation.registrations.all|unordered_list }}</td>
-        <td>{{ observation.registrations.all|unordered_list }}</td>
-    </tr>
-    {% if observation.registrations.all|needs_details or p_observation.registrations.all|needs_details %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "registrations_details" %}</th>
-            <td>{{ p_observation.registrations_details }}</td>
-            <td>{{ observation.registrations_details }}</td>
-        </tr>
-    {% endif %}
-</table>
diff --git a/proposals/templates/proposals/diff/sessions.html b/proposals/templates/proposals/diff/sessions.html
deleted file mode 100644
index 0021a51d0..000000000
--- a/proposals/templates/proposals/diff/sessions.html
+++ /dev/null
@@ -1,186 +0,0 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-{% load diff_tags %}
-
-{% if study.has_sessions or p_study.has_sessions %}
-    <h2 class="mt-5 mb-1">{% trans "Het takenonderzoek en interviews" %}</h2>
-
-    {% if study.has_sessions and not p_study.has_sessions %}
-        <div class="warning">
-            {% trans "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet bevat." %}
-        </div>
-    {% elif not study.has_sessions and p_study.has_sessions %}
-        <div class="warning">
-            {% trans "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel bevat." %}
-        </div>
-    {% endif %}
-
-    {% include "studies/study_title.html" %}
-    <table class="proposals-diff ">
-        <tr>
-            <th class="proposals-diff-question"></th>
-            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "sessions_number" %}</th>
-            <td>{{ p_study.sessions_number }}</td>
-            <td>{{ study.sessions_number }}</td>
-        </tr>
-    </table>
-
-    {% get_zipped_sessions_lists zipped_sessions study p_study %}
-
-    {% for session, p_session in zipped_sessions %}
-        <br/>
-        {% include "tasks/session_title.html" %}
-        <br/>
-        <table class="proposals-diff ">
-            <tr>
-                <th class="proposals-diff-question"></th>
-                <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "setting" %}</th>
-                <td>{{ p_session.setting.all|unordered_list }}</td>
-                <td>{{ session.setting.all|unordered_list }}</td>
-            </tr>
-            {% if session.setting.all|needs_details or p_session.setting.all|needs_details %}
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "session" "setting_details" %}</th>
-                    <td>{{ p_session.setting_details }}</td>
-                    <td>{{ session.setting_details }}</td>
-                </tr>
-            {% endif %}
-            {% if study.has_children and session.setting.all|needs_details:"needs_supervision" or p_study.has_children and p_session.setting.all|needs_details:"needs_supervision" %}
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "session" "supervision" %}</th>
-                    <td>
-                        {% if p_session %}
-                            {{ p_session.supervision|yesno:_("ja,nee,") }}
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if session %}
-                            {{ session.supervision|yesno:_("ja,nee,") }}
-                        {% endif %}
-                    </td>
-                </tr>
-                {% if not session.supervision or not p_session.supervision %}
-                    <tr>
-                        <th>{% get_verbose_field_name "tasks" "session" "leader_has_coc" %}</th>
-                        <td>
-                            {% if p_session %}
-                                {{ p_session.leader_has_coc|yesno:_("ja,nee,") }}
-                            {% endif %}
-                        </td>
-                        <td>
-                            {% if session %}
-                                {{ session.leader_has_coc|yesno:_("ja,nee,") }}
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endif %}
-            {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "tasks_number" %}</th>
-                <td>{{ p_session.tasks_number }}</td>
-                <td>{{ session.tasks_number }}</td>
-            </tr>
-        </table>
-
-        {% get_zipped_tasks_lists zipped_tasks session p_session %}
-
-        {% for task, p_task in zipped_tasks %}
-            <br/>
-            {% include "tasks/task_title.html" %}
-            <br/>
-            <table class="proposals-diff ">
-                <tr>
-                    <th class="proposals-diff-question"></th>
-                    <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                    <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                </tr>
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "name" %}</th>
-                    <td>{{ p_task.name }}</td>
-                    <td>{{ task.name }}</td>
-                </tr>
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "description" %}</th>
-                    <td>{{ p_task.description }}</td>
-                    <td>{{ task.description }}</td>
-                </tr>
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "duration" %}</th>
-                    <td>{{ p_task.duration }}</td>
-                    <td>{{ task.duration }}</td>
-                </tr>
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "registrations" %}</th>
-                    <td>{{ p_task.registrations.all|unordered_list }}</td>
-                    <td>{{ task.registrations.all|unordered_list }}</td>
-                </tr>
-                {% if task.registrations.all|needs_details or p_task.registrations.all|needs_details %}
-                    <tr>
-                        <th>{% get_verbose_field_name "tasks" "task" "registrations_details" %}</th>
-                        <td>{{ p_task.registrations_details }}</td>
-                        <td>{{ task.registrations_details }}</td>
-                    </tr>
-                {% endif %}
-                {% if task.registrations.all|needs_details:"needs_kind" or p_task.registrations.all|needs_details:"needs_kind" %}
-                    <tr>
-                        <th>{% get_verbose_field_name "tasks" "task" "registration_kinds" %}</th>
-                        <td>{{ p_task.registration_kinds.all|unordered_list }}</td>
-                        <td>{{ task.registration_kinds.all|unordered_list }}</td>
-                    </tr>
-                    {% if task.registration_kinds.all|needs_details or p_task.registration_kinds.all|needs_details %}
-                        <tr>
-                            <th>{% get_verbose_field_name "tasks" "task" "registration_kinds_details" %}</th>
-                            <td>{{ p_task.registration_kinds_details }}</td>
-                            <td>{{ task.registration_kinds_details }}</td>
-                        </tr>
-                    {% endif %}
-                {% endif %}
-                <tr>
-                    <th>{% get_verbose_field_name "tasks" "task" "feedback" %}</th>
-                    <td>
-                        {% if p_task %}
-                            {{ p_task.feedback|yesno:_("ja,nee") }}
-                        {% endif %}
-                    </td>
-                    <td>
-                        {% if task %}
-                            {{ task.feedback|yesno:_("ja,nee") }}
-                        {% endif %}
-                    </td>
-                </tr>
-                {% if task.feedback or p_task.feedback %}
-                    <tr>
-                        <th>{% get_verbose_field_name "tasks" "task" "feedback_details" %}</th>
-                        <td>{{ p_task.feedback_details }}</td>
-                        <td>{{ task.feedback_details }}</td>
-                    </tr>
-                {% endif %}
-            </table>
-        {% endfor %}
-
-        <h3 class="mt-5 mb-1">{% trans "Overzicht van het takenonderzoek" %}</h3>
-        <table class="proposals-diff ">
-            <tr>
-                <th class="proposals-diff-question"></th>
-                <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-            </tr>
-            <tr>
-                {% comment %} Hardcoded this, to get over an annoying error {% endcomment %}
-                <th>{% get_verbose_field_name "tasks" "session" "tasks_duration" 45 %}</th> 
-                <td>{{ p_session.tasks_duration }}</td>
-                <td>{{ session.tasks_duration }}</td>
-            </tr>
-        </table>
-    {% endfor %}
-
-{% endif %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/diff/study.html b/proposals/templates/proposals/diff/study.html
deleted file mode 100644
index f92a321b5..000000000
--- a/proposals/templates/proposals/diff/study.html
+++ /dev/null
@@ -1,279 +0,0 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load static %}
-{% load uil_filters %}
-{% load get_field_name %}
-{% load diff_tags %}
-
-{% for study, p_study in proposal.study_set.all|zip_equalize_lists:p_proposal.study_set.all %}
-    <h2 class="mt-5 mb-1">{% trans "De deelnemers" %}</h2>
-    {% include "studies/study_title.html" %}
-
-    {% if study and not p_study %}
-        <div class="warning">
-            {% trans "Dit traject is nieuw in de revisie." %}
-        </div>
-    {% elif not study and p_study %}
-        <div class="warning">
-            {% trans "Dit traject is weggehaald uit de revisie" %}
-        </div>
-    {% endif %}
-
-    <table class="proposals-diff ">
-        <tr>
-            <th class="proposals-diff-question"></th>
-            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "age_groups" %}</th>
-            <td>{{ p_study.age_groups.all|unordered_list }}</td>
-            <td>{{ study.age_groups.all|unordered_list }}</td>
-        </tr>
-        {% if study|has_adults or p_study|has_adults %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "legally_incapable" %}</th>
-                <td>
-                    {# You're going to see this a lot, so lemme explain. #}
-                    {# One would think `yesno` has a 'None' option. It does! #}
-                    {# But if you reference an attribute of None, Django will  #}
-                    {# insert 'False' instead.... So this if is the only way #}
-                    {# to not display anything if one of the two studies is None #}
-                    {% if p_study %}
-                        {{ p_study.legally_incapable|yesno:_("ja,nee") }}
-                    {% endif %}
-                </td>
-                <td>
-                    {% if study %}
-                        {{ study.legally_incapable|yesno:_("ja,nee") }}
-                    {% endif %}
-                </td>
-            </tr>
-            {% if study.legally_incapable or p_study.legally_incapable %}
-                <tr>
-                    <th>{% get_verbose_field_name "studies" "study" "legally_incapable_details" %}</th>
-                    <td>{{ p_study.legally_incapable_details }}</td>
-                    <td>{{ study.legally_incapable_details }}</td>
-                </tr>
-            {% endif %}
-        {% endif %}
-
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "has_special_details" %}</th>
-            <td>{{ p_study.has_special_details|yesno:_("ja,nee") }}</td>
-            <td>{{ study.has_special_details|yesno:_("ja,nee") }}</td>
-        </tr>
-        {% if study.has_special_details %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "special_details" %}</th>
-                <td>{{ p_study.special_details.all|unordered_list }}</td>
-                <td>{{ study.special_details.all|unordered_list }}</td>
-            </tr>
-            {% if study.special_details.all|medical_traits %}
-                <tr>
-                    <th>{% get_verbose_field_name "studies" "study" "traits" %}</th>
-                    <td>{{ p_study.traits.all|unordered_list }}</td>
-                    <td>{{ study.traits.all|unordered_list }}</td>
-                </tr>
-                {% if study.traits.all|needs_details %}
-                    <tr>
-                        <th>{% get_verbose_field_name "studies" "study" "traits_details" %}</th>
-                        <td>{{ p_study.traits_details }}</td>
-                        <td>{{ study.traits_details }}</td>
-                    </tr>
-                {% endif %}
-            {% endif %}
-        {% endif %}
-        
-        {% if study|necessity_required or p_study|necessity_required %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "necessity" %}</th>
-                <td>{{ p_study.get_necessity_display }}</td>
-                <td>{{ study.get_necessity_display }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "necessity_reason" %}</th>
-                <td>{{ p_study.necessity_reason }}</td>
-                <td>{{ study.necessity_reason }}</td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "recruitment" %}</th>
-            <td>{{ p_study.recruitment.all|unordered_list }}</td>
-            <td>{{ study.recruitment.all|unordered_list }}</td>
-        </tr>
-        {% if study.recruitment.all|needs_details or p_study.recruitment.all|needs_details %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "recruitment_details" %}</th>
-                <td>{{ p_study.recruitment_details }}</td>
-                <td>{{ study.recruitment_details }}</td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "compensation" %}</th>
-            <td>{{ p_study.compensation }}</td>
-            <td>{{ study.compensation }}</td>
-        </tr>
-        {% if study.compensation.needs_details or p_study.compensation.needs_details %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "compensation_details" %}</th>
-                <td>{{ p_study.compensation_details }}</td>
-                <td>{{ study.compensation_details }}</td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "hierarchy" %}</th>
-            <td>{{ p_study.hierarchy }}</td>
-            <td>{{ study.hierarchy }}</td>
-        </tr>
-        {% if study.hierarchy or p_study.hierarchy %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "hierarchy_details" %}</th>
-            <td>{{ p_study.hierarchy_details }}</td>
-            <td>{{ study.hierarchy_details }}</td>
-        </tr>
-        {% endif %}
-    </table>
-
-    {% include 'proposals/diff/intervention.html' %}
-
-    {% include 'proposals/diff/observation.html' %}
-
-    {% include 'proposals/diff/sessions.html' %}
-
-    <h2 class="mt-5 mb-1">{% trans "Overzicht en eigen beoordeling van het gehele onderzoek" %}</h2>
-    <br/>
-    {% include "studies/study_title.html" %}
-    <br/>
-    <table class="proposals-diff ">
-        <tr>
-            <th class="proposals-diff-question"></th>
-            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-        </tr>
-        {% if study.has_sessions or p_study.has_sessions %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "deception" %}</th>
-                <td>{{ p_study.get_deception_display }}</td>
-                <td>{{ study.get_deception_display }}</td>
-            </tr>
-            {% if study.deception == 'Y' or study.deception == '?' or p_study.deception == 'Y' or p_study.deception == '?' %}
-                <tr>
-                    <th>{% get_verbose_field_name "studies" "study" "deception_details" %}</th>
-                    <td>{{ p_study.deception_details }}</td>
-                    <td>{{ study.deception_details }}</td>
-                </tr>
-            {% endif %}
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "negativity" %}</th>
-            <td>{{ p_study.get_negativity_display }}</td>
-            <td>{{ study.get_negativity_display }}</td>
-        </tr>
-        {% if study.negativity == 'Y' or study.negativity == '?' or p_study.negativity == 'Y' or p_study.negativity == '?' %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "negativity_details" %}</th>
-                <td>{{ p_study.negativity_details }}</td>
-                <td>{{ study.negativity_details }}</td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "stressful" %}</th>
-            <td>{{ p_study.get_stressful_display }}</td>
-            <td>{{ study.get_stressful_display }}</td>
-        </tr>
-        {% if study.stressful == 'Y' or study.stressful == '?' or p_study.stressful == 'Y' or p_study.stressful == '?' %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "stressful_details" %}</th>
-                <td>{{ p_study.stressful_details }}</td>
-                <td>{{ study.stressful_details }}</td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "risk" %}</th>
-            <td>{{ p_study.get_risk_display }}</td>
-            <td>{{ study.get_risk_display }}</td>
-        </tr>
-        {% if study.risk == 'Y' or study.risk == '?' or p_study.risk == 'Y' or p_study.risk == '?' %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "risk_details" %}</th>
-                <td>{{ p_study.risk_details }}</td>
-                <td>{{ study.risk_details }}</td>
-            </tr>
-        {% endif %}
-    </table>
-
-    <h2 class="mt-5 mb-1">{% trans "Informed consent formulieren voor het onderzoek" %}</h2>
-    {% include "studies/study_title.html" %}
-
-    {% get_study_documents documents study %}
-    {% get_study_documents p_documents p_study %}
-
-    <table class="proposals-diff ">
-        <tr>
-            <th class="proposals-diff-question"></th>
-            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "proposals" "proposal" "translated_forms" %}</th>
-            <td>{{ p_proposal.translated_forms|yesno:_("ja,nee") }}</td>
-            <td>{{ proposal.translated_forms|yesno:_("ja,nee") }}</td>
-        </tr>
-        {% if proposal.translated_forms or p_proposal.translated_forms %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "translated_forms_languages" %}</th>
-                <td>{{ p_proposal.translated_forms_languages }}</td>
-                <td>{{ proposal.translated_forms_languages }}</td>
-            </tr>
-        {% endif %}
-        <tr>
-            <th>{% get_verbose_field_name "studies" "documents" "informed_consent" %}</th>
-            {% if p_documents.informed_consent %}
-                <td><a href="{{ p_documents.informed_consent.url }}" target="_blank">{% trans "Download" %}</a></td>
-            {% else %}
-                <td></td>
-            {% endif %}
-
-            {% if documents.informed_consent %}
-                <td><a href="{{ documents.informed_consent.url }}" target="_blank">{% trans "Download" %}</a></td>
-            {% else %}
-                <td></td>
-            {% endif %}
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "studies" "documents" "briefing" %}</th>
-            {% if p_documents.briefing %}
-                <td><a href="{{ p_documents.briefing.url }}" target="_blank">{% trans "Download" %}</a></td>
-            {% else %}
-                <td></td>
-            {% endif %}
-
-            {% if documents.briefing %}
-                <td><a href="{{ documents.briefing.url }}" target="_blank">{% trans "Download" %}</a></td>
-            {% else %}
-                <td></td>
-            {% endif %}
-        </tr>
-        <tr>
-            <th>{% get_verbose_field_name "studies" "study" "passive_consent" %}</th>
-            <td>
-                {% if p_study %}
-                    {{ p_study.passive_consent|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-            <td>
-                {% if study %}
-                    {{ study.passive_consent|yesno:_("ja,nee") }}
-                {% endif %}
-            </td>
-        </tr>
-        {% if study.passive_consent or p_study.passive_consent %}
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "passive_consent_details" %}</th>
-                <td>{{ p_study.passive_consent_details }}</td>
-                <td>{{ study.passive_consent_details }}</td>
-            </tr>
-        {% endif %}
-    </table>
-{% endfor %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/new_proposal_diff.html b/proposals/templates/proposals/new_proposal_diff.html
deleted file mode 100644
index f7d1a3e15..000000000
--- a/proposals/templates/proposals/new_proposal_diff.html
+++ /dev/null
@@ -1,102 +0,0 @@
-{% extends "base/base.html" %}
-
-{% load i18n %}
-{% load proposal_filters %}
-{% load static %}
-{% load uil_filters %}
-{% load get_field_name %}
-{% load diff_tags %}
-
-{% block header_title %}
-    {% trans "Overzicht van wijzigingen" %} - {{ block.super }}
-{% endblock %}
-
-{% block html_head %}
-    <script src="{% static 'main/js/htmldiff.js' %}"></script>
-    <script>
-        $(function () {
-            // Color changes between proposals
-            $('td:nth-child(2)').each(function () {
-                let old_el = $(this);
-                let new_el = old_el.next();
-                let before = html_to_tokens(old_el.html());
-                let after = html_to_tokens(new_el.html());
-                let ops = calculate_operations(before, after);
-
-                old_el.html(render_before_operations(before, after, ops));
-                new_el.html(render_after_operations(before, after, ops));
-            });
-            $("#loading-icon").hide();
-        });
-    </script>
-{% endblock %}
-
-{% block content %}
-    <div class="uu-inner-container">
-        <div class="col-12">
-            <h2>{% trans "Overzicht van wijzigingen" %}</h2>
-            <p>
-                {% trans "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten opzichte van de originele aanvraag." %}
-            </p>
-        </div>
-    </div>
-    <div class="uu-inner-container">
-        <div class="col-12 compare document-compare">
-            <div class="col-12 text-center mt-5 mb-5" id="loading-icon">
-                <img src="{% static 'main/images/loading.gif' %}"/>
-            </div>
-
-                {% include general %}
-
-                {% include wmo %}
-
-                {% if metc %}
-                  {% include metc %}
-                {% endif %}
-          
-                {% include trajectories %}
-
-                {% if studies %}
-                    {% for study in studies %}
-                        {% for study_section in study %}
-                            {% include study_section %}
-                        {% endfor %}
-                    {% endfor %}
-
-                    {% if extra_documents %}
-                        {% for document in extra_documents %}
-                            {% include document %}
-                        {% endfor %}
-                    {% endif %}
-
-                    {% if dmp_file %}
-                        {% include dmp_file %}
-                    {% endif %}
-
-                    {% include embargo %}
-
-                    
-                    <h2 class="mt-5 mb-1">{% trans "Eventuele opmerkingen" %}</h2>
-                    <table class="proposals-diff ">
-                        <tr>
-                            <th class="proposals-diff-question"></th>
-                            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                        </tr>
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
-                            <td>{{ p_proposal.comments }}</td>
-                            <td>{{ proposal.comments }}</td>
-                        </tr>
-                    </table>
-                {% endif %}
-
-            <p class="mt-5 float-right">
-                <button class="button" onclick="window.history.back();">
-                    {% trans "Terug naar de vorige pagina" %}
-                </button>
-            </p>
-
-        </div>
-    </div>
-{% endblock %}
diff --git a/proposals/templates/proposals/pdf/diff_table_with_header.html b/proposals/templates/proposals/pdf/diff_table_with_header.html
deleted file mode 100644
index 46bcbea30..000000000
--- a/proposals/templates/proposals/pdf/diff_table_with_header.html
+++ /dev/null
@@ -1,53 +0,0 @@
-{% load diff_tags %}
-{% load i18n %}
-
-{% if section_title %}
-    <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
-{% endif %}
-{% if study_title %}
-    <h3> {{ study_title }} </h3>
-{% endif %}
-<table class="proposals-diff ">
-    <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-    </tr>
-{% if warning and missing_object == 0 %}
-    <tr>
-        <th>{{ rows.0.verbose_name }}</th>
-        <td rowspan='{{rows|length}}'>
-            <div class='warning'>
-                {{ warning }}
-            </div>
-        </td>
-        <td>{{rows.0.value}}</td>
-    </tr>
-    {%for row in rows|slice:"1:"%}
-    <tr>
-        <th>{{row.verbose_name}}</th><td>{{row.value}}
-    </tr>
-    {% endfor %}
-{% elif warning and missing_object == 1 %}
-    <tr>
-        <th>{{ rows.0.verbose_name }}</th>
-        <td>{{rows.0.value}}</td>
-        <td rowspan='{{rows|length}}'>
-            <div class='warning'>
-                {{ warning }}
-            </div>
-        </td>
-    </tr>
-    {%for row in rows|slice:"1:"%}
-    <tr>
-        <th>{{row.verbose_name}}</th><td>{{row.value}}
-    </tr>
-    {% endfor %}
-{% else %}
-    {% for row in rows %}
-        <tr>
-            <th>{{ row.verbose_name }}</th><td>{{ row.value }}</td><td>{{row.value_2}}</td>
-        </tr>
-    {% endfor %}
-{% endif %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/intervention_v1.html b/proposals/templates/proposals/pdf/intervention_v1.html
deleted file mode 100644
index 462672fe3..000000000
--- a/proposals/templates/proposals/pdf/intervention_v1.html
+++ /dev/null
@@ -1,50 +0,0 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-
-<table>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "setting" %}</th><td>{{ intervention.setting.all|unordered_list }}</td>
-    </tr>
-    {% if intervention.setting.all|needs_details %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "setting_details" %}</th><td>{{ intervention.setting_details }}</td>
-    </tr>
-    {% endif %}
-    {% if study.has_children and intervention.setting.all|needs_details:"needs_supervision" %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "supervision" %}</th><td>{{ intervention.supervision|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if not intervention.supervision %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}</th><td>{{ intervention.leader_has_coc|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "period" %}</th><td>{{ intervention.period }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "amount_per_week" %}</th><td>{{ intervention.amount_per_week }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "duration" %}</th><td>{{ intervention.duration }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "measurement" %}</th><td>{{ intervention.measurement }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "experimenter" %}</th><td>{{ intervention.experimenter }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "description" %}</th><td>{{ intervention.description }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "has_controls" %}</th><td>{{ intervention.has_controls|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if intervention.has_controls %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "controls_description" %}</th><td>{{ intervention.controls_description }}</td>
-    </tr>
-    {% endif %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/intervention_v2.html b/proposals/templates/proposals/pdf/intervention_v2.html
deleted file mode 100644
index d5552ab83..000000000
--- a/proposals/templates/proposals/pdf/intervention_v2.html
+++ /dev/null
@@ -1,60 +0,0 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-
-<table>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "setting" %}</th><td>{{ intervention.setting.all|unordered_list }}</td>
-    </tr>
-    {% if intervention.setting.all|needs_details %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "setting_details" %}</th><td>{{ intervention.setting_details }}</td>
-    </tr>
-    {% endif %}
-    {% if study.has_children and intervention.setting.all|needs_details:"needs_supervision" %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "supervision" %}</th><td>{{ intervention.supervision|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if not intervention.supervision %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}</th><td>{{ intervention.leader_has_coc|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "period" %}</th><td>{{ intervention.period }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "multiple_sessions" %}</th><td>{{ intervention.multiple_sessions|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if intervention.multiple_sessions %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "session_frequency" %}</th><td>{{ intervention.session_frequency }}</td>
-    </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "duration" %}</th><td>{{ intervention.duration }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "measurement" %}</th><td>{{ intervention.measurement }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "experimenter" %}</th><td>{{ intervention.experimenter }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "description" %}</th><td>{{ intervention.description }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "has_controls" %}</th><td>{{ intervention.has_controls|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if intervention.has_controls %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "controls_description" %}</th><td>{{ intervention.controls_description }}</td>
-    </tr>
-    {% endif %}
-    {% if not intervention.settings_contains_schools %}
-    <tr>
-        <th>{% get_verbose_field_name "interventions" "intervention" "extra_task" %}</th><td>{{ intervention.extra_task|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/new_pdf_test.html b/proposals/templates/proposals/pdf/new_pdf_test.html
deleted file mode 100644
index deaa433ad..000000000
--- a/proposals/templates/proposals/pdf/new_pdf_test.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% extends "base/base.html" %}
-
-{% load static %}
-{% load proposal_filters %}
-{% load fetc_filters %}
-{% load i18n %}
-{% load compare_tags %}
-{% load uil_filters %}
-
-{% block header_title %}
-    New PDF test
-{% endblock %}
-
-{% block content %}
-
-    {% include general %}
-    {% include wmo %}
-
-    {% if metc %}
-        {% include metc %}
-    {% endif %}
-
-    {% include trajectories %}
-
-    {% if studies %}
-        {% for study in studies %}
-            {% for study_section in study %}
-                {% include study_section %}
-            {% endfor %}
-        {% endfor %}    
-    {% endif %}
-
-    {% if extra_documents %}
-        {% for document in extra_documents %}
-            {% include document %}
-        {% endfor %}
-    {% endif %}
-
-    {% if dmp_file %}
-        {% include dmp_file %}
-    {% endif %}
-
-    {% if embargo %}
-        {% include embargo %}
-    {% endif %}
-
-    {% comment %} Code to copy into pdf file
-
-    <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
-    <p>{{ proposal.summary|linebreaks }}</p>
-
-    {% include wmo %}
-
-    {% if metc %}
-      {% include metc %}
-    {% endif %}
-
-    {% include trajectories %}
-
-    {% if studies %}
-      {% for study in studies %}
-        {% for study_section in study %}
-          {% include study_section %}
-        {% endfor %}
-      {% endfor %}    
-    {% endif %}
-
-    {% if dmp_file %}
-      {% include dmp_file %}
-    {% endif %}
-
-    {% if dmp_file %}
-      {% include dmp_file %}
-    {% endif %}
-
-    {% include embargo %}
-
-    <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
-      <p>
-        {{ proposal.comments }}
-      </p> {% endcomment %}
-
-{% endblock %}
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/observation_v1.html b/proposals/templates/proposals/pdf/observation_v1.html
deleted file mode 100644
index b1eaca1bb..000000000
--- a/proposals/templates/proposals/pdf/observation_v1.html
+++ /dev/null
@@ -1,65 +0,0 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-
-<table>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "setting" %}</th><td>{{ observation.setting.all|unordered_list }}</td>
-    </tr>
-    {% if observation.setting.all|needs_details %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "setting_details" %}</th><td>{{ observation.setting_details }}</td>
-    </tr>
-    {% endif %}
-    {% if study.has_children and observation.setting.all|needs_details:"needs_supervision" %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "supervision" %}</th><td>{{ observation.supervision|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if not observation.supervision %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}</th><td>{{ observation.leader_has_coc|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "days" %}</th><td>{{ observation.days }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "mean_hours" %}</th><td>{{ observation.mean_hours }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_anonymous" %}</th><td>{{ observation.is_anonymous|yesno:_("ja,nee") }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}</th><td>{{ observation.is_in_target_group|yesno:_("ja,nee") }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}</th><td>{{ observation.is_nonpublic_space|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if observation.is_nonpublic_space %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}</th><td>{{ observation.has_advanced_consent|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "needs_approval" %}</th><td>{{ observation.needs_approval|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if observation.needs_approval %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "approval_institution" %}</th><td>{{ observation.approval_institution }}</td>
-    </tr>
-    {% if not proposal.is_practice %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "approval_document" %}</th><td><a href="{{ BASE_URL }}{{ observation.approval_document.url }}" target="_blank">{% trans "Download" %}</a></td>
-    </tr>
-    {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "registrations" %}</th><td>{{ observation.registrations.all|unordered_list }}</td>
-    </tr>
-    {% if observation.registrations.all|needs_details %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "registrations_details" %}</th><td>{{ observation.registrations_details }}</td>
-    </tr>
-    {% endif %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/observation_v2.html b/proposals/templates/proposals/pdf/observation_v2.html
deleted file mode 100644
index ab49cc4bd..000000000
--- a/proposals/templates/proposals/pdf/observation_v2.html
+++ /dev/null
@@ -1,83 +0,0 @@
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-
-<table>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "setting" %}</th><td>{{ observation.setting.all|unordered_list }}</td>
-    </tr>
-    {% if observation.setting.all|needs_details %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "setting_details" %}</th><td>{{ observation.setting_details }}</td>
-    </tr>
-    {% endif %}
-    {% if study.has_children and observation.setting.all|needs_details:"needs_supervision" %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "supervision" %}</th><td>{{ observation.supervision|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if not observation.supervision %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}</th><td>{{ observation.leader_has_coc|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "details_who"|safe %}</th><td>{{ observation.details_who }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "details_why"|safe %}</th><td>{{ observation.details_why }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "details_frequency"|safe %}</th><td>{{ observation.details_frequency }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_anonymous" %}</th><td>{{ observation.is_anonymous|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if observation.is_anonymous %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_anonymous_details" %}</th><td>{{ observation.is_anonymous_details }}</td>
-    </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}</th><td>{{ observation.is_in_target_group|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if observation.is_in_target_group %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group_details" %}</th><td>{{ observation.is_in_target_group_details }}</td>
-    </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}</th><td>{{ observation.is_nonpublic_space|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% if observation.is_nonpublic_space %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space_details" %}</th><td>{{ observation.is_nonpublic_space_details }}</td>
-    </tr>
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}</th><td>{{ observation.has_advanced_consent|yesno:_("ja,nee") }}</td>
-    </tr>
-        {% if not observation.has_advanced_consent %}
-        <tr>
-            <th>{% get_verbose_field_name "observations" "observation" "has_advanced_consent_details" %}</th><td>{{ observation.has_advanced_consent_details }}</td>
-        </tr>
-        {% endif %}
-    {% endif %}
-    {% if observation.setting.all|needs_details:"is_school" %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "needs_approval" %}</th><td>{{ observation.needs_approval|yesno:_("ja,nee") }}</td>
-    </tr>
-    {% endif %}
-    {% if observation.needs_approval %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "approval_institution" %}</th><td>{{ observation.approval_institution }}</td>
-    </tr>
-    {% endif %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "registrations" %}</th><td>{{ observation.registrations.all|unordered_list }}</td>
-    </tr>
-    {% if observation.registrations.all|needs_details %}
-    <tr>
-        <th>{% get_verbose_field_name "observations" "observation" "registrations_details" %}</th><td>{{ observation.registrations_details }}</td>
-    </tr>
-    {% endif %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/single_object_diff_table.html b/proposals/templates/proposals/pdf/single_object_diff_table.html
deleted file mode 100644
index dfbb1728b..000000000
--- a/proposals/templates/proposals/pdf/single_object_diff_table.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% load diff_tags %}
-
-
-{% if section_title %}
-    <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
-{% endif %}
-{% if study_title %}
-    <h3> {{ study_title }} </h3>
-{% endif %}
-<div class="warning">
-    {{ warning }}
-</div>
-<table class="proposals-diff ">
-    <tr>
-        <th class="proposals-diff-question"></th>
-        <th class="proposals-diff-answer">{{ diff_answer_header }}</th>
-    </tr>
-{% for row in rows %}
-<tr>
-<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
-</tr>
-{% endfor %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/pdf/table_with_header.html b/proposals/templates/proposals/pdf/table_with_header.html
deleted file mode 100644
index 6b491d820..000000000
--- a/proposals/templates/proposals/pdf/table_with_header.html
+++ /dev/null
@@ -1,13 +0,0 @@
-{% if section_title %}
-    <h2> {{ section_title }} </h2>
-{% endif %}
-{% if study_title %}
-    <h3> {{ study_title }} </h3>
-{% endif %}
-<table>
-{% for row in rows %}
-<tr>
-<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
-</tr>
-{% endfor %}
-</table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index 10927ac2b..d994b8249 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -14,6 +14,10 @@
 {% block html_head %}
     <script src="{% static 'main/js/htmldiff.js' %}"></script>
     <script>
+        // The new implementation causes some issues with the js, 
+        // - The loading icon does not go away sometimes.
+        // - The colors appear for the first instance of a missing section warning,
+        //   which is kindoff ugly.
         $(function () {
             // Color changes between proposals
             $('td:nth-child(2)').each(function () {
@@ -45,227 +49,44 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
             <div class="col-12 text-center mt-5 mb-5" id="loading-icon">
                 <img src="{% static 'main/images/loading.gif' %}"/>
             </div>
-            {% with p_proposal=proposal.parent %}
-                <h2 class="mt-3 mb-1">{% trans "Algemene informatie over de aanvraag" %}</h2>
-                <table class="proposals-diff ">
-                    <tr>
-                        <th class="proposals-diff-question"></th>
-                        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "relation" %}</th>
-                        <td>{{ p_proposal.relation }}</td>
-                        <td>{{ proposal.relation }}</td>
-                    </tr>
-                    {% if proposal.relation.needs_supervisor or p_proposal.relation.needs_supervisor %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "supervisor" %}</th>
-                            <td>{{ p_proposal.supervisor.get_full_name }}</td>
-                            <td>{{ proposal.supervisor.get_full_name }}</td>
-                        </tr>
-                    {% endif %}
-                    {% if proposal.relation.check_in_course or p_proposal.relation.check_in_course %}
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "student_program" %}</th>
-                        <td>{{ p_proposal.student_program }}</td>
-                        <td>{{ proposal.student_program }}</td>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "student_context" %}</th>
-                        <td>{{ p_proposal.student_context|default:"" }}</td>
-                        <td>{{ proposal.student_context|default:"" }}</td>
-                    </tr>
-                        {% if proposal.student_context.needs_details or p_proposal.student_context.needs_details %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "student_context_details" %}</th>
-                            <td>{{ p_proposal.student_context_details }}</td>
-                            <td>{{ proposal.student_context_details }}</td>
-                        </tr>
-                        {% endif %}
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "student_justification" %}</th>
-                        <td>{{ p_proposal.student_justification }}</td>
-                        <td>{{ proposal.student_justification }}</td>
-                    </tr>
-                    {% endif %}
 
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "other_applicants" %}</th>
-                        <td>{{ p_proposal.other_applicants|yesno:_("ja,nee") }}</td>
-                        <td>{{ proposal.other_applicants|yesno:_("ja,nee") }}</td>
-                    </tr>
-                    {% if proposal.other_applicants or p_proposal.other_applicants %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "applicants" %}</th>
-                            <td>{{ p_proposal.applicants.all|unordered_list }}</td>
-                            <td>{{ proposal.applicants.all|unordered_list }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "other_stakeholders" %}</th>
-                        <td>{{ p_proposal.other_stakeholders|yesno:_("ja,nee") }}</td>
-                        <td>{{ proposal.other_stakeholders|yesno:_("ja,nee") }}</td>
-                    </tr>
-                    {% if proposal.other_stakeholders or p_proposal.other_stakeholders %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "stakeholders" %}</th>
-                            <td>{{ p_proposal.stakeholders }}</td>
-                            <td>{{ proposal.stakeholders }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "date_start" %}</th>
-                        <td>{{ p_proposal.date_start|default:_("onbekend") }}</td>
-                        <td>{{ proposal.date_start|default:_("onbekend") }}</td>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "title" %}</th>
-                        <td>{{ p_proposal.title }}</td>
-                        <td>{{ proposal.title }}</td>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "summary" %}</th>
-                        <td>{{ p_proposal.summary }}</td>
-                        <td>{{ proposal.summary }}</td>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "funding" %}</th>
-                        <td>{{ p_proposal.funding.all|unordered_list }}</td>
-                        <td>{{ proposal.funding.all|unordered_list }}</td>
-                    </tr>
-                    {% if proposal.funding.all|needs_details or p_proposal.funding.all|needs_details %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "funding_details" %}</th>
-                            <td>{{ p_proposal.funding_details }}</td>
-                            <td>{{ proposal.funding_details }}</td>
-                        </tr>
-                    {% endif %}
-                    {% if proposal.funding.all|needs_details:"needs_name" or p_proposal.funding.all|needs_details:"needs_name" %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "funding_name" %}</th>
-                            <td>{{ p_proposal.funding_name }}</td>
-                            <td>{{ proposal.funding_name }}</td>
-                        </tr>
-                    {% endif %}
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "self_assessment" %}</th>
-                        <td>{{ p_proposal.self_assessment }}</td>
-                        <td>{{ proposal.self_assessment }}</td>
-                    </tr>
-                </table>
+                {% include general %}
 
-                {% with wmo=proposal.wmo %}
-                    {% with p_wmo=p_proposal.wmo %}
-                        <h2 class="mt-5 mb-1">{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
-                        <table class="proposals-diff ">
-                            <tr>
-                                <th class="proposals-diff-question"></th>
-                                <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                                <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                            </tr>
-                            <tr>
-                                <th>{% get_verbose_field_name "proposals" "wmo" "metc" %}</th>
-                                <td>{{ p_wmo.get_metc_display }}</td>
-                                <td>{{ wmo.get_metc_display }}</td>
-                            </tr>
-                            {% if wmo.metc == 'Y' or p_wmo.metc == 'Y' %}
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_details" %}</th>
-                                    <td>{{ p_wmo.metc_details }}</td>
-                                    <td>{{ wmo.metc_details }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_institution" %}</th>
-                                    <td>{{ p_wmo.metc_institution }}</td>
-                                    <td>{{ wmo.metc_institution }}</td>
-                                </tr>
-                            {% else %}
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "is_medical" %}</th>
-                                    <td>{{ p_wmo.get_is_medical_display }}</td>
-                                    <td>{{ wmo.get_is_medical_display }}</td>
-                                </tr>
-                            {% endif %}
-                        </table>
+                {% include wmo %}
 
-                        {% if wmo.status != wmo.NO_WMO or p_wmo.status != p_wmo.NO_WMO %}
-                            <h2 class="mt-5 mb-1">{% trans "Aanmelding bij de METC" %}</h2>
-                            <table class="proposals-diff ">
-                                <tr>
-                                    <th class="proposals-diff-question"></th>
-                                    <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                                    <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_application" %}</th>
-                                    <td>{{ p_wmo.metc_application|yesno:_("ja,nee") }}</td>
-                                    <td>{{ wmo.metc_application|yesno:_("ja,nee") }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision" %}</th>
-                                    <td>{{ p_wmo.metc_decision|yesno:_("ja,nee") }}</td>
-                                    <td>{{ wmo.metc_decision|yesno:_("ja,nee") }}</td>
-                                </tr>
-                                <tr>
-                                    <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision_pdf" %}</th>
-                                    {% if p_wmo.metc_decision_pdf %}
-                                        <td><a href="{{ p_wmo.metc_decision_pdf.url }}"
-                                               target="_blank">{% trans "Download" %}</a></td>
-                                    {% endif %}
-                                    {% if wmo.metc_decision_pdf %}
-                                        <td><a href="{{ wmo.metc_decision_pdf.url }}"
-                                               target="_blank">{% trans "Download" %}</a></td>
-                                    {% endif %}
-                                </tr>
-                            </table>
-                        {% endif %}
-                    {% endwith %}
-                {% endwith %}
+                {% if metc %}
+                  {% include metc %}
+                {% endif %}
+          
+                {% include trajectories %}
 
-                <h2 class="mt-5 mb-1">{% trans "Eén of meerdere trajecten?" %}</h2>
-                <table class="proposals-diff ">
-                    <tr>
-                        <th class="proposals-diff-question"></th>
-                        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "studies_similar" %}</th>
-                        <td>{{ p_proposal.studies_similar|yesno:_("ja,nee") }}</td>
-                        <td>{{ proposal.studies_similar|yesno:_("ja,nee") }}</td>
-                    </tr>
-                    {% if not proposal.studies_similar or not p_proposal.studies_similar %}
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "studies_number" %}</th>
-                            <td>{{ p_proposal.studies_number }}</td>
-                            <td>{{ proposal.studies_number }}</td>
-                        </tr>
+                {% if studies %}
+                    {% for study in studies %}
+                        {% for study_section in study %}
+                            {% include study_section %}
+                        {% endfor %}
+                    {% endfor %}
+
+                    {% if extra_documents %}
+                        {% for document in extra_documents %}
+                            {% include document %}
+                        {% endfor %}
+                    {% endif %}
+
+                    {% if dmp_file %}
+                        {% include dmp_file %}
                     {% endif %}
-                </table>
 
-                {% if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED %}
-                    {% include 'proposals/diff/study.html' %}
+                    {% include embargo %}
 
-                    <h2 class="mt-5 mb-1">{% trans "Concept-aanmelding versturen" %}</h2>
+                    
+                    <h2 class="mt-5 mb-1">{% trans "Eventuele opmerkingen" %}</h2>
                     <table class="proposals-diff ">
                         <tr>
                             <th class="proposals-diff-question"></th>
                             <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
                             <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
                         </tr>
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "embargo" %}</th>
-                            <td>{{ p_proposal.embargo|yesno:_("ja,nee") }}</td>
-                            <td>{{ proposal.embargo|yesno:_("ja,nee") }}</td>
-                        </tr>
-                        {% if proposal.embargo or p_proposal.embargo %}
-                            <tr>
-                                <th>{% get_verbose_field_name "proposals" "proposal" "embargo_end_date" %}</th>
-                                <td>{{ p_proposal.embargo_end_date }}</td>
-                                <td>{{ proposal.embargo_end_date }}</td>
-                            </tr>
-                        {% endif %}
                         <tr>
                             <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
                             <td>{{ p_proposal.comments }}</td>
@@ -273,7 +94,6 @@ <h2 class="mt-5 mb-1">{% trans "Concept-aanmelding versturen" %}</h2>
                         </tr>
                     </table>
                 {% endif %}
-            {% endwith %}
 
             <p class="mt-5 float-right">
                 <button class="button" onclick="window.history.back();">
diff --git a/proposals/templates/proposals/diff_table_with_header.html b/proposals/templates/proposals/table_with_header_diff.html
similarity index 100%
rename from proposals/templates/proposals/diff_table_with_header.html
rename to proposals/templates/proposals/table_with_header_diff.html
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 9ef95899c..424424f55 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -40,7 +40,7 @@ def __init__(self, object):
     def render(self, context):
         context = context.flatten()
         if self.object_2:
-            template = get_template("proposals/diff_table_with_header.html")
+            template = get_template("proposals/table_with_header_diff.html")
         else:
             template = get_template("proposals/table_with_header.html")
         context.update(
@@ -283,7 +283,7 @@ class DiffSection(PDFSection):
     '''The DiffSection class overrides the __init__ and render methods of the PDFSection.
     This exists for instances of tables in the diff, where it is possible
     for objects to be entirely missing from one version or the other, such as studies.
-    If Neccesary, it provides an object is missing warning and some info for formatting the
+    If neccesary, it provides an object is missing warning and some info for formatting the
     diff table. (self.missing_object)
     The resulting diff section class inherit from this class, plus their own section class.
 
@@ -308,7 +308,7 @@ def __init__(self, objects_tuple):
     
     def render(self, context):
         context = context.flatten()
-        template = get_template("proposals/pdf/diff_table_with_header.html")
+        template = get_template("proposals/table_with_header_diff.html")
 
         if self.warning is not None:
             context.update(
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index b2b64755e..ebd73f28c 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -551,7 +551,6 @@ class ProposalAsPdf(LoginRequiredMixin, PDFTemplateResponseMixin,
     filename_factory = FilenameFactory('Proposal')
 
     def get_context_data(self, **kwargs):
-        """Adds 'BASE_URL' to template context"""
         context = super().get_context_data(**kwargs)
 
         context = create_context_pdf(context, self.object)
@@ -560,7 +559,7 @@ def get_context_data(self, **kwargs):
 
 class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
-    template_name = 'proposals/new_proposal_diff.html'
+    template_name = 'proposals/proposal_diff.html'
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)

From df840ce9a599f62a1583c04b0285f5b787d5e788 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 21 Sep 2023 10:19:04 +0200
Subject: [PATCH 027/148] Removed unused template tags

---
 proposals/templatetags/diff_tags.py | 97 -----------------------------
 1 file changed, 97 deletions(-)

diff --git a/proposals/templatetags/diff_tags.py b/proposals/templatetags/diff_tags.py
index c283f3b21..1157b1fe5 100644
--- a/proposals/templatetags/diff_tags.py
+++ b/proposals/templatetags/diff_tags.py
@@ -32,100 +32,3 @@ def zip_equalize_lists(a, b):
             b.append(None)
 
     return zip(a, b)
-
-
-class ZippedSessionsNode(template.Node):
-    """
-    This node handles adding a zipped list of all sessions for 2 given studies
-    If one study has more sessions than the other, None's will be added to
-    the other
-    """
-
-    def __init__(self, var_name, study, p_study):
-        self.var_name = var_name
-        self.study = template.Variable(study)
-        self.p_study = template.Variable(p_study)
-
-    def render(self, context):
-        study = self.study.resolve(context)
-        p_study = self.p_study.resolve(context)
-
-        sessions = []
-        p_sessions = []
-
-        if study:
-            sessions = study.session_set.all()
-
-        if p_study:
-            p_sessions = p_study.session_set.all()
-
-        context[self.var_name] = zip_equalize_lists(sessions, p_sessions)
-        return u""
-
-
-@register.tag
-def get_zipped_sessions_lists(parser, token):
-    """
-    Adds a variable to the context with a zipped list of all sessions for
-    the provided studies. If one study has more sessions than the other,
-    None's will be added to the other
-
-    Usage:
-    {% get_zipped_sessions_lists VARIABLE_NAME STUDY_OBJECT_1 STUDY_OBJECT_2 %}
-    params:
-    VARIABLE_NAME: the name of the variable to store the object in
-    STUDY_OBJECT_1: the variable which contains the first study object
-    STUDY_OBJECT_2: the variable which contains the second study object
-    """
-    parts = token.split_contents()
-
-    return ZippedSessionsNode(parts[1], parts[2], parts[3])
-
-
-class ZippedTasksNode(template.Node):
-    """
-    This node handles adding a zipped list of all tasks for 2 given sessions
-    If one session has more tasks than the other, None's will be added to
-    the other
-    """
-
-    def __init__(self, var_name, session, p_session):
-        self.var_name = var_name
-        self.session = template.Variable(session)
-        self.p_session = template.Variable(p_session)
-
-    def render(self, context):
-        session = self.session.resolve(context)
-        p_session = self.p_session.resolve(context)
-
-        tasks = []
-        p_tasks = []
-
-        if session:
-            tasks = session.task_set.all()
-
-        if p_session:
-            p_tasks = p_session.task_set.all()
-
-        context[self.var_name] = zip_equalize_lists(tasks, p_tasks)
-        return u""
-
-
-@register.tag
-def get_zipped_tasks_lists(parser, token):
-    """
-    Adds a variable to the context with a zipped list of all tasks for
-    the provided sessions. If one session has more tasks than the other,
-    None's will be added to the other
-
-    Usage:
-    {% get_zipped_sessions_lists VARIABLE_NAME SESSION_OBJECT_1
-    SESSION_OBJECT_2 %}
-    params:
-    VARIABLE_NAME: the name of the variable to store the object in
-    SESSION_OBJECT_1: the variable which contains the first session object
-    SESSION_OBJECT_2: the variable which contains the second session object
-    """
-    parts = token.split_contents()
-
-    return ZippedTasksNode(parts[1], parts[2], parts[3])
\ No newline at end of file

From fb89e7e84c950f34222fc08dd621061a246cf751 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 21 Sep 2023 10:46:41 +0200
Subject: [PATCH 028/148] translations and minor text fixes

---
 locale/en/LC_MESSAGES/django.mo               | Bin 148703 -> 147097 bytes
 locale/en/LC_MESSAGES/django.po               | 642 +++++++-----------
 main/models.py                                |   6 +-
 .../templates/proposals/proposal_diff.html    |   2 +-
 .../proposals/table_with_header.html          |   4 +-
 .../proposals/table_with_header_diff.html     |   2 +-
 proposals/utils/pdf_diff_logic.py             |   6 +-
 proposals/views/proposal_views.py             |   2 +-
 8 files changed, 263 insertions(+), 401 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 0d7f6c55890fec57e59157f87c87fa925058bbff..49713851ec1ab892392595db1c86020855e968d8 100644
GIT binary patch
delta 18936
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
MJki2CjRU{^AMSvbx&QzG

delta 20469
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
aLdi$?2bYYAEtxR9Mo?jQ-m;oOkNyYyNWy*q

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 22db4041c..83a137f2a 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-08-22 12:34+0200\n"
+"POT-Creation-Date: 2023-09-21 10:45+0200\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -81,9 +81,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
 #: faqs/menus.py:17 main/templates/base/menu.html:134
 #: main/templates/main/index.html:177
-#: proposals/templates/proposals/proposal_pdf.html:430
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
+#: proposals/utils/pdf_diff_logic.py:848
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -152,7 +152,7 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:280
+#: proposals/templates/proposals/proposal_diff.html:100
 #: proposals/templates/proposals/proposal_update_attachments.html:26
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
@@ -282,9 +282,8 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
-#: proposals/templates/proposals/diff/intervention.html:4
-#: proposals/templates/proposals/proposal_pdf.html:285
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
+#: proposals/utils/pdf_diff_logic.py:506
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -345,11 +344,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:8 main/utils.py:13
+#: main/models.py:8 main/utils.py:13 proposals/utils/pdf_diff_logic.py:214
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:9 main/utils.py:13
+#: main/models.py:9 main/utils.py:13 proposals/utils/pdf_diff_logic.py:214
 msgid "nee"
 msgstr "no"
 
@@ -581,27 +580,27 @@ msgid "Maak een amendement van een al goedgekeurde aanvraag"
 msgstr "Create an amendment to an already approved application"
 
 #: main/templates/base/menu.html:32 proposals/menus.py:56
-#: proposals/views/proposal_views.py:75
+#: proposals/views/proposal_views.py:76
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
 #: main/templates/base/menu.html:35 proposals/menus.py:60
-#: proposals/views/proposal_views.py:125
+#: proposals/views/proposal_views.py:126
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
 #: main/templates/base/menu.html:38 proposals/menus.py:64
-#: proposals/views/proposal_views.py:87
+#: proposals/views/proposal_views.py:88
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
 #: main/templates/base/menu.html:41 proposals/menus.py:68
-#: proposals/views/proposal_views.py:99
+#: proposals/views/proposal_views.py:100
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
 #: main/templates/base/menu.html:44 proposals/menus.py:72
-#: proposals/views/proposal_views.py:111
+#: proposals/views/proposal_views.py:112
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
@@ -610,7 +609,7 @@ msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
 #: main/templates/base/menu.html:52 proposals/menus.py:108
-#: proposals/views/proposal_views.py:148
+#: proposals/views/proposal_views.py:149
 msgid "Archief"
 msgstr "Archive"
 
@@ -1238,9 +1237,8 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
-#: proposals/templates/proposals/diff/observation.html:4
-#: proposals/templates/proposals/proposal_pdf.html:297
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
+#: proposals/utils/pdf_diff_logic.py:578
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1785,7 +1783,8 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:420 reviews/models.py:180
+#: proposals/models.py:420 proposals/templates/proposals/proposal_diff.html:83
+#: reviews/models.py:180
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -2045,298 +2044,6 @@ msgstr "Old"
 msgid "Nieuw"
 msgstr "New"
 
-#: proposals/templates/proposals/diff/intervention.html:8
-msgid ""
-"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-"niet bevat."
-msgstr ""
-"This revision involves intervention research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/intervention.html:12
-msgid ""
-"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-"dat wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application does include this."
-
-#: proposals/templates/proposals/diff/intervention.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een interventieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve intervention "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/intervention_v1.html:8
-#: proposals/templates/proposals/diff/intervention_v2.html:8
-#: proposals/templates/proposals/diff/observation_v1.html:9
-#: proposals/templates/proposals/diff/observation_v2.html:9
-#: proposals/templates/proposals/diff/sessions.html:23
-#: proposals/templates/proposals/diff/sessions.html:42
-#: proposals/templates/proposals/diff/sessions.html:103
-#: proposals/templates/proposals/diff/sessions.html:174
-#: proposals/templates/proposals/diff/study.html:25
-#: proposals/templates/proposals/diff/study.html:151
-#: proposals/templates/proposals/diff/study.html:215
-#: proposals/templates/proposals/proposal_diff.html:53
-#: proposals/templates/proposals/proposal_diff.html:164
-#: proposals/templates/proposals/proposal_diff.html:197
-#: proposals/templates/proposals/proposal_diff.html:230
-#: proposals/templates/proposals/proposal_diff.html:254
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:9
-#: proposals/templates/proposals/diff/intervention_v2.html:9
-#: proposals/templates/proposals/diff/observation_v1.html:10
-#: proposals/templates/proposals/diff/observation_v2.html:10
-#: proposals/templates/proposals/diff/sessions.html:24
-#: proposals/templates/proposals/diff/sessions.html:43
-#: proposals/templates/proposals/diff/sessions.html:104
-#: proposals/templates/proposals/diff/sessions.html:175
-#: proposals/templates/proposals/diff/study.html:26
-#: proposals/templates/proposals/diff/study.html:152
-#: proposals/templates/proposals/diff/study.html:216
-#: proposals/templates/proposals/proposal_diff.html:54
-#: proposals/templates/proposals/proposal_diff.html:165
-#: proposals/templates/proposals/proposal_diff.html:198
-#: proposals/templates/proposals/proposal_diff.html:231
-#: proposals/templates/proposals/proposal_diff.html:255
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:28
-#: proposals/templates/proposals/diff/intervention_v1.html:33
-#: proposals/templates/proposals/diff/intervention_v1.html:42
-#: proposals/templates/proposals/diff/intervention_v1.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:28
-#: proposals/templates/proposals/diff/intervention_v2.html:33
-#: proposals/templates/proposals/diff/intervention_v2.html:42
-#: proposals/templates/proposals/diff/intervention_v2.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:62
-#: proposals/templates/proposals/diff/intervention_v2.html:67
-#: proposals/templates/proposals/diff/observation_v1.html:43
-#: proposals/templates/proposals/diff/observation_v1.html:48
-#: proposals/templates/proposals/diff/observation_v2.html:43
-#: proposals/templates/proposals/diff/observation_v2.html:48
-#: proposals/templates/proposals/diff/sessions.html:62
-#: proposals/templates/proposals/diff/sessions.html:67
-#: proposals/templates/proposals/diff/sessions.html:76
-#: proposals/templates/proposals/diff/sessions.html:81
-msgid "ja,nee,"
-msgstr "yes,no,"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:87
-#: proposals/templates/proposals/diff/intervention_v1.html:92
-#: proposals/templates/proposals/diff/intervention_v2.html:102
-#: proposals/templates/proposals/diff/intervention_v2.html:107
-#: proposals/templates/proposals/diff/observation_v1.html:29
-#: proposals/templates/proposals/diff/observation_v1.html:34
-#: proposals/templates/proposals/diff/observation_v1.html:68
-#: proposals/templates/proposals/diff/observation_v1.html:73
-#: proposals/templates/proposals/diff/observation_v1.html:81
-#: proposals/templates/proposals/diff/observation_v1.html:86
-#: proposals/templates/proposals/diff/observation_v1.html:94
-#: proposals/templates/proposals/diff/observation_v1.html:99
-#: proposals/templates/proposals/diff/observation_v1.html:108
-#: proposals/templates/proposals/diff/observation_v1.html:113
-#: proposals/templates/proposals/diff/observation_v1.html:122
-#: proposals/templates/proposals/diff/observation_v1.html:127
-#: proposals/templates/proposals/diff/observation_v2.html:29
-#: proposals/templates/proposals/diff/observation_v2.html:34
-#: proposals/templates/proposals/diff/observation_v2.html:73
-#: proposals/templates/proposals/diff/observation_v2.html:78
-#: proposals/templates/proposals/diff/observation_v2.html:93
-#: proposals/templates/proposals/diff/observation_v2.html:98
-#: proposals/templates/proposals/diff/observation_v2.html:113
-#: proposals/templates/proposals/diff/observation_v2.html:118
-#: proposals/templates/proposals/diff/observation_v2.html:132
-#: proposals/templates/proposals/diff/observation_v2.html:137
-#: proposals/templates/proposals/diff/observation_v2.html:146
-#: proposals/templates/proposals/diff/observation_v2.html:151
-#: proposals/templates/proposals/diff/sessions.html:151
-#: proposals/templates/proposals/diff/sessions.html:156
-#: proposals/templates/proposals/diff/study.html:43
-#: proposals/templates/proposals/diff/study.html:48
-#: proposals/templates/proposals/diff/study.html:63
-#: proposals/templates/proposals/diff/study.html:64
-#: proposals/templates/proposals/diff/study.html:220
-#: proposals/templates/proposals/diff/study.html:221
-#: proposals/templates/proposals/diff/study.html:262
-#: proposals/templates/proposals/diff/study.html:267
-#: proposals/templates/proposals/pdf/intervention_v1.html:16
-#: proposals/templates/proposals/pdf/intervention_v1.html:20
-#: proposals/templates/proposals/pdf/intervention_v1.html:43
-#: proposals/templates/proposals/pdf/intervention_v2.html:16
-#: proposals/templates/proposals/pdf/intervention_v2.html:20
-#: proposals/templates/proposals/pdf/intervention_v2.html:28
-#: proposals/templates/proposals/pdf/intervention_v2.html:48
-#: proposals/templates/proposals/pdf/intervention_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v1.html:16
-#: proposals/templates/proposals/pdf/observation_v1.html:20
-#: proposals/templates/proposals/pdf/observation_v1.html:31
-#: proposals/templates/proposals/pdf/observation_v1.html:34
-#: proposals/templates/proposals/pdf/observation_v1.html:37
-#: proposals/templates/proposals/pdf/observation_v1.html:41
-#: proposals/templates/proposals/pdf/observation_v1.html:45
-#: proposals/templates/proposals/pdf/observation_v2.html:16
-#: proposals/templates/proposals/pdf/observation_v2.html:20
-#: proposals/templates/proposals/pdf/observation_v2.html:34
-#: proposals/templates/proposals/pdf/observation_v2.html:42
-#: proposals/templates/proposals/pdf/observation_v2.html:50
-#: proposals/templates/proposals/pdf/observation_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v2.html:67
-#: proposals/templates/proposals/proposal_diff.html:95
-#: proposals/templates/proposals/proposal_diff.html:96
-#: proposals/templates/proposals/proposal_diff.html:107
-#: proposals/templates/proposals/proposal_diff.html:108
-#: proposals/templates/proposals/proposal_diff.html:202
-#: proposals/templates/proposals/proposal_diff.html:203
-#: proposals/templates/proposals/proposal_diff.html:207
-#: proposals/templates/proposals/proposal_diff.html:208
-#: proposals/templates/proposals/proposal_diff.html:235
-#: proposals/templates/proposals/proposal_diff.html:236
-#: proposals/templates/proposals/proposal_diff.html:259
-#: proposals/templates/proposals/proposal_diff.html:260
-#: proposals/templates/proposals/proposal_pdf.html:109
-#: proposals/templates/proposals/proposal_pdf.html:125
-#: proposals/templates/proposals/proposal_pdf.html:182
-#: proposals/templates/proposals/proposal_pdf.html:185
-#: proposals/templates/proposals/proposal_pdf.html:204
-#: proposals/templates/proposals/proposal_pdf.html:223
-#: proposals/templates/proposals/proposal_pdf.html:232
-#: proposals/templates/proposals/proposal_pdf.html:274
-#: proposals/templates/proposals/proposal_pdf.html:329
-#: proposals/templates/proposals/proposal_pdf.html:333
-#: proposals/templates/proposals/proposal_pdf.html:369
-#: proposals/templates/proposals/proposal_pdf.html:435
-#: proposals/templates/proposals/proposal_pdf.html:452
-#: proposals/templates/proposals/proposal_pdf.html:516
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/diff/observation.html:8
-msgid ""
-"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves observation research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/observation.html:12
-msgid ""
-"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat "
-"wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application involve this."
-
-#: proposals/templates/proposals/diff/observation.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve observation "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/observation_v1.html:139
-#: proposals/templates/proposals/diff/observation_v1.html:140
-#: proposals/templates/proposals/diff/study.html:233
-#: proposals/templates/proposals/diff/study.html:239
-#: proposals/templates/proposals/diff/study.html:247
-#: proposals/templates/proposals/diff/study.html:253
-#: proposals/templates/proposals/pdf/observation_v1.html:53
-#: proposals/templates/proposals/proposal_diff.html:214
-#: proposals/templates/proposals/proposal_diff.html:218
-#: proposals/templates/proposals/proposal_pdf.html:189
-#: proposals/templates/proposals/proposal_pdf.html:444
-#: proposals/templates/proposals/proposal_pdf.html:447
-#: proposals/templates/proposals/proposal_pdf.html:462
-#: proposals/templates/proposals/proposal_pdf.html:467
-#: proposals/templates/proposals/proposal_pdf.html:472
-#: proposals/templates/proposals/proposal_pdf.html:486
-#: proposals/templates/proposals/proposal_pdf.html:491
-#: proposals/templates/proposals/proposal_pdf.html:507
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-msgid "Download"
-msgstr "Download"
-
-#: proposals/templates/proposals/diff/sessions.html:7
-#: proposals/templates/proposals/proposal_pdf.html:308
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
-#: proposals/templates/proposals/diff/sessions.html:11
-msgid ""
-"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves tasks research, whereas the original application does "
-"not."
-
-#: proposals/templates/proposals/diff/sessions.html:15
-msgid ""
-"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel "
-"bevat."
-msgstr ""
-"This revision does not involve tasks research, whereas the original "
-"application does involve this."
-
-#: proposals/templates/proposals/diff/sessions.html:170
-#: proposals/templates/proposals/proposal_pdf.html:381
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/diff/study.html:9
-#: proposals/templates/proposals/proposal_pdf.html:215
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/diff/study.html:14
-msgid "Dit traject is nieuw in de revisie."
-msgstr "This trajectory was added in this revision."
-
-#: proposals/templates/proposals/diff/study.html:18
-msgid "Dit traject is weggehaald uit de revisie"
-msgstr "This trajectory was removed in this revision."
-
-#: proposals/templates/proposals/diff/study.html:144
-#: proposals/templates/proposals/proposal_pdf.html:391
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/diff/study.html:206
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
 #: proposals/templates/proposals/proposal_confirm_delete.html:6
 #: proposals/templates/proposals/proposal_confirm_delete.html:12
 msgid "Aanvraag verwijderen"
@@ -2502,7 +2209,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/templates/proposals/proposal_pdf.html:499
+#: proposals/utils/pdf_diff_logic.py:959
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2632,11 +2339,11 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
-#: proposals/templates/proposals/proposal_diff.html:37
+#: proposals/templates/proposals/proposal_diff.html:41
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:39
+#: proposals/templates/proposals/proposal_diff.html:43
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2644,65 +2351,31 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
-#: proposals/templates/proposals/proposal_diff.html:49
+#: proposals/templates/proposals/proposal_diff.html:87
+#: proposals/templates/proposals/table_with_header_diff.html:13
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/proposal_diff.html:88
+#: proposals/templates/proposals/table_with_header_diff.html:14
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
 #: proposals/templates/proposals/proposal_form.html:7
 #: proposals/templates/proposals/proposal_form.html:92
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:75
-#: proposals/templates/proposals/proposal_pdf.html:82
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55
-#: proposals/utils/validate_proposal.py:33
+#: proposals/utils/pdf_diff_logic.py:334 proposals/utils/proposal_utils.py:40
+#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_diff.html:119
-#: proposals/templates/proposals/proposal_diff.html:120
-#: proposals/templates/proposals/proposal_pdf.html:133
-#: proposals/templates/proposals/proposal_pdf.html:520
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_diff.html:160
-#: proposals/templates/proposals/proposal_pdf.html:159
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_diff.html:193
-#: proposals/templates/proposals/proposal_pdf.html:179
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_diff.html:226
-#: proposals/templates/proposals/proposal_pdf.html:201
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_diff.html:250
-#: proposals/templates/proposals/proposal_submit.html:179
-msgid "Concept-aanmelding versturen"
-msgstr "Submit draft application"
-
 #: proposals/templates/proposals/proposal_form.html:72
 #: proposals/templates/proposals/proposal_form_pre_approved.html:66
 #: proposals/templates/proposals/proposal_submit.html:33
@@ -2870,22 +2543,6 @@ msgstr "Applicant"
 msgid "Naam"
 msgstr "Name"
 
-#: proposals/templates/proposals/proposal_pdf.html:194
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/templates/proposals/proposal_pdf.html:481
-#: proposals/templates/proposals/study_consent.html:138
-msgid "Extra formulieren"
-msgstr "Additional forms"
-
-#: proposals/templates/proposals/proposal_pdf.html:513
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
 #: proposals/templates/proposals/proposal_pdf_empty.html:42
 msgid ""
 "\n"
@@ -2908,6 +2565,49 @@ msgstr ""
 "            Reference number <em>reference number</em>\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:104
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+#: proposals/utils/pdf_diff_logic.py:381
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:120
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+#: proposals/utils/pdf_diff_logic.py:404
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:134
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/pdf_diff_logic.py:415
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:145
+#: proposals/utils/pdf_diff_logic.py:432
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:279
+#: proposals/utils/pdf_diff_logic.py:676
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
 #: proposals/templates/proposals/proposal_pdf_empty.html:286
 #: proposals/templates/proposals/proposal_start.html:62
 #: proposals/templates/proposals/proposal_start_practice.html:63
@@ -2922,6 +2622,30 @@ msgstr "Session"
 msgid "Taak"
 msgstr "Task"
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:335
+#: proposals/utils/pdf_diff_logic.py:795 proposals/utils/pdf_diff_logic.py:805
+#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:343
+#: proposals/utils/pdf_diff_logic.py:813
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:372
+msgid "Informed consent formulieren voor het onderzoek"
+msgstr "Informed consent forms for the study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:389
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
+#: proposals/templates/proposals/proposal_submit.html:181
+#: proposals/utils/pdf_diff_logic.py:966
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
 #, python-format
 msgid ""
@@ -2947,6 +2671,25 @@ msgstr ""
 "            Reference number %(reference_number)s\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
+msgid "onbekend"
+msgstr "unknown"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
+#: proposals/utils/pdf_diff_logic.py:262 proposals/utils/pdf_diff_logic.py:272
+msgid "Download"
+msgstr "Download"
+
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
 #, python-format
 msgid ""
@@ -3052,6 +2795,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
+#: proposals/utils/pdf_diff_logic.py:90
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3357,6 +3101,10 @@ msgstr ""
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
+#: proposals/templates/proposals/proposal_submit.html:179
+msgid "Concept-aanmelding versturen"
+msgstr "Submit draft application"
+
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3475,6 +3223,10 @@ msgstr ""
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
+#: proposals/templates/proposals/study_consent.html:138
+msgid "Extra formulieren"
+msgstr "Additional forms"
+
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3599,6 +3351,50 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
+#: proposals/utils/pdf_diff_logic.py:82 proposals/utils/pdf_diff_logic.py:104
+#: proposals/utils/pdf_diff_logic.py:114 proposals/utils/pdf_diff_logic.py:135
+msgid "Traject "
+msgstr "Trajectory "
+
+#: proposals/utils/pdf_diff_logic.py:109 proposals/utils/pdf_diff_logic.py:140
+msgid "sessie "
+msgstr "session "
+
+#: proposals/utils/pdf_diff_logic.py:122 proposals/utils/pdf_diff_logic.py:147
+msgid "Sessie "
+msgstr "Session "
+
+#: proposals/utils/pdf_diff_logic.py:142 proposals/utils/pdf_diff_logic.py:149
+msgid ", taak "
+msgstr ", task "
+
+#: proposals/utils/pdf_diff_logic.py:212 reviews/models.py:122
+msgid "Onbekend"
+msgstr "Unknown"
+
+#: proposals/utils/pdf_diff_logic.py:266
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/utils/pdf_diff_logic.py:295
+msgid ""
+"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
+"aanvraag."
+msgstr ""
+"This section was added in the revision, and did not feature in the original "
+"application."
+
+#: proposals/utils/pdf_diff_logic.py:300
+msgid ""
+"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+msgstr ""
+"This section was present in the original application, but was removed for "
+"the revision."
+
+#: proposals/utils/pdf_diff_logic.py:937 proposals/utils/pdf_diff_logic.py:953
+msgid "Extra formulieren "
+msgstr "Additional forms "
+
 #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
 #: proposals/utils/validate_proposal.py:76
 msgid "Ethische toetsing nodig door een METC?"
@@ -3632,11 +3428,11 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:415
+#: proposals/utils/proposal_utils.py:412
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:417
+#: proposals/utils/proposal_utils.py:414
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
@@ -3685,40 +3481,40 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:42
+#: proposals/views/proposal_views.py:43
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:43
+#: proposals/views/proposal_views.py:44
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:62
+#: proposals/views/proposal_views.py:63
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:63
+#: proposals/views/proposal_views.py:64
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:76
+#: proposals/views/proposal_views.py:77
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:88
+#: proposals/views/proposal_views.py:89
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:100
+#: proposals/views/proposal_views.py:101
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:113
+#: proposals/views/proposal_views.py:114
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:126
+#: proposals/views/proposal_views.py:127
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
 "eindverantwoordelijke bij betrokken bent."
@@ -3726,15 +3522,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:241
+#: proposals/views/proposal_views.py:242
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:379
+#: proposals/views/proposal_views.py:380
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:480
+#: proposals/views/proposal_views.py:481
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3884,10 +3680,6 @@ msgstr "Not to be assessed further"
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:122
-msgid "Onbekend"
-msgstr "Unknown"
-
 #: reviews/models.py:139
 msgid "nog geen route"
 msgstr "no route assigned"
@@ -5880,5 +5672,73 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
+#~ msgid "Ja"
+#~ msgstr "Yes"
+
+#~ msgid "Nee"
+#~ msgstr "No"
+
+#~ msgid ""
+#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves intervention research, whereas the original "
+#~ "application does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application does include this."
+
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een "
+#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
+#~ "doordat de revisie een andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve intervention "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
+
+#~ msgid "ja,nee,"
+#~ msgstr "yes,no,"
+
+#~ msgid ""
+#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves observation research, whereas the original "
+#~ "application does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application involve this."
+
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
+#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
+#~ "andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve observation "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
+
+#~ msgid ""
+#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
+#~ "wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve tasks research, whereas the original "
+#~ "application does involve this."
+
+#~ msgid "Dit traject is nieuw in de revisie."
+#~ msgstr "This trajectory was added in this revision."
+
+#~ msgid "Dit traject is weggehaald uit de revisie"
+#~ msgstr "This trajectory was removed in this revision."
+
 #~ msgid "eindverantwoordelijke"
 #~ msgstr "Researcher with final responsibility"
diff --git a/main/models.py b/main/models.py
index bdbcac5a5..18d5d409a 100644
--- a/main/models.py
+++ b/main/models.py
@@ -5,9 +5,9 @@
 NO = 'N'
 DOUBT = '?'
 YES_NO_DOUBT = (
-    (YES, _('Ja')),
-    (NO, _('Nee')),
-    (DOUBT, _('Twijfel')),
+    (YES, _('ja')),
+    (NO, _('nee')),
+    (DOUBT, _('twijfel')),
 )
 
 
diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index d994b8249..d634db3f0 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -80,7 +80,7 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
                     {% include embargo %}
 
                     
-                    <h2 class="mt-5 mb-1">{% trans "Eventuele opmerkingen" %}</h2>
+                    <h2 class="mt-5 mb-1">{% trans "Ruimte voor eventuele opmerkingen" %}</h2>
                     <table class="proposals-diff ">
                         <tr>
                             <th class="proposals-diff-question"></th>
diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index 6b491d820..612d4d32d 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -1,5 +1,7 @@
+{% load i18n %}
+
 {% if section_title %}
-    <h2> {{ section_title }} </h2>
+    <h2> {% trans section_title %} </h2>
 {% endif %}
 {% if study_title %}
     <h3> {{ study_title }} </h3>
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 46bcbea30..916169bc0 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -2,7 +2,7 @@
 {% load i18n %}
 
 {% if section_title %}
-    <h2 class="mt-3 mb-1"> {{ section_title }} </h2>
+    <h2 class="mt-3 mb-1"> {% trans section_title %} </h2>
 {% endif %}
 {% if study_title %}
     <h3> {{ study_title }} </h3>
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 424424f55..313f88acd 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -211,7 +211,7 @@ def get_field_value(self):
         elif value is None:
             return _('Onbekend')
         elif type(value) == bool:
-            return _('Ja') if value else _('Nee')
+            return _('ja') if value else _('nee')
         elif type(value) == User:
             return self.handle_user(value)
         elif type(value) == Relation or type(value) == Compensation:
@@ -429,7 +429,7 @@ def get_row_fields(self, obj):
 
 class StudySection(PDFSection):
     '''This class receives a proposal.study object.'''
-    section_title = _('De Deelnemers')
+    section_title = _('De deelnemers')
     row_fields = [
         'age_groups',
         'legally_incapable',
@@ -963,7 +963,7 @@ class DMPFileSection(PDFSection):
 class EmbargoSection(PDFSection):
     '''Gets passed a proposal object'''
 
-    section_title = _('Aanmelding Versturen')
+    section_title = _('Aanmelding versturen')
 
     row_fields = [
         'embargo',
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index ebd73f28c..88b449063 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -12,7 +12,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 #from easy_pdf.views import PDFTemplateResponseMixin, PDFTemplateView
-from typing import Any, Tuple, Union
+from typing import Tuple, Union
 
 from main.utils import get_document_contents, get_secretary, is_secretary
 from main.views import AllowErrorsOnBackbuttonMixin, CreateView, DeleteView, \

From 1a9f9cce0b5fd9e40f4fdb0bf1bbe8bba23fdcaf Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 21 Sep 2023 15:12:40 +0200
Subject: [PATCH 029/148] little improvement of little function

---
 proposals/templatetags/diff_tags.py | 11 +++--------
 1 file changed, 3 insertions(+), 8 deletions(-)

diff --git a/proposals/templatetags/diff_tags.py b/proposals/templatetags/diff_tags.py
index 1157b1fe5..204fbf419 100644
--- a/proposals/templatetags/diff_tags.py
+++ b/proposals/templatetags/diff_tags.py
@@ -10,15 +10,10 @@ def zip_equalize_lists(a, b):
     A zip implementation which will not stop when reaching the end of the
     smallest list, but will append None's to the smaller list to fill the gap
     """
-    try:
-        a = list(a)
-    except TypeError:
-        a = [a]
-    try:
-        b = list(b)
-    except TypeError:
-        b = [b]
 
+    a = [None] if a is None else list(a)
+    b = [None] if b is None else list(b)
+    
     a_len = len(a)
     b_len = len(b)
     diff = abs(a_len - b_len)

From 29587300609f0197cc172af90c3dd38fca0b9e11 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 25 Sep 2023 17:28:33 +0200
Subject: [PATCH 030/148] Started incorporating Ty's requests

---
 main/static/main/style.css                    |   4 +
 .../templates/proposals/proposal_diff.html    |   2 +-
 .../proposals/table_with_header.html          |   4 +-
 .../proposals/table_with_header_diff.html     |  50 +-
 proposals/utils/pdf_diff_logic.py             | 583 +++++++++---------
 5 files changed, 322 insertions(+), 321 deletions(-)

diff --git a/main/static/main/style.css b/main/static/main/style.css
index 03ab362f2..0925d92d7 100644
--- a/main/static/main/style.css
+++ b/main/static/main/style.css
@@ -86,6 +86,10 @@ form label {
     background-color: orange;
 }
 
+.proposals-diff th, .proposals-diff td {
+    padding: 10px;
+}
+
 /* Form specifics */
 input[name=title] {
     width: 20em;
diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index d634db3f0..dea801c57 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -20,7 +20,7 @@
         //   which is kindoff ugly.
         $(function () {
             // Color changes between proposals
-            $('td:nth-child(2)').each(function () {
+            $('tr:not(.diff-ignore) td:nth-child(2)').each(function () {
                 let old_el = $(this);
                 let new_el = old_el.next();
                 let before = html_to_tokens(old_el.html());
diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index 612d4d32d..8d9d7cca0 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -1,6 +1,8 @@
 {% load i18n %}
 
-{% if section_title %}
+{% if page_break %}
+    <h2 style="page-break-before: always"> {% trans section_title %} </h2>
+{% elif section_title %}
     <h2> {% trans section_title %} </h2>
 {% endif %}
 {% if study_title %}
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 916169bc0..0a8b01333 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -2,10 +2,10 @@
 {% load i18n %}
 
 {% if section_title %}
-    <h2 class="mt-3 mb-1"> {% trans section_title %} </h2>
+    <h2 class="mt-5 mb-1"> {% trans section_title %} </h2>
 {% endif %}
 {% if study_title %}
-    <h3> {{ study_title }} </h3>
+    <h3 class='mt-3'> {{ study_title }} </h3>
 {% endif %}
 <table class="proposals-diff ">
     <tr>
@@ -13,34 +13,30 @@ <h3> {{ study_title }} </h3>
         <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
         <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
     </tr>
-{% if warning and missing_object == 0 %}
-    <tr>
+{% if warning %}
+    <tr class="diff-ignore">
         <th>{{ rows.0.verbose_name }}</th>
-        <td rowspan='{{rows|length}}'>
-            <div class='warning'>
-                {{ warning }}
-            </div>
-        </td>
-        <td>{{rows.0.value}}</td>
+        {# If the first object is missing, place a warning on the first TD #}
+        {% if missing_object == 0 %}
+            <td rowspan='{{rows|length}}'>
+                <div class='warning'>
+                    {{ warning }}
+                </div>
+            </td>
+            <td>{{rows.0.value}}</td>
+        {# Otherwise, we're missing the second one, thus we place the warning on the second #}
+        {% elif missing_object == 1 %}
+            <td>{{rows.0.value}}</td>
+            <td rowspan='{{rows|length}}'>
+                <div class='warning'>
+                    {{ warning }}
+                </div>
+            </td>
+        {% endif %}
     </tr>
     {%for row in rows|slice:"1:"%}
-    <tr>
-        <th>{{row.verbose_name}}</th><td>{{row.value}}
-    </tr>
-    {% endfor %}
-{% elif warning and missing_object == 1 %}
-    <tr>
-        <th>{{ rows.0.verbose_name }}</th>
-        <td>{{rows.0.value}}</td>
-        <td rowspan='{{rows|length}}'>
-            <div class='warning'>
-                {{ warning }}
-            </div>
-        </td>
-    </tr>
-    {%for row in rows|slice:"1:"%}
-    <tr>
-        <th>{{row.verbose_name}}</th><td>{{row.value}}
+    <tr class="diff-ignore">
+        <th>{{row.verbose_name}}</th><td>{{row.value}}</td>
     </tr>
     {% endfor %}
 {% else %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 313f88acd..1ef3f6f86 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -18,7 +18,37 @@
 NOTE: As of now, the diff has no workaround for when observations or interventions are of a
 different version, in the different proposals.'''
 
-class PDFSection:
+class BaseSection:
+
+    section_title = None
+    row_fields = None
+
+    def make_rows(self):
+        if self.object and self.object_2:
+            row_fields_1 = self.get_row_fields(self.object)
+            row_fields_2 = self.get_row_fields(self.object_2)
+
+            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
+
+            #The merging above messes with the order, so I reorder it here
+            row_fields = [row for row in self.row_fields if row in row_fields_both]
+
+            rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
+        else:
+            if self.object is None:
+                obj = self.object_2
+            else:
+                obj = self.object          
+
+            row_fields = self.get_row_fields(obj)
+
+            rows = [RowClass(obj, field) for field in row_fields]
+        return rows
+    
+    def get_row_fields(self, obj):
+        return self.row_fields
+
+class PDFDiffSection(BaseSection):
     '''This is the main class, from which most classes are constructed.
     It can take one object or two objects in a tuple, and produce html tables accordingly.
     The most important methods are render and make_rows. Make rows makes use of get_row_field,
@@ -26,11 +56,8 @@ class PDFSection:
     If this class is used in the diff, object should be the parent object and object_2 the 
     revision/amendment.'''
     
-    section_title = None
-    row_fields = None
-
     def __init__(self, object):
-        if type(object) == tuple:
+        if isinstance(object, tuple):
             self.object = object[0]
             self.object_2 = object[1]
         else:
@@ -51,106 +78,51 @@ def render(self, context):
         )
         return template.render(context)
 
-    def make_rows(self):
-        if self.object and self.object_2:
-            row_fields_1 = self.get_row_fields(self.object)
-            row_fields_2 = self.get_row_fields(self.object_2)
-
-            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
-
-            #The merging above messes with the order, so I reorder it here
-            row_fields = [row for row in self.row_fields if row in row_fields_both]
-
-            rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
-        else:
-            if self.object is None:
-                obj = self.object_2
-            else:
-                obj = self.object          
+class DiffSectionMissingObjects(BaseSection):
+    '''The DiffSectionMissingObjects class overrides the __init__ and render methods of the PDFDiffSection.
+    This exists for instances of tables in the diff, where it is possible
+    for objects to be entirely missing from one version or the other, such as studies.
+    If neccesary, it provides an object is missing warning and some info for formatting the
+    diff table. (self.missing_object)
+    The resulting diff section class inherit from this class, plus their own section class.
 
-            row_fields = self.get_row_fields(obj)
+    eg. class StudySectionDiff(DiffSectionMissingObjects, StudySection)'''
 
-            rows = [RowClass(obj, field) for field in row_fields]
-        return rows
-    
-    def get_row_fields(self, obj):
-        return self.row_fields
-        
-    def get_study_title(self, study):
-        if study.name:
-            study_title = format_html('{}{}{}{}{}',
-                                      _('Traject '),
-                                      study.order,
-                                      mark_safe(' <em>'),
-                                      study.name,
-                                      mark_safe(' </em>')
+    def __init__(self, objects_tuple):
+        if objects_tuple[0] is None:
+            self.warning = _(
+                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
+                )
+            self.missing_object = 0
+        elif objects_tuple[1] is None:
+            self.warning = _(
+                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
             )
+            self.missing_object = 1
         else:
-            study_title = format_html('{}{}',
-                                      _('Traject'),
-                                      {study.order}
-            )
-        return study_title
-    
-    def get_session_title(self, session):
-        order = session.order 
-        study_order = session.study.order 
-        study_name = session.study.name 
-        studies_number = session.study.proposal.studies_number 
-        sessions_number = session.study.sessions_number
-
-        if studies_number > 1 and sessions_number > 1:
-            session_title = format_html('{}{}{}{}{}{}{}',
-                                      _('Traject '),
-                                      study_order,
-                                      mark_safe(' <em>'),
-                                      study_name,
-                                      mark_safe(' </em>, '),
-                                      _('sessie '),
-                                      order
-            )
-        elif studies_number > 1:
-            session_title = format_html('{}{}{}{}{}',
-                                      _('Traject '),
-                                      study_order,
-                                      mark_safe(' <em>'),
-                                      study_name,
-                                      mark_safe(' </em>')
-            )
-        elif sessions_number >= 1:
-            session_title = format_html('{}{}',
-                                        _('Sessie '),
-                                        order
-            )
-        return session_title
+            self.warning = None
+            self.missing_object = None
+        self.object = objects_tuple[0]
+        self.object_2 = objects_tuple[1]
     
-    def get_task_title(self, task):
-        order=task.order 
-        session_order=task.session.order 
-        study_order=task.session.study.order 
-        study_name=task.session.study.name 
-        studies_number=task.session.study.proposal.studies_number
-        if studies_number > 1:
-            task_title = format_html('{}{}{}{}{}{}{}{}{}',
-                                      _('Traject '),
-                                      study_order,
-                                      mark_safe(' <em>'),
-                                      study_name,
-                                      mark_safe(' </em>, '),
-                                      _('sessie '),
-                                      session_order,
-                                      _(', taak '),
-                                      order
-            )
-        else:
-            task_title = format_html('{}{}{}{}',
-                                     _('Sessie '),
-                                     session_order,
-                                     _(', taak '),
-                                     order
-                                     )
-        return task_title
+    def render(self, context):
+        context = context.flatten()
+        template = get_template("proposals/table_with_header_diff.html")
 
+        if self.warning is not None:
+            context.update(
+                {
+                    "warning": self.warning,
+                    "missing_object": self.missing_object
+                }
+            )
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.make_rows(),
+            }
+        )
+        return template.render(context)
 class RowClass:
     '''This class creates rows for either one or two objects, and gets initated
     in the make_rows method of Section classes. The classmethods of Rowclass
@@ -206,15 +178,15 @@ def get_field_value(self):
 
         if value in ('Y', 'N', '?'):
             return self.yes_no_doubt(value)
-        elif type(value) in (str, int, date):
+        elif isinstance(value, (str, int, date)):
             return value
         elif value is None:
             return _('Onbekend')
-        elif type(value) == bool:
+        elif isinstance(value, bool):
             return _('ja') if value else _('nee')
-        elif type(value) == User:
+        elif isinstance(value, User):
             return self.handle_user(value)
-        elif type(value) == Relation or type(value) == Compensation:
+        elif isinstance(value, Relation) or isinstance(value, Compensation):
             return value.description
         elif value.__class__.__name__ == 'ManyRelatedManager':
             if value.all().model == User:
@@ -222,7 +194,7 @@ def get_field_value(self):
             else:
                 return self.get_object_list(value)
         elif value.__class__.__name__ == 'FieldFile':
-            return self.handle_field_file(value, self.object)
+            return self.handle_field_file(value)
         elif callable(value):
             return value()
         
@@ -241,91 +213,192 @@ def create_unordered_html_list(self, list):
         html_output = mark_safe('<ul class="p-0">')
 
         for item in list:
-            html_output += format_html('{}{}{}',
-                mark_safe('<li>'),
-                item,
-                mark_safe('</li>')                
+            html_output += format_html('<li>{}</li>',
+                item
             )
         
         html_output += mark_safe('</ul>')
 
         return html_output
     
-    def handle_field_file(self, field_file, object):
-        from ..models import Proposal
-        if object == Proposal and field_file == object.wmo.metc_decision_pdf:
-            if object.wmo.metc_decision_pdf and not object.is_practice():
-                output = format_html('{}{}{}{}{}',
-                                    mark_safe('<a href="'),
-                                    f'{settings.BASE_URL}{field_file.url}',
-                                    mark_safe('" target="_blank">'),
-                                    _('Download'),
-                                    mark_safe('</a>')
-                                    )
-            else:
-                output = _('Niet aangeleverd')
+    def handle_field_file(self, field_file):
+        if field_file:
+            output = format_html('<a href={}>{}</a>',
+                f'{settings.BASE_URL}{field_file.url}',
+                _('Download')
+            )
         else:
-            output = format_html('{}{}{}{}{}',
-                                    mark_safe('<a href="'),
-                                    f'{settings.BASE_URL}{field_file.url}',
-                                    mark_safe('" target="_blank">'),
-                                    _('Download'),
-                                    mark_safe('</a>')
-                                    )
+            output = _('Niet aangeleverd')
+
         return output
     
     def yes_no_doubt(self, value):
         from main.models import YES_NO_DOUBT
         d = dict(YES_NO_DOUBT)
         return d[value]
-    
-class DiffSection(PDFSection):
-    '''The DiffSection class overrides the __init__ and render methods of the PDFSection.
-    This exists for instances of tables in the diff, where it is possible
-    for objects to be entirely missing from one version or the other, such as studies.
-    If neccesary, it provides an object is missing warning and some info for formatting the
-    diff table. (self.missing_object)
-    The resulting diff section class inherit from this class, plus their own section class.
 
-    eg. class StudySectionDiff(DiffSection, StudySection)'''
+#NOTE: This is currently not working
+class StudyTitleMixin(PDFDiffSection, DiffSectionMissingObjects):
 
-    def __init__(self, objects_tuple):
-        if objects_tuple[0] is None:
-            self.warning = _(
-                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
-                )
-            self.missing_object = 0
-        elif objects_tuple[1] is None:
-            self.warning = _(
-                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+    def get_study_title(self, study):
+        if study.name:
+            study_title = format_html('{}{} <em>{} </em>',
+                                      _('Traject '),
+                                      study.order,
+                                      study.name
             )
-            self.missing_object = 1
         else:
-            self.warning = None
-            self.missing_object = None
-        self.object = objects_tuple[0]
-        self.object_2 = objects_tuple[1]
-    
-    def render(self, context):
-        context = context.flatten()
-        template = get_template("proposals/table_with_header_diff.html")
-
-        if self.warning is not None:
-            context.update(
-                {
-                    "warning": self.warning,
-                    "missing_object": self.missing_object
-                }
+            study_title = format_html('{}{}',
+                                      _('Traject'),
+                                      {study.order}
             )
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": self.make_rows(),
-            }
-        )
-
-        return template.render(context)
-class GeneralSection(PDFSection):
+        return study_title
+    
+    def get_session_title(self, session):
+        if session is None:
+            return ''
+        else:
+            order = session.order 
+            study_order = session.study.order 
+            study_name = session.study.name 
+            studies_number = session.study.proposal.studies_number 
+            sessions_number = session.study.sessions_number
+
+            if studies_number > 1 and sessions_number > 1:
+                session_title = format_html('{}{} <em>{} </em> {}{}',
+                                        _('Traject '),
+                                        study_order,
+                                        study_name,
+                                        _('sessie '),
+                                        order
+                )
+            elif studies_number > 1:
+                session_title = format_html('{}{} <em>{} </em>',
+                                        _('Traject '),
+                                        study_order,
+                                        study_name,
+                )
+            elif sessions_number >= 1:
+                session_title = format_html('{}{}',
+                                            _('Sessie '),
+                                            order
+                )
+            return session_title
+    
+    def get_task_title(self, task):
+        if task is None:
+            return ''
+        else:
+            order=task.order 
+            session_order=task.session.order 
+            study_order=task.session.study.order 
+            study_name=task.session.study.name 
+            studies_number=task.session.study.proposal.studies_number
+            if studies_number > 1:
+                task_title = format_html('{}{} <em>{} </em>, {}{}{}{}',
+                                        _('Traject '),
+                                        study_order,
+                                        study_name,
+                                        _('sessie '),
+                                        session_order,
+                                        _(', taak '),
+                                        order
+                )
+            else:
+                task_title = format_html('{}{}{}{}',
+                                        _('Sessie '),
+                                        session_order,
+                                        _(', taak '),
+                                        order
+                                        )
+            return task_title
+        
+def get_render_mixin(base, section):
+
+    if section == 'study':
+
+        class RenderStudyTitle(StudyTitleMixin, base):
+            def render(self, context):
+                '''Overriding the render function to pass study_title to the context.'''
+                if self.object.proposal.studies_number > 1:
+                    context.update(
+                        {
+                            'study_title': super().get_study_title(self.object)
+                        }
+                    )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'intervention_observation':
+        class RenderStudyTitle(StudyTitleMixin, base):
+
+            def render(self, context):
+                '''Overriding the render function to pass study_title to the context.'''
+                if self.object.study.proposal.studies_number > 1:
+                    context.update(
+                        {
+                            'study_title': super().get_study_title(self.object.study)
+                        }
+                    )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'session':
+        class RenderStudyTitle(StudyTitleMixin, base):
+
+            def render(self, context):
+                context.update(
+                    {
+                        'study_title': super().get_session_title(self.object)
+                    }
+                )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'task':
+        class RenderStudyTitle(StudyTitleMixin, base):
+
+            def render(self, context):
+                context.update(
+                    {
+                        'study_title': super().get_task_title(self.object)
+                    }
+                )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'task_overview':
+        class RenderStudyTitle(StudyTitleMixin, base):
+
+            def render(self, context):
+                context.update(
+                    {
+                        'study_title': _('Overzicht van het takenonderzoek')
+                    }
+                )
+                return super().render(context)
+                    
+        return RenderStudyTitle
+    
+#NOTE: Diff has a bug when an object in the revision is missing. 
+#MAybe it gets passed the wrong template somewhere??
+
+study_title = get_render_mixin(PDFDiffSection, 'study')
+study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'study')
+intervention_observation_title = get_render_mixin(PDFDiffSection, 'intervention_observation')
+intervention_observation_title_diff = get_render_mixin(DiffSectionMissingObjects, 'intervention_observation')
+session_title = get_render_mixin(PDFDiffSection, 'session')
+session_title_diff = get_render_mixin(DiffSectionMissingObjects, 'session')
+task_title = get_render_mixin(PDFDiffSection, 'task')
+task_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task')
+task_overview_title = get_render_mixin(PDFDiffSection, 'task_overview')
+task_overview_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_overview')
+
+class GeneralSection(PDFDiffSection):
     '''This class generates the data for the general section of a proposal and showcases
     the general workflow for creating sections. All possible row fields are provided, and
     removed according to the logic in the get_row_fields method.
@@ -376,7 +449,18 @@ def get_row_fields(self, obj):
 
         return rows
     
-class WMOSection(PDFSection):
+class PageBreakMixin(PDFDiffSection):
+
+    def render(self, context):
+        context.update(
+            {
+                'page_break': True
+            }
+        )
+        return super().render(context)
+
+    
+class WMOSection(PageBreakMixin, PDFDiffSection):
     '''This class receives a proposal.wmo object.'''
     section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
     row_fields = [
@@ -397,7 +481,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class METCSection(PDFSection):
+class METCSection(PageBreakMixin, PDFDiffSection):
     '''This class receives a proposal.wmo object.
     This class exists because the RowValueClass does some
     funky things for working with the metc_decision_pdf field'''
@@ -409,7 +493,7 @@ class METCSection(PDFSection):
         'metc_decision_pdf'
     ]
     
-class TrajectoriesSection(PDFSection):
+class TrajectoriesSection(PageBreakMixin, PDFDiffSection):
     '''This class receives a proposal object.'''
 
     section_title = _("Eén of meerdere trajecten?")
@@ -427,7 +511,7 @@ def get_row_fields(self, obj):
 
         return rows
 
-class StudySection(PDFSection):
+class StudySection(study_title):
     '''This class receives a proposal.study object.'''
     section_title = _('De deelnemers')
     row_fields = [
@@ -476,32 +560,14 @@ def get_row_fields(self, obj):
             rows.remove('hierarchy_details')
 
         return rows
-        
-    def render(self, context):
-        '''Overriding the render function to pass study_title to the context.'''
-        if self.object.proposal.studies_number > 1:
-            context.update(
-                {
-                    'study_title': super().get_study_title(self.object)
-                }
-            )
-        return super().render(context)
     
     
-class StudySectionDiff(DiffSection, StudySection):
-    '''An example of a DiffSection. Unfortunately I found myself having to repeat the overriding
+class StudySectionDiff(study_title_diff, StudySection):
+    '''An example of a DiffSectionMissingObjects. Unfortunately I found myself having to repeat the overriding
     of the render function from the studySection, due to the mro.'''
+    pass
 
-    def render(self,context):
-        if self.object.proposal.studies_number > 1:
-            context.update(
-                {
-                    'study_title': super().get_study_title(self.object)
-                }
-            )
-        return super().render(context)
-
-class InterventionSection(PDFSection):
+class InterventionSection(intervention_observation_title):
     '''This class receives an intervention object'''
     section_title = _('Het interventieonderzoek')
     row_fields = [
@@ -551,27 +617,10 @@ def get_row_fields(self, obj):
 
         return rows
     
-    def render(self, context):
-        if self.object.study.proposal.studies_number > 1:
-            context.update(
-                {
-                    'study_title': super().get_study_title(self.object.study)
-                }
-            )
-        return super().render(context)
-    
-class InterventionSectionDiff(DiffSection, InterventionSection):
-
-    def render(self, context):
-        if self.object.study.proposal.studies_number > 1:
-            context.update(
-                {
-                    'study_title': super().get_study_title(self.object.study)
-                }
-            )
-        return super().render(context)
+class InterventionSectionDiff(intervention_observation_title_diff, InterventionSection):
+    pass
     
-class ObservationSection(InterventionSection):
+class ObservationSection(intervention_observation_title):
     '''This class receives an observation object
     It inherits from the InterventionSection, as it can repurpose the same overridden
     render method.'''
@@ -655,20 +704,20 @@ def get_row_fields(self, obj):
 
         return rows
     
-class ObservationSectionDiff(InterventionSectionDiff, ObservationSection):
+class ObservationSectionDiff(intervention_observation_title_diff, ObservationSection):
     '''Note that the diff sections follow a similar pattern of inheritance as 
     the regular sections, due to repurposing overriden methods, when applicable, 
     eg.:
 
-    class InterventionSection(PDFSection)
-    class InterventionSectionDiff(DiffSection, InterventionSection)
+    class InterventionSection(PDFDiffSection)
+    class InterventionSectionDiff(DiffSectionMissingObjects, InterventionSection)
 
     class ObservationSection(InterventionSection)
     class ObservationSectionDiff(InterventionSectionDiff, ObservationSection)
     '''
     pass
 
-class SessionsOverviewSection(StudySection):
+class SessionsOverviewSection(study_title):
     '''This class receives an study object
     This Section looks maybe a bit unnecessary, but it does remove some logic, plus
     the study_title.html from the template.'''
@@ -677,17 +726,12 @@ class SessionsOverviewSection(StudySection):
 
     row_fields = ['sessions_number']
 
-    def get_row_fields(self, obj):
-        return self.row_fields
-
 
-class SessionsSectionDiff(StudySectionDiff, SessionsOverviewSection):
+class SessionsOverviewSectionDiff(study_title_diff, SessionsOverviewSection):
     '''Needed to override get_row_fields, due to mro issue'''
-    
-    def get_row_fields(self, obj):
-        return self.row_fields
+    pass
 
-class SessionSection(PDFSection):
+class SessionSection(session_title):
     '''This class receives a session object'''
     
     row_fields = [
@@ -711,26 +755,11 @@ def get_row_fields(self, obj):
             rows.remove('leader_has_coc')
 
         return rows
-    
-    def render(self, context):
-        context.update(
-            {
-                'study_title': super().get_session_title(self.object)
-            }
-        )
-        return super().render(context)
 
-class SessionSectionDiff(DiffSection, SessionSection):
-
-    def render(self, context):
-        context.update(
-            {
-                'study_title': super().get_session_title(self.object)
-            }
-        )
-        return super().render(context)
+class SessionSectionDiff(session_title_diff, SessionSection):
+    pass
     
-class TaskSection(PDFSection):
+class TaskSection(task_title):
     '''This class receives an task object'''
     
     row_fields = [
@@ -761,25 +790,10 @@ def get_row_fields(self, obj):
 
         return rows
     
-    def render(self, context):
-        context.update(
-            {
-                'study_title': super().get_task_title(self.object)
-            }
-        )
-        return super().render(context)
-    
-class TaskSectionDiff(DiffSection, TaskSection):
-
-    def render(self, context):
-        context.update(
-            {
-                'study_title': super().get_task_title(self.object)
-            }
-        )
-        return super().render(context)
+class TaskSectionDiff(task_title_diff, TaskSection):
+    pass
     
-class TasksOverviewSection(PDFSection):
+class TasksOverviewSection(task_overview_title):
     '''Gets passed a session object
     This might be unecessary ... Maybe just use the existing template language ...
     Because the verbose name of this field is formatted, the method for retrieving
@@ -788,26 +802,11 @@ class TasksOverviewSection(PDFSection):
     row_fields = [
         'tasks_duration'
     ]
-
-    def render(self, context):
-        context.update(
-            {
-                'study_title': _('Overzicht van het takenonderzoek')
-            }
-        )
-        return super().render(context)
     
-class TasksOverviewSectionDiff(DiffSection, TaskSection):
-
-    def render(self, context):
-        context.update(
-            {
-                'study_title': _('Overzicht van het takenonderzoek')
-            }
-        )
-        return super().render(context)
+class TasksOverviewSectionDiff(task_overview_title_diff, TaskSection):
+    pass
     
-class StudyOverviewSection(StudySection):
+class StudyOverviewSection(study_title):
     '''This class receives a Study object.'''
 
     section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
@@ -839,10 +838,10 @@ def get_row_fields(self, obj):
 
         return rows
 
-class StudyOverviewSectionDiff(StudySectionDiff, StudyOverviewSection):
+class StudyOverviewSectionDiff(study_title_diff, StudyOverviewSection):
     pass
     
-class InformedConsentFormsSection(InterventionSection):
+class InformedConsentFormsSection(intervention_observation_title):
     '''This class receives a Documents object'''
 
     section_title = _('Informed consent formulieren')
@@ -920,10 +919,10 @@ def get_row_fields(self, obj):
 
         return rows
     
-class InformedConsentSectionDiff(InterventionSectionDiff, InformedConsentFormsSection):
+class InformedConsentSectionDiff(intervention_observation_title_diff, InformedConsentFormsSection):
     pass
     
-class ExtraDocumentsSection(PDFSection):
+class ExtraDocumentsSection(PDFDiffSection):
     '''This class receives an Documents object.
     Overrides the __init__ to create a formatted section title'''
 
@@ -946,13 +945,13 @@ def get_row_fields(self, obj):
 
         return rows
     
-class ExtraDocumentsSectionDiff(DiffSection, ExtraDocumentsSection):
+class ExtraDocumentsSectionDiff(DiffSectionMissingObjects, ExtraDocumentsSection):
 
     def __init__(self, objects_tuple, count):
         super().__init__(objects_tuple)
         self.section_title = _('Extra formulieren ') + str(count+1)     
     
-class DMPFileSection(PDFSection):
+class DMPFileSection(PDFDiffSection):
     '''This class receives a proposal object
     Also unnecessary I suppose. But I though why not ...'''
 
@@ -960,7 +959,7 @@ class DMPFileSection(PDFSection):
     
     row_fields = ['dmp_file']
 
-class EmbargoSection(PDFSection):
+class EmbargoSection(PDFDiffSection):
     '''Gets passed a proposal object'''
 
     section_title = _('Aanmelding versturen')
@@ -1023,7 +1022,7 @@ def create_context_pdf(context, model):
                 study_sections.append(TasksOverviewSection(session))
             study_sections.append(StudyOverviewSection(study))
             study_sections.append(InformedConsentFormsSection(study.documents))
-            context['studies'].append(study_sections)
+        context['studies'].append(study_sections)
 
         extra_documents = get_extra_documents(model)
 
@@ -1085,7 +1084,7 @@ def create_context_diff(context, models):
             if p_study is not None and p_study.has_sessions or \
                 study is not None and study.has_sessions:
 
-                study_sections.append(SessionsSectionDiff(diff_studies))
+                study_sections.append(SessionsOverviewSectionDiff(diff_studies))
 
                 p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
                                        else study for study in diff_studies))

From e7a93173e702971768b1215324c4d0b73dbce86d Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 26 Sep 2023 14:52:24 +0200
Subject: [PATCH 031/148] Working on requested changes. About to take a whole
 different path

---
 .../templates/proposals/proposal_diff.html    |   59 +-
 .../templates/proposals/proposal_pdf.html     |   33 +-
 proposals/utils/pdf_diff_logic copy.py        | 1165 +++++++++++++++++
 proposals/utils/pdf_diff_logic.py             |  226 ++--
 proposals/views/proposal_views.py             |    4 +-
 5 files changed, 1315 insertions(+), 172 deletions(-)
 create mode 100644 proposals/utils/pdf_diff_logic copy.py

diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index dea801c57..142b19344 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -50,50 +50,23 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
                 <img src="{% static 'main/images/loading.gif' %}"/>
             </div>
 
-                {% include general %}
-
-                {% include wmo %}
-
-                {% if metc %}
-                  {% include metc %}
-                {% endif %}
-          
-                {% include trajectories %}
-
-                {% if studies %}
-                    {% for study in studies %}
-                        {% for study_section in study %}
-                            {% include study_section %}
-                        {% endfor %}
-                    {% endfor %}
-
-                    {% if extra_documents %}
-                        {% for document in extra_documents %}
-                            {% include document %}
-                        {% endfor %}
-                    {% endif %}
-
-                    {% if dmp_file %}
-                        {% include dmp_file %}
-                    {% endif %}
-
-                    {% include embargo %}
-
+                {% for section in sections %}
+                    {% include section %}
+                {% endfor %}
                     
-                    <h2 class="mt-5 mb-1">{% trans "Ruimte voor eventuele opmerkingen" %}</h2>
-                    <table class="proposals-diff ">
-                        <tr>
-                            <th class="proposals-diff-question"></th>
-                            <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                            <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                        </tr>
-                        <tr>
-                            <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
-                            <td>{{ p_proposal.comments }}</td>
-                            <td>{{ proposal.comments }}</td>
-                        </tr>
-                    </table>
-                {% endif %}
+                <h2 class="mt-5 mb-1">{% trans "Ruimte voor eventuele opmerkingen" %}</h2>
+                <table class="proposals-diff ">
+                    <tr>
+                        <th class="proposals-diff-question"></th>
+                        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
+                        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
+                    </tr>
+                    <tr>
+                        <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
+                        <td>{{ p_proposal.comments }}</td>
+                        <td>{{ proposal.comments }}</td>
+                    </tr>
+                </table>
 
             <p class="mt-5 float-right">
                 <button class="button" onclick="window.history.back();">
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index eed9d45bc..1204673db 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -80,44 +80,15 @@ <h2>{% trans 'Indiener' %}</h2>
         </tr>
       </table>
 
-      {% include general %}
-
-      <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
-      <p>{{ proposal.summary|linebreaks }}</p>
-
-      {% include wmo %}
-
-      {% if metc %}
-        {% include metc %}
-      {% endif %}
-
-      {% include trajectories %}
-
-      {% if studies %}
-        {% for study in studies %}
-          {% for study_section in study %}
-            {% include study_section %}
-          {% endfor %}
+        {% for section in sections %}
+          {% include section %}
         {% endfor %}
 
-        {% if extra_documents %}
-          {% for document in extra_documents %}
-            {% include document %}
-          {% endfor %}
-        {% endif %}
-
-        {% if dmp_file %}
-          {% include dmp_file %}
-        {% endif %}
-
-        {% include embargo %}
-
         <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
         <p>
           {{ proposal.comments }}
         </p>
 
-      {% endif %}
     </div>
   </div>
 {% endblock %}
diff --git a/proposals/utils/pdf_diff_logic copy.py b/proposals/utils/pdf_diff_logic copy.py
new file mode 100644
index 000000000..f3db97943
--- /dev/null
+++ b/proposals/utils/pdf_diff_logic copy.py	
@@ -0,0 +1,1165 @@
+
+from datetime import date
+from copy import copy
+
+from django.conf import settings
+from django.contrib.auth import get_user_model
+from django.template.loader import get_template
+from django.utils.html import format_html
+from django.utils.safestring import mark_safe
+from django.utils.translation import ugettext as _
+
+from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
+necessity_required, has_adults
+from proposals.templatetags.diff_tags import zip_equalize_lists
+
+'''NOTE: As of now, the diff has no workaround for when observations or interventions are of a
+different version, in the different proposals.'''
+
+class BaseSection:
+
+    section_title = None
+    row_fields = None
+
+    def make_rows(self):
+        if self.object and self.object_2:
+            row_fields_1 = self.get_row_fields(self.object)
+            row_fields_2 = self.get_row_fields(self.object_2)
+
+            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
+
+            #The merging above messes with the order, so I reorder it here
+            row_fields = [row for row in self.row_fields if row in row_fields_both]
+
+            rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
+        else:
+            if self.object is None:
+                obj = self.object_2
+            else:
+                obj = self.object          
+
+            row_fields = self.get_row_fields(obj)
+
+            rows = [RowClass(obj, field) for field in row_fields]
+        return rows
+    
+    def get_row_fields(self, obj):
+        return self.row_fields
+
+class PDFDiffSection(BaseSection):
+    '''This is the main class, from which most classes are constructed.
+    It can take one object or two objects in a tuple, and produce html tables accordingly.
+    The most important methods are render and make_rows. Make rows makes use of get_row_field,
+    which is mostly overwritten for specific sections.
+    If this class is used in the diff, object should be the parent object and object_2 the 
+    revision/amendment.'''
+    
+    def __init__(self, object):
+        if isinstance(object, tuple):
+            self.object = object[0]
+            self.object_2 = object[1]
+        else:
+            self.object = object
+            self.object_2 = None
+
+    def render(self, context):
+        context = context.flatten()
+        if self.object_2:
+            template = get_template("proposals/table_with_header_diff.html")
+        else:
+            template = get_template("proposals/table_with_header.html")
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.make_rows(),
+            }
+        )
+        return template.render(context)
+
+class DiffSectionMissingObjects(BaseSection):
+    '''The DiffSectionMissingObjects class overrides the __init__ and render methods of the PDFDiffSection.
+    This exists for instances of tables in the diff, where it is possible
+    for objects to be entirely missing from one version or the other, such as studies.
+    If neccesary, it provides an object is missing warning and some info for formatting the
+    diff table. (self.missing_object)
+    The resulting diff section class inherit from this class, plus their own section class.
+
+    eg. class StudySectionDiff(DiffSectionMissingObjects, StudySection)'''
+
+    def __init__(self, objects_tuple):
+        if objects_tuple[0] is None:
+            self.warning = _(
+                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
+                )
+            self.missing_object = 0
+        elif objects_tuple[1] is None:
+            self.warning = _(
+                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+            )
+            self.missing_object = 1
+        else:
+            self.warning = None
+            self.missing_object = None
+        self.object = objects_tuple[0]
+        self.object_2 = objects_tuple[1]
+    
+    def render(self, context):
+        context = context.flatten()
+        template = get_template("proposals/table_with_header_diff.html")
+
+        if self.warning is not None:
+            context.update(
+                {
+                    "warning": self.warning,
+                    "missing_object": self.missing_object
+                }
+            )
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": self.make_rows(),
+            }
+        )
+        return template.render(context)
+class RowClass:
+    '''This class creates rows for either one or two objects, and gets initated
+    in the make_rows method of Section classes. The classmethods of Rowclass
+    are called in the templates of the render method of the PDF class.'''
+
+    verbose_name_diff_field_dict = {
+        'get_metc_display': 'metc',
+        'get_is_medical_display': 'is_medical'
+    }
+
+    def __init__(self, object, field, object_2 = None):
+        self.object = object
+        self.object_2 = object_2
+        self.field = field
+    
+    def verbose_name(self):
+        if self.field in self.verbose_name_diff_field_dict:
+            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
+            verbose_name = self.get_verbose_name(verbose_name_field)
+        else:
+            verbose_name= self.get_verbose_name(self.field)
+        return verbose_name   
+    
+    def value(self):
+        return RowValueClass(self.object, self.field).get_field_value()
+    
+    def value_2(self):
+        return RowValueClass(self.object_2, self.field).get_field_value()
+    
+    def get_verbose_name(self, field):
+        if field != 'tasks_duration':
+            return mark_safe(self.object._meta.get_field(field).verbose_name)
+        else:
+            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
+
+class RowValueClass:
+    '''The RowValueClass manages the values of fields and correctly retrieves and/or formats
+    the right values per field. This class get initiated in the value and value_2 methods
+    of the RowClass. It returns mostly strings, but sometimes some html as well.'''
+
+    def __init__(self, object, field):
+
+        self.object = object
+        self.field = field
+
+    def get_field_value(self):
+        from ..models import Relation
+        from studies.models import Compensation
+        
+        value = getattr(self.object, self.field)
+
+        User = get_user_model()
+
+        if value in ('Y', 'N', '?'):
+            return self.yes_no_doubt(value)
+        elif isinstance(value, bool):
+            return _('ja') if value else _('nee')
+        elif isinstance(value, (str, int, date)):
+            return value
+        elif value is None:
+            return _('Onbekend')
+        elif isinstance(value, User):
+            return self.handle_user(value)
+        elif isinstance(value, Relation) or isinstance(value, Compensation):
+            return value.description
+        elif value.__class__.__name__ == 'ManyRelatedManager':
+            if value.all().model == User:
+                return self.get_applicants_names(value)
+            else:
+                return self.get_object_list(value)
+        elif value.__class__.__name__ == 'FieldFile':
+            return self.handle_field_file(value)
+        elif callable(value):
+            return value()
+        
+    def handle_user(self, user):
+        return user.get_full_name()
+    
+    def get_applicants_names(self, applicants):
+        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
+        return self.create_unordered_html_list(applicant_names)
+    
+    def get_object_list(self, object):
+        list_of_objects = [obj for obj in object.all()]
+        return self.create_unordered_html_list(list_of_objects)
+    
+    def create_unordered_html_list(self, list):
+        html_output = mark_safe('<ul class="p-0">')
+
+        for item in list:
+            html_output += format_html('<li>{}</li>',
+                item
+            )
+        
+        html_output += mark_safe('</ul>')
+
+        return html_output
+    
+    def handle_field_file(self, field_file):
+        if field_file:
+            output = format_html('<a href={}>{}</a>',
+                f'{settings.BASE_URL}{field_file.url}',
+                _('Download')
+            )
+        else:
+            output = _('Niet aangeleverd')
+
+        return output
+    
+    def yes_no_doubt(self, value):
+        from main.models import YES_NO_DOUBT
+        d = dict(YES_NO_DOUBT)
+        return d[value]
+    
+class StudyTitleMixin:
+
+    def get_study_title(self, study):
+        if study.name:
+            study_title = format_html('{}{} <em>{} </em>',
+                                      _('Traject '),
+                                      study.order,
+                                      study.name
+            )
+        else:
+            study_title = format_html('{}{}',
+                                      _('Traject'),
+                                      {study.order}
+            )
+        return study_title
+    
+    def get_session_title(self, session):
+        if session is None:
+            return ''
+        else:
+            order = session.order 
+            study_order = session.study.order 
+            study_name = session.study.name 
+            studies_number = session.study.proposal.studies_number 
+            sessions_number = session.study.sessions_number
+
+            if studies_number > 1 and sessions_number > 1:
+                session_title = format_html('{}{} <em>{} </em> {}{}',
+                                        _('Traject '),
+                                        study_order,
+                                        study_name,
+                                        _('sessie '),
+                                        order
+                )
+            elif studies_number > 1:
+                session_title = format_html('{}{} <em>{} </em>',
+                                        _('Traject '),
+                                        study_order,
+                                        study_name,
+                )
+            elif sessions_number >= 1:
+                session_title = format_html('{}{}',
+                                            _('Sessie '),
+                                            order
+                )
+            return session_title
+    
+    def get_task_title(self, task):
+        if task is None:
+            return ''
+        else:
+            order=task.order 
+            session_order=task.session.order 
+            study_order=task.session.study.order 
+            study_name=task.session.study.name 
+            studies_number=task.session.study.proposal.studies_number
+            if studies_number > 1:
+                task_title = format_html('{}{} <em>{} </em>, {}{}{}{}',
+                                        _('Traject '),
+                                        study_order,
+                                        study_name,
+                                        _('sessie '),
+                                        session_order,
+                                        _(', taak '),
+                                        order
+                )
+            else:
+                task_title = format_html('{}{}{}{}',
+                                        _('Sessie '),
+                                        session_order,
+                                        _(', taak '),
+                                        order
+                                        )
+            return task_title
+        
+def get_render_mixin(base, section):
+
+    if section == 'study_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
+            def render(self, context):
+                '''Overriding the render function to pass study_title to the context.'''
+                if self.object.proposal.studies_number > 1:
+                    context.update(
+                        {
+                            'study_title': super().get_study_title(self.object)
+                        }
+                    )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'sub_study_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
+
+            def render(self, context):
+                '''Overriding the render function to pass study_title to the context.'''
+                if self.object.study.proposal.studies_number > 1:
+                    context.update(
+                        {
+                            'study_title': super().get_study_title(self.object.study)
+                        }
+                    )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'session_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
+
+            def render(self, context):
+                context.update(
+                    {
+                        'study_title': super().get_session_title(self.object)
+                    }
+                )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'task_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
+
+            def render(self, context):
+                context.update(
+                    {
+                        'study_title': super().get_task_title(self.object)
+                    }
+                )
+                return super().render(context)
+            
+        return RenderStudyTitle
+    
+    elif section == 'task_overview_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
+
+            def render(self, context):
+                context.update(
+                    {
+                        'study_title': _('Overzicht van het takenonderzoek')
+                    }
+                )
+                return super().render(context)
+                    
+        return RenderStudyTitle
+    
+
+study_title = get_render_mixin(PDFDiffSection, 'study_title')
+study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'study_title')
+sub_study_title = get_render_mixin(PDFDiffSection, 'sub_study_title')
+sub_study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'sub_study_title')
+session_title = get_render_mixin(PDFDiffSection, 'session_title')
+session_title_diff = get_render_mixin(DiffSectionMissingObjects, 'session_title')
+task_title = get_render_mixin(PDFDiffSection, 'task_title')
+task_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_title')
+task_overview_title = get_render_mixin(PDFDiffSection, 'task_overview_title')
+task_overview_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_overview_title')
+
+class GeneralSection(PDFDiffSection):
+    '''This class generates the data for the general section of a proposal and showcases
+    the general workflow for creating sections. All possible row fields are provided, and
+    removed according to the logic in the get_row_fields method.
+    This class receives a proposal object.'''
+
+    section_title = _("Algemene informatie over de aanvraag")
+    row_fields = [
+        'relation',
+        'supervisor',
+        'student_program',
+        'student_context',
+        'student_context_details',
+        'student_justification',
+        'other_applicants',
+        'applicants',
+        'other_stakeholders',
+        'stakeholders',
+        'date_start',
+        'title',
+        'funding',
+        'funding_details',
+        'funding_name',
+        'self_assessment',
+        'summary'
+    ]
+    
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not obj.relation.needs_supervisor:
+            rows.remove('supervisor')
+        if not obj.relation.check_in_course:
+            rows.remove('student_program')
+            rows.remove('student_context')
+            if obj.student_context is not None:
+                if not obj.student_context.needs_details:
+                    rows.remove('student_context_details')
+            else:
+                rows.remove('student_context_details')
+            rows.remove('student_justification')
+        if not obj.other_applicants:
+            rows.remove('applicants')
+        if not obj.other_stakeholders:
+            rows.remove('stakeholders')
+        if not needs_details(obj.funding.all()):
+            rows.remove('funding_details')
+        if not needs_details(obj.funding.all(), 'needs_name'):
+            rows.remove('funding_name')
+
+        return rows
+    
+class PageBreakMixin(PDFDiffSection):
+
+    def render(self, context):
+        context.update(
+            {
+                'page_break': True
+            }
+        )
+        return super().render(context)
+
+    
+class WMOSection(PageBreakMixin, PDFDiffSection):
+    '''This class receives a proposal.wmo object.'''
+    section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
+    row_fields = [
+        'get_metc_display',
+        'metc_details',
+        'metc_institution',
+        'get_is_medical_display',  
+    ]
+    
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not obj.metc == 'Y':
+            rows.remove('metc_details')
+            rows.remove('metc_institution')
+        else:
+            rows.remove('get_is_medical_display')
+
+        return rows
+    
+class METCSection(PageBreakMixin, PDFDiffSection):
+    '''This class receives a proposal.wmo object.
+    This class exists because the RowValueClass does some
+    funky things for working with the metc_decision_pdf field'''
+    section_title = _("Aanmelding bij de METC")
+    
+    row_fields = [
+        'metc_application',
+        'metc_decision',
+        'metc_decision_pdf'
+    ]
+    
+class TrajectoriesSection(PageBreakMixin, PDFDiffSection):
+    '''This class receives a proposal object.'''
+
+    section_title = _("Eén of meerdere trajecten?")
+
+    row_fields = [
+        'studies_similar',
+        'studies_number'
+    ]
+    
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if obj.studies_similar:
+            rows.remove('studies_number')
+
+        return rows
+
+class StudySection(study_title):
+    '''This class receives a proposal.study object.'''
+    section_title = _('De deelnemers')
+    row_fields = [
+        'age_groups',
+        'legally_incapable',
+        'legally_incapable_details',
+        'has_special_details',
+        'special_details',
+        'traits',
+        'traits_details',
+        'necessity',
+        'necessity_reason',
+        'recruitment',
+        'recruitment_details',
+        'compensation',
+        'compensation_details',
+        'hierarchy',
+        'hierarchy_details',
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not has_adults(obj):
+            rows.remove('legally_incapable')
+            rows.remove('legally_incapable_details')
+        elif not obj.legally_incapable:
+            rows.remove('legally_incapable_details')
+        if not obj.has_special_details:
+            rows.remove('special_details')
+            rows.remove('traits')
+            rows.remove('traits_details')
+        elif not medical_traits(obj.special_details.all()):
+            rows.remove('traits')
+            rows.remove('traits_details')
+        elif not needs_details(obj.traits.all()):
+            rows.remove('traits_details')
+        if not necessity_required(obj):
+            rows.remove('necessity')
+            rows.remove('necessity_reason')
+        if not needs_details(obj.recruitment.all()):
+            rows.remove('recruitment_details')
+        if not obj.compensation.needs_details:
+            rows.remove('compensation_details')
+        if not obj.hierarchy:
+            rows.remove('hierarchy_details')
+
+        return rows
+    
+    
+class StudySectionDiff(study_title_diff, StudySection):
+    '''An example of a DiffSectionMissingObjects. Unfortunately I found myself having to repeat the overriding
+    of the render function from the studySection, due to the mro.'''
+    pass
+
+class BaseInterventionSection(sub_study_title):
+
+    section_title = _('Het interventieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'period',
+        'duration',
+        'measurement',
+        'experimenter',
+        'description',
+        'has_controls',
+        'controls_description'
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+        
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not obj.has_controls:
+            rows.remove('controls_description')   
+
+        return rows
+
+class BaseInterventionSectionDiff(sub_study_title_diff, BaseInterventionSection):
+    pass
+
+class InterventionSectionV1(BaseInterventionSection):
+
+    def __init__(self, object):
+        super().__init__(object)
+        self.row_fields = super().get_row_fields(object)
+        self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
+        self.row_fields.append('extra_task')
+    
+class InterventionSectionV1Diff(BaseInterventionSectionDiff, InterventionSectionV1):
+    pass
+
+class InterventionSection(sub_study_title):
+    '''This class receives an intervention object'''
+    section_title = _('Het interventieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'period',
+        'multiple_sessions', 
+        'session_frequency',
+        'amount_per_week',
+        'duration',
+        'measurement',
+        'experimenter',
+        'description',
+        'has_controls',
+        'controls_description',
+        'extra_task'
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if obj.version == 1:
+            fields_to_remove = ['multiple_sessions',
+                                'session_frequency',
+                                'extra_task']
+            for field in fields_to_remove:
+                rows.remove(field)
+        else:
+            rows.remove('amount_per_week')
+            if not obj.multiple_sessions:
+                rows.remove('session_frequency')
+            if obj.settings_contains_schools:
+                rows.remove('extra_task')
+        
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not obj.has_controls:
+            rows.remove('controls_description')   
+
+        return rows
+    
+class InterventionSectionDiff(sub_study_title_diff, InterventionSection):
+    pass
+    
+class ObservationSection(sub_study_title):
+    '''This class receives an observation object
+    It inherits from the InterventionSection, as it can repurpose the same overridden
+    render method.'''
+    section_title = _('Het observatieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'days',
+        'mean_hours',
+        'details_who',
+        'details_why',
+        'details_frequency',
+        'is_anonymous',
+        'is_anonymous_details',
+        'is_in_target_group',
+        'is_in_target_group_details',
+        'is_nonpublic_space',
+        'is_nonpublic_space_details',
+        'has_advanced_consent',
+        'has_advanced_consent_details',
+        'needs_approval',
+        'approval_institution',
+        'approval_document',
+        'registrations',
+        'registrations_details'        
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if obj.version == 1:
+            to_remove_if_v1 = ['details_who',
+                            'details_why',
+                            'is_anonymous_details', 
+                            'is_in_target_group_details',
+                            'is_nonpublic_space_details',
+                            'has_advanced_consent_details'
+                            ]
+            for field in to_remove_if_v1:
+                rows.remove(field)
+
+            if not obj.is_nonpublic_space:
+                rows.remove('has_advanced_consent')
+            if not obj.needs_approval:
+                rows.remove('approval_institution')
+                rows.remove('approval_document')
+            elif obj.study.proposal.is_practice():
+                rows.remove('approval_document')
+        else:
+            to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
+            for field in to_remove_if_v2:
+                rows.remove(field)
+
+            if not obj.is_anonymous:
+                rows.remove('is_anonymous_details')
+            if not obj.is_in_target_group:
+                rows.remove('is_in_target_group_details')
+            if not obj.is_nonpublic_space:
+                rows.remove('is_nonpublic_space_details')
+                rows.remove('has_advanced_consent')
+                rows.remove('has_advanced_consent_details')
+            elif obj.has_advanced_consent:
+                rows.remove('has_advanced_consent_details')
+            if not needs_details(obj.setting.all(), 'is_school'):
+                rows.remove('needs_approval')
+            if not obj.needs_approval:
+                rows.remove('approval_institution')
+
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not needs_details(obj.registrations.all()):
+            rows.remove('registrations_details')
+
+        return rows
+    
+class ObservationSectionDiff(sub_study_title_diff, ObservationSection):
+    '''Note that the diff sections follow a similar pattern of inheritance as 
+    the regular sections, due to repurposing overriden methods, when applicable, 
+    eg.:
+
+    class InterventionSection(PDFDiffSection)
+    class InterventionSectionDiff(DiffSectionMissingObjects, InterventionSection)
+
+    class ObservationSection(InterventionSection)
+    class ObservationSectionDiff(InterventionSectionDiff, ObservationSection)
+    '''
+    pass
+
+class SessionsOverviewSection(study_title):
+    '''This class receives an study object
+    This Section looks maybe a bit unnecessary, but it does remove some logic, plus
+    the study_title.html from the template.'''
+
+    section_title = _("Het takenonderzoek en interviews")
+
+    row_fields = ['sessions_number']
+
+
+class SessionsOverviewSectionDiff(study_title_diff, SessionsOverviewSection):
+    '''Needed to override get_row_fields, due to mro issue'''
+    pass
+
+class SessionSection(session_title):
+    '''This class receives a session object'''
+    
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'tasks_number',       
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+
+        return rows
+
+class SessionSectionDiff(session_title_diff, SessionSection):
+    pass
+    
+class TaskSection(task_title):
+    '''This class receives an task object'''
+    
+    row_fields = [
+        'name',
+        'duration',
+        'registrations',
+        'registrations_details',
+        'registration_kinds',
+        'registration_kinds_details',
+        'feedback',
+        'feedback_details',
+        'description'
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not needs_details(obj.registrations.all()):
+            rows.remove('registrations_details')
+        if not needs_details(obj.registrations.all(), 'needs_kind') or \
+        not needs_details(obj.registration_kinds.all()):
+            rows.remove('registration_kinds')
+            rows.remove('registration_kinds_details')
+        elif not needs_details(obj.registration_kinds.all()):
+            rows.remove('registration_kinds_details')
+        if not obj.feedback:
+            rows.remove('feedback_details')
+
+        return rows
+    
+class TaskSectionDiff(task_title_diff, TaskSection):
+    pass
+    
+class TasksOverviewSection(task_overview_title):
+    '''Gets passed a session object
+    This might be unecessary ... Maybe just use the existing template language ...
+    Because the verbose name of this field is formatted, the method for retrieving
+    the verbose name in the RowClass is quite convoluded.'''
+
+    row_fields = [
+        'tasks_duration'
+    ]
+    
+class TasksOverviewSectionDiff(task_overview_title_diff, TasksOverviewSection):
+    pass
+    
+class StudyOverviewSection(study_title):
+    '''This class receives a Study object.'''
+
+    section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
+    row_fields = [
+        'deception',
+        'deception_details',
+        'negativity',
+        'negativity_details',
+        'stressful',
+        'stressful_details',
+        'risk',
+        'risk_details'
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        rows_to_remove = []
+        for x in range(0, 7, 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]
+
+        if not obj.has_sessions and not obj.deception == 'N':
+            rows.remove('deception')
+            rows.remove('deception_details')
+        elif not obj.has_sessions:
+            rows.remove('deception')
+
+        return rows
+
+class StudyOverviewSectionDiff(study_title_diff, StudyOverviewSection):
+    pass
+    
+class InformedConsentFormsSection(sub_study_title):
+    '''This class receives a Documents object'''
+
+    section_title = _('Informed consent formulieren')
+
+    row_fields = [
+        'translated_forms',
+        'translated_forms_languages',
+        'informed_consent',
+        'briefing',
+        'passive_consent',
+        'passive_consent_details',
+        'director_consent_declaration',
+        'director_consent_information',
+        'parents_information'
+    ]
+
+    def make_rows(self):
+
+        '''A few fields here need to access different objects, therefore this complex
+        overriding of the make_rows function ... :( '''
+
+        proposal_list = ['translated_forms', 'translated_forms_languages']
+        study_list = ['passive_consent', 'passive_consent_details']
+        if self.object_2:
+            row_fields_1 = self.get_row_fields(self.object)
+            row_fields_2 = self.get_row_fields(self.object_2)
+
+            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
+
+            ordered_row_fields = [row for row in self.row_fields if row in row_fields_both]
+
+            rows = []
+
+            for field in ordered_row_fields:
+                if field in proposal_list:
+                    rows.append(RowClass(self.object.proposal, field, self.object_2.proposal))
+                elif field in study_list:
+                    rows.append(RowClass(self.object.study, field, self.object_2.study))
+                else:
+                    rows.append(RowClass(self.object, field, self.object_2))
+                    
+        else:
+            row_fields = self.get_row_fields(self.object)
+
+            rows = []
+
+            for field in row_fields:
+                if field in proposal_list:
+                    rows.append(RowClass(self.object.proposal, field))
+                elif field in study_list:
+                    rows.append(RowClass(self.object.study, field))
+                else:
+                    rows.append(RowClass(self.object, field))
+    
+        return rows
+    
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not obj.proposal.translated_forms:
+            rows.remove('translated_forms_languages')
+        if obj.proposal.is_practice() or not obj.informed_consent:
+            rows.remove('informed_consent')
+            rows.remove('briefing')
+        if obj.study.passive_consent is None:
+            rows.remove('passive_consent')
+        if not obj.study.passive_consent:
+            rows.remove('passive_consent_details')
+        if not obj.director_consent_declaration:
+            rows.remove('director_consent_declaration')
+        if not obj.director_consent_information:
+            rows.remove('director_consent_information')
+        if not obj.parents_information:
+            rows.remove('parents_information')
+
+        return rows
+    
+class InformedConsentSectionDiff(sub_study_title_diff, InformedConsentFormsSection):
+    pass
+    
+class ExtraDocumentsSection(PDFDiffSection):
+    '''This class receives an Documents object.
+    Overrides the __init__ to create a formatted section title'''
+
+    row_fields = [
+        'informed_consent',
+        'briefing'
+    ]
+
+    def __init__(self, object, count):
+        super().__init__(object)
+        self.section_title = _('Extra formulieren ') + str(count + 1)
+    
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not obj.informed_consent:
+            rows.remove('informed_consent')
+        if not obj.briefing:
+            rows.remove('briefing')
+
+        return rows
+    
+class ExtraDocumentsSectionDiff(DiffSectionMissingObjects, ExtraDocumentsSection):
+
+    def __init__(self, objects_tuple, count):
+        super().__init__(objects_tuple)
+        self.section_title = _('Extra formulieren ') + str(count+1)     
+    
+class DMPFileSection(PDFDiffSection):
+    '''This class receives a proposal object
+    Also unnecessary I suppose. But I though why not ...'''
+
+    section_title = _('Data Management Plan')
+    
+    row_fields = ['dmp_file']
+
+class EmbargoSection(PDFDiffSection):
+    '''Gets passed a proposal object'''
+
+    section_title = _('Aanmelding versturen')
+
+    row_fields = [
+        'embargo',
+        'embargo_end_date'
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+
+        if not obj.embargo:
+            rows.remove('embargo_end_date')
+
+        return rows
+    
+def get_extra_documents(object):
+    '''A function to retrieve all extra documents for a specific proposal.'''
+    from studies.models import Documents
+
+    extra_documents = []
+
+    for document in Documents.objects.filter(
+        proposal = object,
+        study__isnull = True
+    ):
+        extra_documents.append(document)
+    
+    return extra_documents
+    
+def create_context_pdf(context, model):
+    '''A function to create the context for the PDF.'''
+
+    sections = []
+
+    sections.append(GeneralSection(model))
+    sections.append(WMOSection(model.wmo))
+
+    if model.wmo.status != model.wmo.NO_WMO:
+        sections.append(METCSection(model.wmo))
+    
+    sections.append(TrajectoriesSection(model))
+
+    if model.wmo.status == model.wmo.NO_WMO:
+
+        for study in model.study_set.all():
+            sections.append(StudySection(study))
+            if study.has_intervention:
+                sections.append(InterventionSection(study.intervention))
+            if study.has_observation:
+                sections.append(ObservationSection(study.observation))
+            if study.has_sessions:
+                sections.append(SessionsOverviewSection(study))
+                for session in study.session_set.all():
+                    sections.append(SessionSection(session))
+                    for task in session.task_set.all():
+                        sections.append(TaskSection(task))
+                sections.append(TasksOverviewSection(session))
+            sections.append(StudyOverviewSection(study))
+            sections.append(InformedConsentFormsSection(study.documents))
+
+        extra_documents = get_extra_documents(model)
+        
+        for count, document in enumerate(extra_documents):
+            sections.append(ExtraDocumentsSection(document, count))
+
+        if model.dmp_file:
+            sections.append(DMPFileSection(model))
+            
+        sections.append(EmbargoSection(model))
+
+    context['sections'] = sections
+    
+    return context
+
+def create_context_diff(context, p_proposal, proposal):
+    '''A function to create the context for the diff page.'''
+
+    both_proposals = (p_proposal, proposal)
+
+    sections = []
+
+    sections.append(GeneralSection(both_proposals))
+    sections.append(WMOSection((p_proposal.wmo, proposal.wmo)))
+
+    if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
+        sections.append(METCSection((p_proposal.wmo, proposal.wmo)))
+    
+    sections.append(TrajectoriesSection(both_proposals))
+
+    if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
+
+        for p_study, study in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
+
+            diff_studies = (p_study, study)
+
+            sections.append(StudySectionDiff((diff_studies)))
+
+            if p_study is not None and p_study.has_intervention or \
+                study is not None and study.has_intervention:
+
+
+                interventions = tuple((study.intervention if study is not None \
+                                       else study for study in diff_studies))
+                
+                sections.append(InterventionSectionDiff(interventions))
+
+            if p_study is not None and p_study.has_observation or \
+                study is not None and study.has_observation:
+
+                observations = tuple((study.observation if study is not None \
+                                       else study for study in diff_studies))
+                
+                sections.append(ObservationSectionDiff(observations))
+
+            if p_study is not None and p_study.has_sessions or \
+                study is not None and study.has_sessions:
+
+                sections.append(SessionsOverviewSectionDiff(diff_studies))
+
+                p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
+                                       else study for study in diff_studies))
+                
+                for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
+
+                    sections.append(SessionSectionDiff(diff_sessions))
+
+                    p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
+                                       else session for session in diff_sessions))
+                    
+                    for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+
+                        sections.append(TaskSectionDiff(diff_tasks))
+
+                sections.append(TasksOverviewSectionDiff(diff_sessions))
+
+            sections.append(StudyOverviewSectionDiff(diff_studies))
+
+            documents = tuple(study.documents if study is not None \
+                              else study for study in diff_studies)
+            
+            sections.append(InformedConsentSectionDiff(documents))
+
+        p_extra_docs = get_extra_documents(p_proposal)
+        extra_docs = get_extra_documents(proposal)
+
+        if p_extra_docs or extra_docs:
+            for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
+                sections.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
+
+        if p_proposal.dmp_file or proposal.dmp_file:
+            sections.append(DMPFileSection(both_proposals))
+            
+        sections.append(EmbargoSection(both_proposals))
+
+    context['sections'] = sections
+
+    return context
+
+
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 1ef3f6f86..f3db97943 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -13,9 +13,7 @@
 necessity_required, has_adults
 from proposals.templatetags.diff_tags import zip_equalize_lists
 
-'''NOTE: The current implementation does not account for page break formatting, present 
-in the previous pdf template
-NOTE: As of now, the diff has no workaround for when observations or interventions are of a
+'''NOTE: As of now, the diff has no workaround for when observations or interventions are of a
 different version, in the different proposals.'''
 
 class BaseSection:
@@ -178,12 +176,12 @@ def get_field_value(self):
 
         if value in ('Y', 'N', '?'):
             return self.yes_no_doubt(value)
+        elif isinstance(value, bool):
+            return _('ja') if value else _('nee')
         elif isinstance(value, (str, int, date)):
             return value
         elif value is None:
             return _('Onbekend')
-        elif isinstance(value, bool):
-            return _('ja') if value else _('nee')
         elif isinstance(value, User):
             return self.handle_user(value)
         elif isinstance(value, Relation) or isinstance(value, Compensation):
@@ -236,9 +234,8 @@ def yes_no_doubt(self, value):
         from main.models import YES_NO_DOUBT
         d = dict(YES_NO_DOUBT)
         return d[value]
-
-#NOTE: This is currently not working
-class StudyTitleMixin(PDFDiffSection, DiffSectionMissingObjects):
+    
+class StudyTitleMixin:
 
     def get_study_title(self, study):
         if study.name:
@@ -315,9 +312,8 @@ def get_task_title(self, task):
         
 def get_render_mixin(base, section):
 
-    if section == 'study':
-
-        class RenderStudyTitle(StudyTitleMixin, base):
+    if section == 'study_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
             def render(self, context):
                 '''Overriding the render function to pass study_title to the context.'''
                 if self.object.proposal.studies_number > 1:
@@ -330,8 +326,8 @@ def render(self, context):
             
         return RenderStudyTitle
     
-    elif section == 'intervention_observation':
-        class RenderStudyTitle(StudyTitleMixin, base):
+    elif section == 'sub_study_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
 
             def render(self, context):
                 '''Overriding the render function to pass study_title to the context.'''
@@ -345,8 +341,8 @@ def render(self, context):
             
         return RenderStudyTitle
     
-    elif section == 'session':
-        class RenderStudyTitle(StudyTitleMixin, base):
+    elif section == 'session_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
 
             def render(self, context):
                 context.update(
@@ -358,8 +354,8 @@ def render(self, context):
             
         return RenderStudyTitle
     
-    elif section == 'task':
-        class RenderStudyTitle(StudyTitleMixin, base):
+    elif section == 'task_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
 
             def render(self, context):
                 context.update(
@@ -371,8 +367,8 @@ def render(self, context):
             
         return RenderStudyTitle
     
-    elif section == 'task_overview':
-        class RenderStudyTitle(StudyTitleMixin, base):
+    elif section == 'task_overview_title':
+        class RenderStudyTitle(base, StudyTitleMixin):
 
             def render(self, context):
                 context.update(
@@ -384,19 +380,17 @@ def render(self, context):
                     
         return RenderStudyTitle
     
-#NOTE: Diff has a bug when an object in the revision is missing. 
-#MAybe it gets passed the wrong template somewhere??
-
-study_title = get_render_mixin(PDFDiffSection, 'study')
-study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'study')
-intervention_observation_title = get_render_mixin(PDFDiffSection, 'intervention_observation')
-intervention_observation_title_diff = get_render_mixin(DiffSectionMissingObjects, 'intervention_observation')
-session_title = get_render_mixin(PDFDiffSection, 'session')
-session_title_diff = get_render_mixin(DiffSectionMissingObjects, 'session')
-task_title = get_render_mixin(PDFDiffSection, 'task')
-task_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task')
-task_overview_title = get_render_mixin(PDFDiffSection, 'task_overview')
-task_overview_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_overview')
+
+study_title = get_render_mixin(PDFDiffSection, 'study_title')
+study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'study_title')
+sub_study_title = get_render_mixin(PDFDiffSection, 'sub_study_title')
+sub_study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'sub_study_title')
+session_title = get_render_mixin(PDFDiffSection, 'session_title')
+session_title_diff = get_render_mixin(DiffSectionMissingObjects, 'session_title')
+task_title = get_render_mixin(PDFDiffSection, 'task_title')
+task_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_title')
+task_overview_title = get_render_mixin(PDFDiffSection, 'task_overview_title')
+task_overview_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_overview_title')
 
 class GeneralSection(PDFDiffSection):
     '''This class generates the data for the general section of a proposal and showcases
@@ -422,6 +416,7 @@ class GeneralSection(PDFDiffSection):
         'funding_details',
         'funding_name',
         'self_assessment',
+        'summary'
     ]
     
     def get_row_fields(self, obj):
@@ -567,7 +562,54 @@ class StudySectionDiff(study_title_diff, StudySection):
     of the render function from the studySection, due to the mro.'''
     pass
 
-class InterventionSection(intervention_observation_title):
+class BaseInterventionSection(sub_study_title):
+
+    section_title = _('Het interventieonderzoek')
+    row_fields = [
+        'setting',
+        'setting_details',
+        'supervision',
+        'leader_has_coc',
+        'period',
+        'duration',
+        'measurement',
+        'experimenter',
+        'description',
+        'has_controls',
+        'controls_description'
+    ]
+
+    def get_row_fields(self, obj):
+        rows = copy(self.row_fields)
+        
+        if not needs_details(obj.setting.all()):
+            rows.remove('setting_details')
+        if not obj.study.has_children() or \
+        not needs_details(obj.setting.all(), 'needs_supervision'):
+            rows.remove('supervision')
+            rows.remove('leader_has_coc')
+        elif obj.supervision:
+            rows.remove('leader_has_coc')
+        if not obj.has_controls:
+            rows.remove('controls_description')   
+
+        return rows
+
+class BaseInterventionSectionDiff(sub_study_title_diff, BaseInterventionSection):
+    pass
+
+class InterventionSectionV1(BaseInterventionSection):
+
+    def __init__(self, object):
+        super().__init__(object)
+        self.row_fields = super().get_row_fields(object)
+        self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
+        self.row_fields.append('extra_task')
+    
+class InterventionSectionV1Diff(BaseInterventionSectionDiff, InterventionSectionV1):
+    pass
+
+class InterventionSection(sub_study_title):
     '''This class receives an intervention object'''
     section_title = _('Het interventieonderzoek')
     row_fields = [
@@ -617,10 +659,10 @@ def get_row_fields(self, obj):
 
         return rows
     
-class InterventionSectionDiff(intervention_observation_title_diff, InterventionSection):
+class InterventionSectionDiff(sub_study_title_diff, InterventionSection):
     pass
     
-class ObservationSection(intervention_observation_title):
+class ObservationSection(sub_study_title):
     '''This class receives an observation object
     It inherits from the InterventionSection, as it can repurpose the same overridden
     render method.'''
@@ -704,7 +746,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class ObservationSectionDiff(intervention_observation_title_diff, ObservationSection):
+class ObservationSectionDiff(sub_study_title_diff, ObservationSection):
     '''Note that the diff sections follow a similar pattern of inheritance as 
     the regular sections, due to repurposing overriden methods, when applicable, 
     eg.:
@@ -803,7 +845,7 @@ class TasksOverviewSection(task_overview_title):
         'tasks_duration'
     ]
     
-class TasksOverviewSectionDiff(task_overview_title_diff, TaskSection):
+class TasksOverviewSectionDiff(task_overview_title_diff, TasksOverviewSection):
     pass
     
 class StudyOverviewSection(study_title):
@@ -841,7 +883,7 @@ def get_row_fields(self, obj):
 class StudyOverviewSectionDiff(study_title_diff, StudyOverviewSection):
     pass
     
-class InformedConsentFormsSection(intervention_observation_title):
+class InformedConsentFormsSection(sub_study_title):
     '''This class receives a Documents object'''
 
     section_title = _('Informed consent formulieren')
@@ -919,7 +961,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class InformedConsentSectionDiff(intervention_observation_title_diff, InformedConsentFormsSection):
+class InformedConsentSectionDiff(sub_study_title_diff, InformedConsentFormsSection):
     pass
     
 class ExtraDocumentsSection(PDFDiffSection):
@@ -994,84 +1036,79 @@ def get_extra_documents(object):
 def create_context_pdf(context, model):
     '''A function to create the context for the PDF.'''
 
-    context['general'] = GeneralSection(model)
-    context['wmo'] = WMOSection(model.wmo)
+    sections = []
+
+    sections.append(GeneralSection(model))
+    sections.append(WMOSection(model.wmo))
 
     if model.wmo.status != model.wmo.NO_WMO:
-        context['metc'] = METCSection(model.wmo)
+        sections.append(METCSection(model.wmo))
     
-    context['trajectories'] = TrajectoriesSection(model)
+    sections.append(TrajectoriesSection(model))
 
     if model.wmo.status == model.wmo.NO_WMO:
 
-        context['studies'] = []
-
         for study in model.study_set.all():
-            study_sections = []
-            study_sections.append(StudySection(study))
+            sections.append(StudySection(study))
             if study.has_intervention:
-                study_sections.append(InterventionSection(study.intervention))
+                sections.append(InterventionSection(study.intervention))
             if study.has_observation:
-                study_sections.append(ObservationSection(study.observation))
+                sections.append(ObservationSection(study.observation))
             if study.has_sessions:
-                study_sections.append(SessionsOverviewSection(study))
+                sections.append(SessionsOverviewSection(study))
                 for session in study.session_set.all():
-                    study_sections.append(SessionSection(session))
+                    sections.append(SessionSection(session))
                     for task in session.task_set.all():
-                        study_sections.append(TaskSection(task))
-                study_sections.append(TasksOverviewSection(session))
-            study_sections.append(StudyOverviewSection(study))
-            study_sections.append(InformedConsentFormsSection(study.documents))
-        context['studies'].append(study_sections)
+                        sections.append(TaskSection(task))
+                sections.append(TasksOverviewSection(session))
+            sections.append(StudyOverviewSection(study))
+            sections.append(InformedConsentFormsSection(study.documents))
 
         extra_documents = get_extra_documents(model)
-
-        extra_documents_objects = [ExtraDocumentsSection(document, count) for count, document \
-                                   in enumerate(extra_documents)]
-
-        if extra_documents_objects:
-            context['extra_documents'] = extra_documents_objects
+        
+        for count, document in enumerate(extra_documents):
+            sections.append(ExtraDocumentsSection(document, count))
 
         if model.dmp_file:
-            context['dmp_file'] = DMPFileSection(model)
+            sections.append(DMPFileSection(model))
             
-        context['embargo'] = EmbargoSection(model)
+        sections.append(EmbargoSection(model))
+
+    context['sections'] = sections
     
     return context
 
-def create_context_diff(context, models):
+def create_context_diff(context, p_proposal, proposal):
     '''A function to create the context for the diff page.'''
 
-    p_proposal = models[0]
-    proposal = models[1]
+    both_proposals = (p_proposal, proposal)
+
+    sections = []
 
-    context['general'] = GeneralSection(models)
-    context['wmo'] = WMOSection((p_proposal.wmo, proposal.wmo))
+    sections.append(GeneralSection(both_proposals))
+    sections.append(WMOSection((p_proposal.wmo, proposal.wmo)))
 
     if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
-        context['metc'] = METCSection((p_proposal.wmo, proposal.wmo))
+        sections.append(METCSection((p_proposal.wmo, proposal.wmo)))
     
-    context['trajectories'] = TrajectoriesSection(models)
+    sections.append(TrajectoriesSection(both_proposals))
 
     if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
 
-        context['studies'] = []
+        for p_study, study in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
 
-        for diff_studies in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
+            diff_studies = (p_study, study)
 
-            p_study = diff_studies[0]
-            study = diff_studies[1]
-
-            study_sections = []
-            study_sections.append(StudySectionDiff((diff_studies)))
+            sections.append(StudySectionDiff((diff_studies)))
 
             if p_study is not None and p_study.has_intervention or \
                 study is not None and study.has_intervention:
 
+
                 interventions = tuple((study.intervention if study is not None \
                                        else study for study in diff_studies))
                 
-                study_sections.append(InterventionSectionDiff(interventions))
+                sections.append(InterventionSectionDiff(interventions))
 
             if p_study is not None and p_study.has_observation or \
                 study is not None and study.has_observation:
@@ -1079,52 +1116,49 @@ def create_context_diff(context, models):
                 observations = tuple((study.observation if study is not None \
                                        else study for study in diff_studies))
                 
-                study_sections.append(ObservationSectionDiff(observations))
+                sections.append(ObservationSectionDiff(observations))
 
             if p_study is not None and p_study.has_sessions or \
                 study is not None and study.has_sessions:
 
-                study_sections.append(SessionsOverviewSectionDiff(diff_studies))
+                sections.append(SessionsOverviewSectionDiff(diff_studies))
 
                 p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
                                        else study for study in diff_studies))
                 
                 for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
 
-                    study_sections.append(SessionSectionDiff(diff_sessions))
+                    sections.append(SessionSectionDiff(diff_sessions))
 
                     p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
                                        else session for session in diff_sessions))
                     
                     for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
 
-                        study_sections.append(TaskSectionDiff(diff_tasks))
+                        sections.append(TaskSectionDiff(diff_tasks))
 
-                study_sections.append(TasksOverviewSection(diff_sessions))
+                sections.append(TasksOverviewSectionDiff(diff_sessions))
 
-            study_sections.append(StudyOverviewSectionDiff(diff_studies))
+            sections.append(StudyOverviewSectionDiff(diff_studies))
 
             documents = tuple(study.documents if study is not None \
                               else study for study in diff_studies)
             
-            study_sections.append(InformedConsentSectionDiff(documents))
-
-            context['studies'].append(study_sections)
+            sections.append(InformedConsentSectionDiff(documents))
 
         p_extra_docs = get_extra_documents(p_proposal)
         extra_docs = get_extra_documents(proposal)
 
-        extra_docs_objects = []
-
-        for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
-            extra_docs_objects.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
-        if extra_docs_objects:
-            context['extra_documents'] = extra_docs_objects
+        if p_extra_docs or extra_docs:
+            for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
+                sections.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
 
         if p_proposal.dmp_file or proposal.dmp_file:
-            context['dmp_file'] = DMPFileSection(models)
+            sections.append(DMPFileSection(both_proposals))
             
-        context['embargo'] = EmbargoSection(models)
+        sections.append(EmbargoSection(both_proposals))
+
+    context['sections'] = sections
 
     return context
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 88b449063..e25b3df83 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -446,7 +446,7 @@ def get_next_url(self):
 
     def get_back_url(self):
         """Return to the data management view"""
-        return reverse('proposals:data_management', aPdfrgs=(self.object.pk,))
+        return reverse('proposals:data_management', args=(self.object.pk,))
 
     def _get_page_number(self):
         if self.object.is_pre_assessment:
@@ -564,7 +564,7 @@ class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context = create_context_diff(context, (self.object.parent, self.object))
+        context = create_context_diff(context, self.object.parent, self.object)
 
         return context
 

From 7a233f28965e0628330cab2860f5de3f9cceb4a8 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 26 Sep 2023 16:23:43 +0200
Subject: [PATCH 032/148] Doing it a whole different way ;p

---
 proposals/utils/pdf_diff_logic.py | 248 +++++++++++-------------------
 1 file changed, 88 insertions(+), 160 deletions(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index f3db97943..17336a2b6 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -17,57 +17,42 @@
 different version, in the different proposals.'''
 
 class BaseSection:
-
+    '''This is the main class, from which most classes are constructed.
+    It can take one object or two objects in a tuple, and produce html tables accordingly.
+    The most important methods are render and make_rows. Make rows makes use of get_row_field,
+    which is mostly overwritten for specific sections.
+    If this class is used in the diff, object should be the parent object and object_2 the 
+    revision/amendment.'''
+    
     section_title = None
     row_fields = None
 
-    def make_rows(self):
-        if self.object and self.object_2:
-            row_fields_1 = self.get_row_fields(self.object)
-            row_fields_2 = self.get_row_fields(self.object_2)
-
-            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
-
-            #The merging above messes with the order, so I reorder it here
-            row_fields = [row for row in self.row_fields if row in row_fields_both]
-
-            rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
+    def __init__(self, object, study_title_type = None):
+        self.object = object
+        if study_title_type is None:
+            self.study_title = None
         else:
-            if self.object is None:
-                obj = self.object_2
-            else:
-                obj = self.object          
+            self.study_title = self.get_study_title(self.object, study_title_type)
+        self.processed_row_fields = self.get_row_fields()
 
-            row_fields = self.get_row_fields(obj)
+    def make_rows(self):   
+
+        rows = [RowClass(self.object, field) for field in self.processed_row_fields]
 
-            rows = [RowClass(obj, field) for field in row_fields]
         return rows
     
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         return self.row_fields
 
-class PDFDiffSection(BaseSection):
-    '''This is the main class, from which most classes are constructed.
-    It can take one object or two objects in a tuple, and produce html tables accordingly.
-    The most important methods are render and make_rows. Make rows makes use of get_row_field,
-    which is mostly overwritten for specific sections.
-    If this class is used in the diff, object should be the parent object and object_2 the 
-    revision/amendment.'''
-    
-    def __init__(self, object):
-        if isinstance(object, tuple):
-            self.object = object[0]
-            self.object_2 = object[1]
-        else:
-            self.object = object
-            self.object_2 = None
-
     def render(self, context):
         context = context.flatten()
-        if self.object_2:
-            template = get_template("proposals/table_with_header_diff.html")
-        else:
-            template = get_template("proposals/table_with_header.html")
+        template = get_template("proposals/table_with_header.html")
+        if self.study_title is not None:
+            context.update(
+                {
+                    "study_title": self.study_title
+                }
+            )
         context.update(
             {
                 "section_title": self.section_title,
@@ -75,33 +60,40 @@ def render(self, context):
             }
         )
         return template.render(context)
+    
+    def get_study_title(self, object, study_title_type):
+        return StudyTitleClass(object, study_title_type).study_title
 
-class DiffSectionMissingObjects(BaseSection):
-    '''The DiffSectionMissingObjects class overrides the __init__ and render methods of the PDFDiffSection.
-    This exists for instances of tables in the diff, where it is possible
-    for objects to be entirely missing from one version or the other, such as studies.
-    If neccesary, it provides an object is missing warning and some info for formatting the
-    diff table. (self.missing_object)
-    The resulting diff section class inherit from this class, plus their own section class.
+class DiffSection:
+    '''Receives a list of BaseSection objects'''
 
-    eg. class StudySectionDiff(DiffSectionMissingObjects, StudySection)'''
+    def __init__(self, objects):
+        self.objects = objects
+
+    def make_diff_rows(self, objects):
+
+        diff_dict = {}
+
+        for row_field in object[0].row_fields:
+            diff_dict[row_field] = []
+
+        for object in objects:
+            for row in object.make_rows():
+                if row.field in object.processed_row_fields:
+                    if not diff_dict[row.field]:
+                        diff_dict[row_field] += [row.verbose_name, row.value]
+                    else:
+                        diff_dict[row.field] += [row.value]
+                else:
+                    diff_dict[row.fields] += ['']
+        
+        for row_field, row in diff_dict:
+            #Check if a certain row is empty
+            if all('' == s or s.isspace() for s in row):
+                diff_dict.pop(row_field)
+        
+        return diff_dict
 
-    def __init__(self, objects_tuple):
-        if objects_tuple[0] is None:
-            self.warning = _(
-                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
-                )
-            self.missing_object = 0
-        elif objects_tuple[1] is None:
-            self.warning = _(
-                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
-            )
-            self.missing_object = 1
-        else:
-            self.warning = None
-            self.missing_object = None
-        self.object = objects_tuple[0]
-        self.object_2 = objects_tuple[1]
     
     def render(self, context):
         context = context.flatten()
@@ -131,9 +123,8 @@ class RowClass:
         'get_is_medical_display': 'is_medical'
     }
 
-    def __init__(self, object, field, object_2 = None):
+    def __init__(self, object, field):
         self.object = object
-        self.object_2 = object_2
         self.field = field
     
     def verbose_name(self):
@@ -235,20 +226,40 @@ def yes_no_doubt(self, value):
         d = dict(YES_NO_DOUBT)
         return d[value]
     
-class StudyTitleMixin:
-
+class StudyTitleClass:
+
+    def __init__(self, object, study_title_type):
+        if study_title_type == 'study':
+            self.study_title = self.get_study_title(object)
+        elif study_title_type == 'session':
+            self.study_title = self.get_session_title(object)
+        elif study_title_type == 'task':
+            self.study_title = self.get_task_title(object)
+        elif study_title_type == 'task_overview':
+            self.study_title == _('Overzicht van het takenonderzoek')
+        else:
+            self.study_title == None
+        
     def get_study_title(self, study):
-        if study.name:
-            study_title = format_html('{}{} <em>{} </em>',
-                                      _('Traject '),
-                                      study.order,
-                                      study.name
-            )
+
+        from studies.models import Study
+
+        if not isinstance(study, Study):
+            study = study.study
+        if study.proposal.studies_number > 1:        
+            if study.name:
+                study_title = format_html('{}{} <em>{} </em>',
+                                        _('Traject '),
+                                        study.order,
+                                        study.name
+                )
+            else:
+                study_title = format_html('{}{}',
+                                        _('Traject'),
+                                        {study.order}
+                )
         else:
-            study_title = format_html('{}{}',
-                                      _('Traject'),
-                                      {study.order}
-            )
+            study_title = None
         return study_title
     
     def get_session_title(self, session):
@@ -309,89 +320,6 @@ def get_task_title(self, task):
                                         order
                                         )
             return task_title
-        
-def get_render_mixin(base, section):
-
-    if section == 'study_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-            def render(self, context):
-                '''Overriding the render function to pass study_title to the context.'''
-                if self.object.proposal.studies_number > 1:
-                    context.update(
-                        {
-                            'study_title': super().get_study_title(self.object)
-                        }
-                    )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'sub_study_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                '''Overriding the render function to pass study_title to the context.'''
-                if self.object.study.proposal.studies_number > 1:
-                    context.update(
-                        {
-                            'study_title': super().get_study_title(self.object.study)
-                        }
-                    )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'session_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                context.update(
-                    {
-                        'study_title': super().get_session_title(self.object)
-                    }
-                )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'task_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                context.update(
-                    {
-                        'study_title': super().get_task_title(self.object)
-                    }
-                )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'task_overview_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                context.update(
-                    {
-                        'study_title': _('Overzicht van het takenonderzoek')
-                    }
-                )
-                return super().render(context)
-                    
-        return RenderStudyTitle
-    
-
-study_title = get_render_mixin(PDFDiffSection, 'study_title')
-study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'study_title')
-sub_study_title = get_render_mixin(PDFDiffSection, 'sub_study_title')
-sub_study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'sub_study_title')
-session_title = get_render_mixin(PDFDiffSection, 'session_title')
-session_title_diff = get_render_mixin(DiffSectionMissingObjects, 'session_title')
-task_title = get_render_mixin(PDFDiffSection, 'task_title')
-task_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_title')
-task_overview_title = get_render_mixin(PDFDiffSection, 'task_overview_title')
-task_overview_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_overview_title')
-
 class GeneralSection(PDFDiffSection):
     '''This class generates the data for the general section of a proposal and showcases
     the general workflow for creating sections. All possible row fields are provided, and

From 632a1f923540fd17d3dec1f3debab05d9491d045 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 2 Oct 2023 15:37:40 +0200
Subject: [PATCH 033/148] Main infrastructure for diff based on pdf sections

---
 .../proposals/table_with_header.html          |   4 +-
 .../proposals/table_with_header_diff.html     |  14 +-
 proposals/utils/pdf_diff_logic.py             | 198 +++++++++++++-----
 3 files changed, 155 insertions(+), 61 deletions(-)

diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index 8d9d7cca0..841002225 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -9,9 +9,9 @@ <h2> {% trans section_title %} </h2>
     <h3> {{ study_title }} </h3>
 {% endif %}
 <table>
-{% for row in rows %}
+{% for verbose_name, value in rows.items %}
 <tr>
-<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
+<th>{{ verbose_name }}</th><td>{{ value }}</td>
 </tr>
 {% endfor %}
 </table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 0a8b01333..900beac4c 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -15,7 +15,7 @@ <h3 class='mt-3'> {{ study_title }} </h3>
     </tr>
 {% if warning %}
     <tr class="diff-ignore">
-        <th>{{ rows.0.verbose_name }}</th>
+        <th>{{ rows_keys_list.0 }}</th>
         {# If the first object is missing, place a warning on the first TD #}
         {% if missing_object == 0 %}
             <td rowspan='{{rows|length}}'>
@@ -23,10 +23,10 @@ <h3 class='mt-3'> {{ study_title }} </h3>
                     {{ warning }}
                 </div>
             </td>
-            <td>{{rows.0.value}}</td>
+            <td>{{rows.rows_keys_list.0 }}</td>
         {# Otherwise, we're missing the second one, thus we place the warning on the second #}
         {% elif missing_object == 1 %}
-            <td>{{rows.0.value}}</td>
+            <td>{{rows.rows_keys_list.0 }}</td>
             <td rowspan='{{rows|length}}'>
                 <div class='warning'>
                     {{ warning }}
@@ -34,15 +34,15 @@ <h3 class='mt-3'> {{ study_title }} </h3>
             </td>
         {% endif %}
     </tr>
-    {%for row in rows|slice:"1:"%}
+    {%for row_key in rows_keys_list|slice:"1:"%}
     <tr class="diff-ignore">
-        <th>{{row.verbose_name}}</th><td>{{row.value}}</td>
+        <th>{{row_key}}</th><td>{{rows.row_key}}</td>
     </tr>
     {% endfor %}
 {% else %}
-    {% for row in rows %}
+    {% for verbose_name, values in rows.items %}
         <tr>
-            <th>{{ row.verbose_name }}</th><td>{{ row.value }}</td><td>{{row.value_2}}</td>
+            <th>{{ verbose_name }}</th><td>{{ values.0 }}</td><td>{{ values.1 }}</td>
         </tr>
     {% endfor %}
 {% endif %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 17336a2b6..f8ed5b192 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -33,11 +33,11 @@ def __init__(self, object, study_title_type = None):
             self.study_title = None
         else:
             self.study_title = self.get_study_title(self.object, study_title_type)
-        self.processed_row_fields = self.get_row_fields()
 
     def make_rows(self):   
 
         rows = [RowClass(self.object, field) for field in self.processed_row_fields]
+        rows = {row.verbose_name: row.value for row in rows}
 
         return rows
     
@@ -65,36 +65,56 @@ def get_study_title(self, object, study_title_type):
         return StudyTitleClass(object, study_title_type).study_title
 
 class DiffSection:
-    '''Receives a list of BaseSection objects'''
 
     def __init__(self, objects):
         self.objects = objects
+        self.rows = self.make_diff_rows()
+        if None in self.objects:
+            if self.objects[0] is None:
+                self.warning = _(
+                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
+                )
+                self.missing_object = 0
+                self.study_title = self.objects[1].study_title
+            else:
+                self.warning = _(
+                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+            )
+                self.missing_object = 1
+                self.study_title = self.objects[0].study_title
+        else:
+            self.warning = None
+            self.missing_object = None
+            self.study_title = self.objects[0].study_title
+
+    def make_diff_rows(self):
+            
+        if self.missing_object == 0:
+            diff_dict = self.objects[1].make_rows()
+        if self.missing_object == 1:
+            diff_dict = self.object[0].make_rows()
+        else:
+            initial_rows_dicts = [object.make_rows() for object in self.objects]
 
-    def make_diff_rows(self, objects):
+            #creating a list containing all fields in all objects
+            all_fields = initial_rows_dicts[0].keys()
+            for rows_dict in initial_rows_dicts[1:]:
+                all_fields.extend(field for field in rows_dict.keys() if field not in all_fields)
 
-        diff_dict = {}
+            diff_dict = {}
 
-        for row_field in object[0].row_fields:
-            diff_dict[row_field] = []
+            for field in all_fields:
+                diff_dict[field] = []
 
-        for object in objects:
-            for row in object.make_rows():
-                if row.field in object.processed_row_fields:
-                    if not diff_dict[row.field]:
-                        diff_dict[row_field] += [row.verbose_name, row.value]
+            for rows_dict in initial_rows_dicts:
+                for field in all_fields:
+                    if field in rows_dict:
+                        diff_dict[field].append(rows_dict[field])
                     else:
-                        diff_dict[row.field] += [row.value]
-                else:
-                    diff_dict[row.fields] += ['']
-        
-        for row_field, row in diff_dict:
-            #Check if a certain row is empty
-            if all('' == s or s.isspace() for s in row):
-                diff_dict.pop(row_field)
-        
+                        diff_dict[field].append('')
+
         return diff_dict
 
-    
     def render(self, context):
         context = context.flatten()
         template = get_template("proposals/table_with_header_diff.html")
@@ -106,13 +126,21 @@ def render(self, context):
                     "missing_object": self.missing_object
                 }
             )
+        if self.study_title is not None:
+            context.update(
+                {
+                    "study_title": self.study_title,
+                }
+            )
         context.update(
             {
-                "section_title": self.section_title,
-                "rows": self.make_rows(),
+                "section_title": self.objects[0].section_title,
+                "rows": self.rows,
+                "rows_keys_list": list(self.rows)
             }
         )
         return template.render(context)
+    
 class RowClass:
     '''This class creates rows for either one or two objects, and gets initated
     in the make_rows method of Section classes. The classmethods of Rowclass
@@ -138,9 +166,6 @@ def verbose_name(self):
     def value(self):
         return RowValueClass(self.object, self.field).get_field_value()
     
-    def value_2(self):
-        return RowValueClass(self.object_2, self.field).get_field_value()
-    
     def get_verbose_name(self, field):
         if field != 'tasks_duration':
             return mark_safe(self.object._meta.get_field(field).verbose_name)
@@ -835,36 +860,20 @@ def make_rows(self):
 
         proposal_list = ['translated_forms', 'translated_forms_languages']
         study_list = ['passive_consent', 'passive_consent_details']
-        if self.object_2:
-            row_fields_1 = self.get_row_fields(self.object)
-            row_fields_2 = self.get_row_fields(self.object_2)
-
-            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
-
-            ordered_row_fields = [row for row in self.row_fields if row in row_fields_both]
 
-            rows = []
+        row_fields = self.get_row_fields(self.object)
 
-            for field in ordered_row_fields:
-                if field in proposal_list:
-                    rows.append(RowClass(self.object.proposal, field, self.object_2.proposal))
-                elif field in study_list:
-                    rows.append(RowClass(self.object.study, field, self.object_2.study))
-                else:
-                    rows.append(RowClass(self.object, field, self.object_2))
-                    
-        else:
-            row_fields = self.get_row_fields(self.object)
+        rows = []
 
-            rows = []
+        for field in row_fields:
+            if field in proposal_list:
+                rows.append(RowClass(self.object.proposal, field))
+            elif field in study_list:
+                rows.append(RowClass(self.object.study, field))
+            else:
+                rows.append(RowClass(self.object, field))
 
-            for field in row_fields:
-                if field in proposal_list:
-                    rows.append(RowClass(self.object.proposal, field))
-                elif field in study_list:
-                    rows.append(RowClass(self.object.study, field))
-                else:
-                    rows.append(RowClass(self.object, field))
+        rows = {row.verbose_name: row.value for row in rows}
     
         return rows
     
@@ -1090,4 +1099,89 @@ def create_context_diff(context, p_proposal, proposal):
 
     return context
 
+def create_context_diff_alt(context, p_p, p):
+    '''A function to create the context for the diff page.'''
+    '''I am using 'p' as a shorthand for proposal and 'p_p' for parent proposal
+    to cut down on the verbosity here ...'''
+
+    both_ps = (p_p, p)
+
+    sections = []
+
+    sections.append(DiffSection([GeneralSection(p) for p in both_ps]))
+    sections.append(DiffSection([WMOSection(p.wmo) for p in both_ps]))
+
+    if p.wmo.status != p.wmo.NO_WMO or p_p.wmo.status != p_p.wmo.NO_WMO:
+        sections.append(DiffSection([METCSection(p.wmo) for p in both_ps]))
+    
+    sections.append(DiffSection([TrajectoriesSection(p) for p in both_ps]))
+
+    if p.wmo.status == p.wmo.NO_WMO or p.wmo.status == p.wmo.JUDGED:
+
+        for p_study, study in zip_equalize_lists(p_p.study_set.all(), p.study_set.all()):
+
+            both_studies = (p_study, study)
+
+            sections.append(DiffSection([StudySectionDiff(s) for s in both_studies]))
+
+            if p_study is not None and p_study.has_intervention or \
+                study is not None and study.has_intervention:
+
+
+                interventions = tuple((study.intervention if study is not None \
+                                       else study for study in both_studies))
+                
+                sections.append(DiffSection([InterventionSection(i) for i in interventions]))
+
+            if p_study is not None and p_study.has_observation or \
+                study is not None and study.has_observation:
+
+                observations = tuple((study.observation if study is not None \
+                                       else study for study in both_studies))
+                
+                sections.append(DiffSection([ObservationSection(o) for o in observations]))
+
+            if p_study is not None and p_study.has_sessions or \
+                study is not None and study.has_sessions:
+
+                sections.append(DiffSection([SessionsOverviewSection(s) for s in both_studies]))
+
+                p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
+                                       else study for study in both_studies))
+                
+                for both_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
+
+                    sections.append(DiffSection([SessionSection(s) for s in both_sessions]))
+
+                    p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
+                                       else session for session in both_sessions))
+                    
+                    for both_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+
+                        sections.append(DiffSection([TaskSectionDiff(t) for t in both_tasks]))
+
+                sections.append(DiffSection([TasksOverviewSection(s) for s in both_sessions]))
+
+            sections.append(DiffSection([StudyOverviewSection(s) for s in both_studies]))
+
+            both_documents = tuple(study.documents if study is not None \
+                              else study for study in both_studies)
+            
+            sections.append(DiffSection([InformedConsentFormsSection(d) for d in both_documents]))
+
+        p_extra_docs = get_extra_documents(p_p)
+        extra_docs = get_extra_documents(p)
+
+        if p_extra_docs or extra_docs:
+            for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
+                sections.append(DiffSection([ExtraDocumentsSection(extra_doc, count) for extra_doc in zipped_extra_docs]))
+
+        if p_p.dmp_file or p.dmp_file:
+            sections.append(DiffSection([DMPFileSection(p) for p in both_ps]))
+            
+        sections.append(DiffSection([EmbargoSection(p) for p in both_ps]))
+
+    context['sections'] = sections
+
+    return context
 

From 35a74e61854e87ad77a60862a767e1b687ec027f Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 2 Oct 2023 17:43:03 +0200
Subject: [PATCH 034/148] Almost working. few little things left

---
 proposals/utils/pdf_diff_logic.py | 281 ++++++++++++++----------------
 1 file changed, 131 insertions(+), 150 deletions(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index f8ed5b192..3ae709363 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -36,7 +36,7 @@ def __init__(self, object, study_title_type = None):
 
     def make_rows(self):   
 
-        rows = [RowClass(self.object, field) for field in self.processed_row_fields]
+        rows = [RowClass(self.object, field) for field in self.get_row_fields()]
         rows = {row.verbose_name: row.value for row in rows}
 
         return rows
@@ -68,7 +68,6 @@ class DiffSection:
 
     def __init__(self, objects):
         self.objects = objects
-        self.rows = self.make_diff_rows()
         if None in self.objects:
             if self.objects[0] is None:
                 self.warning = _(
@@ -86,6 +85,7 @@ def __init__(self, objects):
             self.warning = None
             self.missing_object = None
             self.study_title = self.objects[0].study_title
+        self.rows = self.make_diff_rows()
 
     def make_diff_rows(self):
             
@@ -97,7 +97,7 @@ def make_diff_rows(self):
             initial_rows_dicts = [object.make_rows() for object in self.objects]
 
             #creating a list containing all fields in all objects
-            all_fields = initial_rows_dicts[0].keys()
+            all_fields = list(initial_rows_dicts[0].keys())
             for rows_dict in initial_rows_dicts[1:]:
                 all_fields.extend(field for field in rows_dict.keys() if field not in all_fields)
 
@@ -345,7 +345,7 @@ def get_task_title(self, task):
                                         order
                                         )
             return task_title
-class GeneralSection(PDFDiffSection):
+class GeneralSection(BaseSection):
     '''This class generates the data for the general section of a proposal and showcases
     the general workflow for creating sections. All possible row fields are provided, and
     removed according to the logic in the get_row_fields method.
@@ -372,8 +372,9 @@ class GeneralSection(PDFDiffSection):
         'summary'
     ]
     
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not obj.relation.needs_supervisor:
             rows.remove('supervisor')
@@ -397,7 +398,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class PageBreakMixin(PDFDiffSection):
+class PageBreakMixin(BaseSection):
 
     def render(self, context):
         context.update(
@@ -408,7 +409,7 @@ def render(self, context):
         return super().render(context)
 
     
-class WMOSection(PageBreakMixin, PDFDiffSection):
+class WMOSection(PageBreakMixin, BaseSection):
     '''This class receives a proposal.wmo object.'''
     section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
     row_fields = [
@@ -418,8 +419,9 @@ class WMOSection(PageBreakMixin, PDFDiffSection):
         'get_is_medical_display',  
     ]
     
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not obj.metc == 'Y':
             rows.remove('metc_details')
@@ -429,7 +431,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class METCSection(PageBreakMixin, PDFDiffSection):
+class METCSection(PageBreakMixin, BaseSection):
     '''This class receives a proposal.wmo object.
     This class exists because the RowValueClass does some
     funky things for working with the metc_decision_pdf field'''
@@ -441,7 +443,7 @@ class METCSection(PageBreakMixin, PDFDiffSection):
         'metc_decision_pdf'
     ]
     
-class TrajectoriesSection(PageBreakMixin, PDFDiffSection):
+class TrajectoriesSection(PageBreakMixin, BaseSection):
     '''This class receives a proposal object.'''
 
     section_title = _("Eén of meerdere trajecten?")
@@ -451,15 +453,16 @@ class TrajectoriesSection(PageBreakMixin, PDFDiffSection):
         'studies_number'
     ]
     
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if obj.studies_similar:
             rows.remove('studies_number')
 
         return rows
 
-class StudySection(study_title):
+class StudySection(BaseSection):
     '''This class receives a proposal.study object.'''
     section_title = _('De deelnemers')
     row_fields = [
@@ -480,8 +483,9 @@ class StudySection(study_title):
         'hierarchy_details',
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not has_adults(obj):
             rows.remove('legally_incapable')
@@ -508,14 +512,11 @@ def get_row_fields(self, obj):
             rows.remove('hierarchy_details')
 
         return rows
-    
-    
-class StudySectionDiff(study_title_diff, StudySection):
-    '''An example of a DiffSectionMissingObjects. Unfortunately I found myself having to repeat the overriding
-    of the render function from the studySection, due to the mro.'''
-    pass
 
-class BaseInterventionSection(sub_study_title):
+#NOTE: When implementing the v1 and v2 versions I found that I preferred the old method
+#for dealing with the different versions. 
+'''
+class BaseInterventionSection:
 
     section_title = _('Het interventieonderzoek')
     row_fields = [
@@ -532,9 +533,10 @@ class BaseInterventionSection(sub_study_title):
         'controls_description'
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
-        
+        obj = self.object
+
         if not needs_details(obj.setting.all()):
             rows.remove('setting_details')
         if not obj.study.has_children() or \
@@ -548,9 +550,6 @@ def get_row_fields(self, obj):
 
         return rows
 
-class BaseInterventionSectionDiff(sub_study_title_diff, BaseInterventionSection):
-    pass
-
 class InterventionSectionV1(BaseInterventionSection):
 
     def __init__(self, object):
@@ -559,10 +558,17 @@ def __init__(self, object):
         self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
         self.row_fields.append('extra_task')
     
-class InterventionSectionV1Diff(BaseInterventionSectionDiff, InterventionSectionV1):
-    pass
+class InterventionSectionV2(BaseInterventionSection):
 
-class InterventionSection(sub_study_title):
+    def __init__(self, object):
+        super().__init__(object)
+        self.row_fields = super().get_row_fields(object)
+        self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
+        self.row_fields.append('extra_task')
+'''
+
+
+class InterventionSection(BaseSection):
     '''This class receives an intervention object'''
     section_title = _('Het interventieonderzoek')
     row_fields = [
@@ -583,8 +589,9 @@ class InterventionSection(sub_study_title):
         'extra_task'
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if obj.version == 1:
             fields_to_remove = ['multiple_sessions',
@@ -611,11 +618,8 @@ def get_row_fields(self, obj):
             rows.remove('controls_description')   
 
         return rows
-    
-class InterventionSectionDiff(sub_study_title_diff, InterventionSection):
-    pass
-    
-class ObservationSection(sub_study_title):
+
+class ObservationSection(BaseSection):
     '''This class receives an observation object
     It inherits from the InterventionSection, as it can repurpose the same overridden
     render method.'''
@@ -645,8 +649,9 @@ class ObservationSection(sub_study_title):
         'registrations_details'        
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if obj.version == 1:
             to_remove_if_v1 = ['details_who',
@@ -698,21 +703,8 @@ def get_row_fields(self, obj):
             rows.remove('registrations_details')
 
         return rows
-    
-class ObservationSectionDiff(sub_study_title_diff, ObservationSection):
-    '''Note that the diff sections follow a similar pattern of inheritance as 
-    the regular sections, due to repurposing overriden methods, when applicable, 
-    eg.:
-
-    class InterventionSection(PDFDiffSection)
-    class InterventionSectionDiff(DiffSectionMissingObjects, InterventionSection)
 
-    class ObservationSection(InterventionSection)
-    class ObservationSectionDiff(InterventionSectionDiff, ObservationSection)
-    '''
-    pass
-
-class SessionsOverviewSection(study_title):
+class SessionsOverviewSection(BaseSection):
     '''This class receives an study object
     This Section looks maybe a bit unnecessary, but it does remove some logic, plus
     the study_title.html from the template.'''
@@ -721,12 +713,7 @@ class SessionsOverviewSection(study_title):
 
     row_fields = ['sessions_number']
 
-
-class SessionsOverviewSectionDiff(study_title_diff, SessionsOverviewSection):
-    '''Needed to override get_row_fields, due to mro issue'''
-    pass
-
-class SessionSection(session_title):
+class SessionSection(BaseSection):
     '''This class receives a session object'''
     
     row_fields = [
@@ -737,8 +724,9 @@ class SessionSection(session_title):
         'tasks_number',       
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not needs_details(obj.setting.all()):
             rows.remove('setting_details')
@@ -750,11 +738,8 @@ def get_row_fields(self, obj):
             rows.remove('leader_has_coc')
 
         return rows
-
-class SessionSectionDiff(session_title_diff, SessionSection):
-    pass
     
-class TaskSection(task_title):
+class TaskSection(BaseSection):
     '''This class receives an task object'''
     
     row_fields = [
@@ -769,8 +754,9 @@ class TaskSection(task_title):
         'description'
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not needs_details(obj.registrations.all()):
             rows.remove('registrations_details')
@@ -785,10 +771,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class TaskSectionDiff(task_title_diff, TaskSection):
-    pass
-    
-class TasksOverviewSection(task_overview_title):
+class TasksOverviewSection(BaseSection):
     '''Gets passed a session object
     This might be unecessary ... Maybe just use the existing template language ...
     Because the verbose name of this field is formatted, the method for retrieving
@@ -798,10 +781,7 @@ class TasksOverviewSection(task_overview_title):
         'tasks_duration'
     ]
     
-class TasksOverviewSectionDiff(task_overview_title_diff, TasksOverviewSection):
-    pass
-    
-class StudyOverviewSection(study_title):
+class StudyOverviewSection(BaseSection):
     '''This class receives a Study object.'''
 
     section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
@@ -816,8 +796,9 @@ class StudyOverviewSection(study_title):
         'risk_details'
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         rows_to_remove = []
         for x in range(0, 7, 2):
@@ -832,11 +813,8 @@ def get_row_fields(self, obj):
             rows.remove('deception')
 
         return rows
-
-class StudyOverviewSectionDiff(study_title_diff, StudyOverviewSection):
-    pass
     
-class InformedConsentFormsSection(sub_study_title):
+class InformedConsentFormsSection(BaseSection):
     '''This class receives a Documents object'''
 
     section_title = _('Informed consent formulieren')
@@ -861,7 +839,7 @@ def make_rows(self):
         proposal_list = ['translated_forms', 'translated_forms_languages']
         study_list = ['passive_consent', 'passive_consent_details']
 
-        row_fields = self.get_row_fields(self.object)
+        row_fields = self.get_row_fields()
 
         rows = []
 
@@ -877,8 +855,9 @@ def make_rows(self):
     
         return rows
     
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not obj.proposal.translated_forms:
             rows.remove('translated_forms_languages')
@@ -898,10 +877,7 @@ def get_row_fields(self, obj):
 
         return rows
     
-class InformedConsentSectionDiff(sub_study_title_diff, InformedConsentFormsSection):
-    pass
-    
-class ExtraDocumentsSection(PDFDiffSection):
+class ExtraDocumentsSection(BaseSection):
     '''This class receives an Documents object.
     Overrides the __init__ to create a formatted section title'''
 
@@ -914,23 +890,18 @@ def __init__(self, object, count):
         super().__init__(object)
         self.section_title = _('Extra formulieren ') + str(count + 1)
     
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not obj.informed_consent:
             rows.remove('informed_consent')
         if not obj.briefing:
             rows.remove('briefing')
 
-        return rows
-    
-class ExtraDocumentsSectionDiff(DiffSectionMissingObjects, ExtraDocumentsSection):
-
-    def __init__(self, objects_tuple, count):
-        super().__init__(objects_tuple)
-        self.section_title = _('Extra formulieren ') + str(count+1)     
+        return rows   
     
-class DMPFileSection(PDFDiffSection):
+class DMPFileSection(BaseSection):
     '''This class receives a proposal object
     Also unnecessary I suppose. But I though why not ...'''
 
@@ -938,7 +909,7 @@ class DMPFileSection(PDFDiffSection):
     
     row_fields = ['dmp_file']
 
-class EmbargoSection(PDFDiffSection):
+class EmbargoSection(BaseSection):
     '''Gets passed a proposal object'''
 
     section_title = _('Aanmelding versturen')
@@ -948,8 +919,9 @@ class EmbargoSection(PDFDiffSection):
         'embargo_end_date'
     ]
 
-    def get_row_fields(self, obj):
+    def get_row_fields(self):
         rows = copy(self.row_fields)
+        obj = self.object
 
         if not obj.embargo:
             rows.remove('embargo_end_date')
@@ -986,19 +958,19 @@ def create_context_pdf(context, model):
     if model.wmo.status == model.wmo.NO_WMO:
 
         for study in model.study_set.all():
-            sections.append(StudySection(study))
+            sections.append(StudySection(study, 'study'))
             if study.has_intervention:
-                sections.append(InterventionSection(study.intervention))
+                sections.append(InterventionSection(study.intervention, 'study'))
             if study.has_observation:
-                sections.append(ObservationSection(study.observation))
+                sections.append(ObservationSection(study.observation, 'study'))
             if study.has_sessions:
                 sections.append(SessionsOverviewSection(study))
                 for session in study.session_set.all():
-                    sections.append(SessionSection(session))
+                    sections.append(SessionSection(session, 'session'))
                     for task in session.task_set.all():
-                        sections.append(TaskSection(task))
-                sections.append(TasksOverviewSection(session))
-            sections.append(StudyOverviewSection(study))
+                        sections.append(TaskSection(task, 'task'))
+                sections.append(TasksOverviewSection(session, 'task_overview'))
+            sections.append(StudyOverviewSection(study, 'study'))
             sections.append(InformedConsentFormsSection(study.documents))
 
         extra_documents = get_extra_documents(model)
@@ -1015,91 +987,97 @@ def create_context_pdf(context, model):
     
     return context
 
-def create_context_diff(context, p_proposal, proposal):
-    '''A function to create the context for the diff page.'''
+# def create_context_diff(context, p_proposal, proposal):
+#     '''A function to create the context for the diff page.'''
 
-    both_proposals = (p_proposal, proposal)
+#     both_proposals = (p_proposal, proposal)
 
-    sections = []
+#     sections = []
 
-    sections.append(GeneralSection(both_proposals))
-    sections.append(WMOSection((p_proposal.wmo, proposal.wmo)))
+#     sections.append(GeneralSection(both_proposals))
+#     sections.append(WMOSection((p_proposal.wmo, proposal.wmo)))
 
-    if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
-        sections.append(METCSection((p_proposal.wmo, proposal.wmo)))
+#     if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
+#         sections.append(METCSection((p_proposal.wmo, proposal.wmo)))
     
-    sections.append(TrajectoriesSection(both_proposals))
+#     sections.append(TrajectoriesSection(both_proposals))
 
-    if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
+#     if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
 
-        for p_study, study in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
+#         for p_study, study in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
 
-            diff_studies = (p_study, study)
+#             diff_studies = (p_study, study)
 
-            sections.append(StudySectionDiff((diff_studies)))
+#             sections.append(StudySectionDiff((diff_studies)))
 
-            if p_study is not None and p_study.has_intervention or \
-                study is not None and study.has_intervention:
+#             if p_study is not None and p_study.has_intervention or \
+#                 study is not None and study.has_intervention:
 
 
-                interventions = tuple((study.intervention if study is not None \
-                                       else study for study in diff_studies))
+#                 interventions = tuple((study.intervention if study is not None \
+#                                        else study for study in diff_studies))
                 
-                sections.append(InterventionSectionDiff(interventions))
+#                 sections.append(InterventionSectionDiff(interventions))
 
-            if p_study is not None and p_study.has_observation or \
-                study is not None and study.has_observation:
+#             if p_study is not None and p_study.has_observation or \
+#                 study is not None and study.has_observation:
 
-                observations = tuple((study.observation if study is not None \
-                                       else study for study in diff_studies))
+#                 observations = tuple((study.observation if study is not None \
+#                                        else study for study in diff_studies))
                 
-                sections.append(ObservationSectionDiff(observations))
+#                 sections.append(ObservationSectionDiff(observations))
 
-            if p_study is not None and p_study.has_sessions or \
-                study is not None and study.has_sessions:
+#             if p_study is not None and p_study.has_sessions or \
+#                 study is not None and study.has_sessions:
 
-                sections.append(SessionsOverviewSectionDiff(diff_studies))
+#                 sections.append(SessionsOverviewSectionDiff(diff_studies))
 
-                p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
-                                       else study for study in diff_studies))
+#                 p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
+#                                        else study for study in diff_studies))
                 
-                for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
+#                 for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
 
-                    sections.append(SessionSectionDiff(diff_sessions))
+#                     sections.append(SessionSectionDiff(diff_sessions))
 
-                    p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
-                                       else session for session in diff_sessions))
+#                     p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
+#                                        else session for session in diff_sessions))
                     
-                    for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+#                     for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
 
-                        sections.append(TaskSectionDiff(diff_tasks))
+#                         sections.append(TaskSectionDiff(diff_tasks))
 
-                sections.append(TasksOverviewSectionDiff(diff_sessions))
+#                 sections.append(TasksOverviewSectionDiff(diff_sessions))
 
-            sections.append(StudyOverviewSectionDiff(diff_studies))
+#             sections.append(StudyOverviewSectionDiff(diff_studies))
 
-            documents = tuple(study.documents if study is not None \
-                              else study for study in diff_studies)
+#             documents = tuple(study.documents if study is not None \
+#                               else study for study in diff_studies)
             
-            sections.append(InformedConsentSectionDiff(documents))
+#             sections.append(InformedConsentSectionDiff(documents))
 
-        p_extra_docs = get_extra_documents(p_proposal)
-        extra_docs = get_extra_documents(proposal)
+#         p_extra_docs = get_extra_documents(p_proposal)
+#         extra_docs = get_extra_documents(proposal)
 
-        if p_extra_docs or extra_docs:
-            for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
-                sections.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
+#         if p_extra_docs or extra_docs:
+#             for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
+#                 sections.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
 
-        if p_proposal.dmp_file or proposal.dmp_file:
-            sections.append(DMPFileSection(both_proposals))
+#         if p_proposal.dmp_file or proposal.dmp_file:
+#             sections.append(DMPFileSection(both_proposals))
             
-        sections.append(EmbargoSection(both_proposals))
+#         sections.append(EmbargoSection(both_proposals))
 
-    context['sections'] = sections
+#     context['sections'] = sections
 
-    return context
+#     return context
 
-def create_context_diff_alt(context, p_p, p):
+def two_sections(section_type, list_of_objects, study_title_type = None):
+    if study_title_type is None:
+        return [section_type(obj) if obj is not None else obj for obj in list_of_objects]
+    else:
+        return [section_type(obj, study_title_type) if obj is not None else obj for obj in list_of_objects]
+
+def create_context_diff(context, p_p, p):
     '''A function to create the context for the diff page.'''
     '''I am using 'p' as a shorthand for proposal and 'p_p' for parent proposal
     to cut down on the verbosity here ...'''
@@ -1122,7 +1100,7 @@ def create_context_diff_alt(context, p_p, p):
 
             both_studies = (p_study, study)
 
-            sections.append(DiffSection([StudySectionDiff(s) for s in both_studies]))
+            sections.append(DiffSection([StudySection(s) for s in both_studies]))
 
             if p_study is not None and p_study.has_intervention or \
                 study is not None and study.has_intervention:
@@ -1157,8 +1135,9 @@ def create_context_diff_alt(context, p_p, p):
                                        else session for session in both_sessions))
                     
                     for both_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+                        breakpoint()
 
-                        sections.append(DiffSection([TaskSectionDiff(t) for t in both_tasks]))
+                        sections.append(DiffSection([TaskSection(t) for t in both_tasks]))
 
                 sections.append(DiffSection([TasksOverviewSection(s) for s in both_sessions]))
 
@@ -1185,3 +1164,5 @@ def create_context_diff_alt(context, p_p, p):
 
     return context
 
+
+

From 357f89bf41737aae3e0fb80deb23b7e59907914c Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 3 Oct 2023 16:33:43 +0200
Subject: [PATCH 035/148] Finished up new implementation.

---
 .../proposals/table_with_header.html          |   4 +-
 .../proposals/table_with_header_diff.html     |  16 +-
 proposals/utils/pdf_diff_logic.py             | 171 ++++++------------
 3 files changed, 63 insertions(+), 128 deletions(-)

diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index 841002225..8d9d7cca0 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -9,9 +9,9 @@ <h2> {% trans section_title %} </h2>
     <h3> {{ study_title }} </h3>
 {% endif %}
 <table>
-{% for verbose_name, value in rows.items %}
+{% for row in rows %}
 <tr>
-<th>{{ verbose_name }}</th><td>{{ value }}</td>
+<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
 </tr>
 {% endfor %}
 </table>
\ No newline at end of file
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 900beac4c..ae0e59385 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -14,8 +14,9 @@ <h3 class='mt-3'> {{ study_title }} </h3>
         <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
     </tr>
 {% if warning %}
+    {% for row in rows|slice:":1"%}
     <tr class="diff-ignore">
-        <th>{{ rows_keys_list.0 }}</th>
+        <th>{{ row.verbose_name }}</th>
         {# If the first object is missing, place a warning on the first TD #}
         {% if missing_object == 0 %}
             <td rowspan='{{rows|length}}'>
@@ -23,10 +24,10 @@ <h3 class='mt-3'> {{ study_title }} </h3>
                     {{ warning }}
                 </div>
             </td>
-            <td>{{rows.rows_keys_list.0 }}</td>
+            <td>{{ row.value }}</td>
         {# Otherwise, we're missing the second one, thus we place the warning on the second #}
         {% elif missing_object == 1 %}
-            <td>{{rows.rows_keys_list.0 }}</td>
+            <td>{{ row.value }}</td>
             <td rowspan='{{rows|length}}'>
                 <div class='warning'>
                     {{ warning }}
@@ -34,15 +35,16 @@ <h3 class='mt-3'> {{ study_title }} </h3>
             </td>
         {% endif %}
     </tr>
-    {%for row_key in rows_keys_list|slice:"1:"%}
+    {% endfor %}
+    {%for row in rows|slice:"1:"%}
     <tr class="diff-ignore">
-        <th>{{row_key}}</th><td>{{rows.row_key}}</td>
+        <th>{{row.verbose_name}}</th><td>{{row.value}}</td>
     </tr>
     {% endfor %}
 {% else %}
-    {% for verbose_name, values in rows.items %}
+    {% for row in rows %}
         <tr>
-            <th>{{ verbose_name }}</th><td>{{ values.0 }}</td><td>{{ values.1 }}</td>
+            <th>{{ row.0 }}</th><td>{{ row.1 }}</td><td>{{ row.2 }}</td>
         </tr>
     {% endfor %}
 {% endif %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 3ae709363..9833089e0 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -37,7 +37,6 @@ def __init__(self, object, study_title_type = None):
     def make_rows(self):   
 
         rows = [RowClass(self.object, field) for field in self.get_row_fields()]
-        rows = {row.verbose_name: row.value for row in rows}
 
         return rows
     
@@ -88,32 +87,35 @@ def __init__(self, objects):
         self.rows = self.make_diff_rows()
 
     def make_diff_rows(self):
+        '''This function generates a nested list, where each sublist contains:
+        [verbose_name, value_1, value_2]'''
             
-        if self.missing_object == 0:
-            diff_dict = self.objects[1].make_rows()
-        if self.missing_object == 1:
-            diff_dict = self.object[0].make_rows()
+        if self.warning is not None:            
+            if self.missing_object == 0:
+                diff_dict = self.objects[1].make_rows()
+            else:
+                diff_dict = self.objects[0].make_rows()
+            return diff_dict
         else:
-            initial_rows_dicts = [object.make_rows() for object in self.objects]
+            initial_rows_dicts = [{row.verbose_name(): row.value() for row in object.make_rows()}  
+                                  for object in self.objects]
+
 
             #creating a list containing all fields in all objects
             all_fields = list(initial_rows_dicts[0].keys())
             for rows_dict in initial_rows_dicts[1:]:
                 all_fields.extend(field for field in rows_dict.keys() if field not in all_fields)
 
-            diff_dict = {}
-
-            for field in all_fields:
-                diff_dict[field] = []
+            diff_list = [[field] for field in all_fields]
 
             for rows_dict in initial_rows_dicts:
-                for field in all_fields:
-                    if field in rows_dict:
-                        diff_dict[field].append(rows_dict[field])
+                for field in diff_list:
+                    if field[0] in rows_dict:
+                        field.append(rows_dict[field[0]])
                     else:
-                        diff_dict[field].append('')
+                        field.append('')
 
-        return diff_dict
+        return diff_list
 
     def render(self, context):
         context = context.flatten()
@@ -135,8 +137,7 @@ def render(self, context):
         context.update(
             {
                 "section_title": self.objects[0].section_title,
-                "rows": self.rows,
-                "rows_keys_list": list(self.rows)
+                "rows": self.rows
             }
         )
         return template.render(context)
@@ -261,9 +262,9 @@ def __init__(self, object, study_title_type):
         elif study_title_type == 'task':
             self.study_title = self.get_task_title(object)
         elif study_title_type == 'task_overview':
-            self.study_title == _('Overzicht van het takenonderzoek')
+            self.study_title = _('Overzicht van het takenonderzoek')
         else:
-            self.study_title == None
+            self.study_title = None
         
     def get_study_title(self, study):
 
@@ -850,8 +851,6 @@ def make_rows(self):
                 rows.append(RowClass(self.object.study, field))
             else:
                 rows.append(RowClass(self.object, field))
-
-        rows = {row.verbose_name: row.value for row in rows}
     
         return rows
     
@@ -987,91 +986,7 @@ def create_context_pdf(context, model):
     
     return context
 
-# def create_context_diff(context, p_proposal, proposal):
-#     '''A function to create the context for the diff page.'''
-
-#     both_proposals = (p_proposal, proposal)
-
-#     sections = []
-
-#     sections.append(GeneralSection(both_proposals))
-#     sections.append(WMOSection((p_proposal.wmo, proposal.wmo)))
-
-#     if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
-#         sections.append(METCSection((p_proposal.wmo, proposal.wmo)))
-    
-#     sections.append(TrajectoriesSection(both_proposals))
-
-#     if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
-
-#         for p_study, study in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
-
-#             diff_studies = (p_study, study)
-
-#             sections.append(StudySectionDiff((diff_studies)))
-
-#             if p_study is not None and p_study.has_intervention or \
-#                 study is not None and study.has_intervention:
-
-
-#                 interventions = tuple((study.intervention if study is not None \
-#                                        else study for study in diff_studies))
-                
-#                 sections.append(InterventionSectionDiff(interventions))
-
-#             if p_study is not None and p_study.has_observation or \
-#                 study is not None and study.has_observation:
-
-#                 observations = tuple((study.observation if study is not None \
-#                                        else study for study in diff_studies))
-                
-#                 sections.append(ObservationSectionDiff(observations))
-
-#             if p_study is not None and p_study.has_sessions or \
-#                 study is not None and study.has_sessions:
-
-#                 sections.append(SessionsOverviewSectionDiff(diff_studies))
-
-#                 p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
-#                                        else study for study in diff_studies))
-                
-#                 for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
-
-#                     sections.append(SessionSectionDiff(diff_sessions))
-
-#                     p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
-#                                        else session for session in diff_sessions))
-                    
-#                     for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
-
-#                         sections.append(TaskSectionDiff(diff_tasks))
-
-#                 sections.append(TasksOverviewSectionDiff(diff_sessions))
-
-#             sections.append(StudyOverviewSectionDiff(diff_studies))
-
-#             documents = tuple(study.documents if study is not None \
-#                               else study for study in diff_studies)
-            
-#             sections.append(InformedConsentSectionDiff(documents))
-
-#         p_extra_docs = get_extra_documents(p_proposal)
-#         extra_docs = get_extra_documents(proposal)
-
-#         if p_extra_docs or extra_docs:
-#             for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
-#                 sections.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
-
-#         if p_proposal.dmp_file or proposal.dmp_file:
-#             sections.append(DMPFileSection(both_proposals))
-            
-#         sections.append(EmbargoSection(both_proposals))
-
-#     context['sections'] = sections
-
-#     return context
-
-def two_sections(section_type, list_of_objects, study_title_type = None):
+def multi_sections_missing_objects(section_type, list_of_objects, study_title_type = None):
     if study_title_type is None:
         return [section_type(obj) if obj is not None else obj for obj in list_of_objects]
     else:
@@ -1100,16 +1015,20 @@ def create_context_diff(context, p_p, p):
 
             both_studies = (p_study, study)
 
-            sections.append(DiffSection([StudySection(s) for s in both_studies]))
+            sections.append(DiffSection(multi_sections_missing_objects(StudySection, 
+                                                                       both_studies,
+                                                                       'study'
+                                                                       )))
 
             if p_study is not None and p_study.has_intervention or \
                 study is not None and study.has_intervention:
 
-
                 interventions = tuple((study.intervention if study is not None \
                                        else study for study in both_studies))
                 
-                sections.append(DiffSection([InterventionSection(i) for i in interventions]))
+                sections.append(DiffSection(multi_sections_missing_objects(InterventionSection,
+                                                                           interventions,
+                                                                           'study')))
 
             if p_study is not None and p_study.has_observation or \
                 study is not None and study.has_observation:
@@ -1117,46 +1036,60 @@ def create_context_diff(context, p_p, p):
                 observations = tuple((study.observation if study is not None \
                                        else study for study in both_studies))
                 
-                sections.append(DiffSection([ObservationSection(o) for o in observations]))
+                sections.append(DiffSection(multi_sections_missing_objects(ObservationSection,
+                                                                           observations,
+                                                                           'study')))
 
             if p_study is not None and p_study.has_sessions or \
                 study is not None and study.has_sessions:
 
-                sections.append(DiffSection([SessionsOverviewSection(s) for s in both_studies]))
+                sections.append(DiffSection(multi_sections_missing_objects(SessionsOverviewSection,
+                                                                           both_studies)))
 
                 p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
                                        else study for study in both_studies))
                 
                 for both_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
 
-                    sections.append(DiffSection([SessionSection(s) for s in both_sessions]))
+                    sections.append(DiffSection(multi_sections_missing_objects(SessionSection,
+                                                                               both_sessions,
+                                                                               'session')))
 
                     p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
                                        else session for session in both_sessions))
                     
                     for both_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
-                        breakpoint()
 
-                        sections.append(DiffSection([TaskSection(t) for t in both_tasks]))
+                        sections.append(DiffSection(multi_sections_missing_objects(TaskSection,
+                                                                                   both_tasks,
+                                                                                   'task')))
 
-                sections.append(DiffSection([TasksOverviewSection(s) for s in both_sessions]))
+                sections.append(DiffSection(multi_sections_missing_objects(TasksOverviewSection,
+                                                                           both_sessions,
+                                                                           'task_overview')))
 
-            sections.append(DiffSection([StudyOverviewSection(s) for s in both_studies]))
+            sections.append(DiffSection(multi_sections_missing_objects(StudyOverviewSection,
+                                                                       both_studies,
+                                                                       'study')))
 
             both_documents = tuple(study.documents if study is not None \
                               else study for study in both_studies)
             
-            sections.append(DiffSection([InformedConsentFormsSection(d) for d in both_documents]))
+            sections.append(DiffSection(multi_sections_missing_objects(InformedConsentFormsSection,
+                                                                       both_documents)))
 
         p_extra_docs = get_extra_documents(p_p)
         extra_docs = get_extra_documents(p)
 
         if p_extra_docs or extra_docs:
             for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
-                sections.append(DiffSection([ExtraDocumentsSection(extra_doc, count) for extra_doc in zipped_extra_docs]))
+                sections.append(DiffSection(multi_sections_missing_objects(ExtraDocumentsSection,
+                                                                           zipped_extra_docs,
+                                                                           count)))
 
         if p_p.dmp_file or p.dmp_file:
-            sections.append(DiffSection([DMPFileSection(p) for p in both_ps]))
+            sections.append(DiffSection(multi_sections_missing_objects(DMPFileSection,
+                                                                       both_ps)))
             
         sections.append(DiffSection([EmbargoSection(p) for p in both_ps]))
 

From bbd402b2b3cad5659468cd6fcc37d1799d7f773b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 3 Oct 2023 16:41:29 +0200
Subject: [PATCH 036/148] tiny bug

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

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 9833089e0..c5aab9b01 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -74,16 +74,20 @@ def __init__(self, objects):
                 )
                 self.missing_object = 0
                 self.study_title = self.objects[1].study_title
+                self.section_title = self.objects[1].section_title
             else:
                 self.warning = _(
                 "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
             )
                 self.missing_object = 1
                 self.study_title = self.objects[0].study_title
+                self.section_title = self.objects[0].section_title
+
         else:
             self.warning = None
             self.missing_object = None
             self.study_title = self.objects[0].study_title
+            self.section_title = self.objects[0].section_title
         self.rows = self.make_diff_rows()
 
     def make_diff_rows(self):
@@ -134,9 +138,10 @@ def render(self, context):
                     "study_title": self.study_title,
                 }
             )
+
         context.update(
             {
-                "section_title": self.objects[0].section_title,
+                "section_title": self.section_title,
                 "rows": self.rows
             }
         )

From 440ba8e67dd89b183e79c108e7e2b09359faad18 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 4 Oct 2023 16:52:26 +0200
Subject: [PATCH 037/148] Documentation, loose ends and Michaels hotfix

---
 .../templates/proposals/proposal_diff.html    |  14 -
 .../templates/proposals/proposal_pdf.html     |   5 -
 .../proposals/table_and_text_with_header.html |  20 +
 .../proposals/table_with_header.html          |   4 +-
 .../proposals/table_with_header_diff.html     |   4 +-
 proposals/utils/pdf_diff_logic.py             | 346 ++++++++++--------
 6 files changed, 211 insertions(+), 182 deletions(-)
 create mode 100644 proposals/templates/proposals/table_and_text_with_header.html

diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index 142b19344..d417ce240 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -53,20 +53,6 @@ <h2>{% trans "Overzicht van wijzigingen" %}</h2>
                 {% for section in sections %}
                     {% include section %}
                 {% endfor %}
-                    
-                <h2 class="mt-5 mb-1">{% trans "Ruimte voor eventuele opmerkingen" %}</h2>
-                <table class="proposals-diff ">
-                    <tr>
-                        <th class="proposals-diff-question"></th>
-                        <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
-                        <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
-                    </tr>
-                    <tr>
-                        <th>{% get_verbose_field_name "proposals" "proposal" "comments" %}</th>
-                        <td>{{ p_proposal.comments }}</td>
-                        <td>{{ proposal.comments }}</td>
-                    </tr>
-                </table>
 
             <p class="mt-5 float-right">
                 <button class="button" onclick="window.history.back();">
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 1204673db..b332fb089 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -84,11 +84,6 @@ <h2>{% trans 'Indiener' %}</h2>
           {% include section %}
         {% endfor %}
 
-        <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
-        <p>
-          {{ proposal.comments }}
-        </p>
-
     </div>
   </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/table_and_text_with_header.html b/proposals/templates/proposals/table_and_text_with_header.html
new file mode 100644
index 000000000..3495da262
--- /dev/null
+++ b/proposals/templates/proposals/table_and_text_with_header.html
@@ -0,0 +1,20 @@
+{% load i18n %}
+
+{% if page_break %}
+    <h2 style="page-break-before: always"> {% trans section_title %} </h2>
+{% elif section_title %}
+    <h2> {% trans section_title %} </h2>
+{% endif %}
+{% if sub_title %}
+    <h3> {{ sub_title }} </h3>
+{% endif %}
+<table>
+{% for row in rows %}
+<tr>
+<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
+</tr>
+{% endfor %}
+</table>
+{% for row in paragraph_rows %}
+<h3>{{ row.verbose_name }}</h3><p>{{ row.value }}</p>
+{% endfor%}
\ No newline at end of file
diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index 8d9d7cca0..0c8c0949c 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -5,8 +5,8 @@ <h2 style="page-break-before: always"> {% trans section_title %} </h2>
 {% elif section_title %}
     <h2> {% trans section_title %} </h2>
 {% endif %}
-{% if study_title %}
-    <h3> {{ study_title }} </h3>
+{% if sub_title %}
+    <h3> {{ sub_title }} </h3>
 {% endif %}
 <table>
 {% for row in rows %}
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index ae0e59385..611bf8e78 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -4,8 +4,8 @@
 {% if section_title %}
     <h2 class="mt-5 mb-1"> {% trans section_title %} </h2>
 {% endif %}
-{% if study_title %}
-    <h3 class='mt-3'> {{ study_title }} </h3>
+{% if sub_title %}
+    <h3 class='mt-3'> {{ sub_title }} </h3>
 {% endif %}
 <table class="proposals-diff ">
     <tr>
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index c5aab9b01..0cadca621 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -13,26 +13,28 @@
 necessity_required, has_adults
 from proposals.templatetags.diff_tags import zip_equalize_lists
 
-'''NOTE: As of now, the diff has no workaround for when observations or interventions are of a
-different version, in the different proposals.'''
-
 class BaseSection:
-    '''This is the main class, from which most classes are constructed.
-    It can take one object or two objects in a tuple, and produce html tables accordingly.
+    '''This is the main class, from which sections are constructed.
+    It receives one object, such as a proposal or sub-objects of proposals.
     The most important methods are render and make_rows. Make rows makes use of get_row_field,
-    which is mostly overwritten for specific sections.
-    If this class is used in the diff, object should be the parent object and object_2 the 
-    revision/amendment.'''
+    which gets overwritten for specific sections, if logic is involved.
+    For certain sections, there can be a sub-title, such as for studies or other cases.
+    These are produced in the get_sub_title method and require a specific string, based on
+    the type of sub-title required. The options are:
+    - 'study'
+    - 'session'
+    - 'task'
+    -'task_overview'
+
+    These arguments are passed in overwritten __init__() methods, when applicable.
+    '''
     
     section_title = None
     row_fields = None
 
-    def __init__(self, object, study_title_type = None):
+    def __init__(self, object):
         self.object = object
-        if study_title_type is None:
-            self.study_title = None
-        else:
-            self.study_title = self.get_study_title(self.object, study_title_type)
+        self.sub_title = None
 
     def make_rows(self):   
 
@@ -45,11 +47,11 @@ def get_row_fields(self):
 
     def render(self, context):
         context = context.flatten()
-        template = get_template("proposals/table_with_header.html")
-        if self.study_title is not None:
+        template = get_template('proposals/table_with_header.html')
+        if self.sub_title is not None:
             context.update(
                 {
-                    "study_title": self.study_title
+                    "sub_title": self.sub_title
                 }
             )
         context.update(
@@ -60,10 +62,19 @@ def render(self, context):
         )
         return template.render(context)
     
-    def get_study_title(self, object, study_title_type):
-        return StudyTitleClass(object, study_title_type).study_title
+    def get_sub_title(self, object, sub_title_type):
+        return StudyTitleClass(object, sub_title_type).sub_title
 
 class DiffSection:
+    '''For the diff page, sections are constructed by comparing two section objects.
+    The DiffSection thus received an iterable containing two versions of a specific section,
+    for instance [GeneralSection(proposal), GeneralSection(p_proposal)]
+    It mostly uses the make_rows methods, but also some other class variables from these objects.
+    If a section is missing from a revision or an original proposal, this will be reperesented by
+    None, and a warning and some formatting info get passed to the template as well.
+    
+    Some parts of this were written with the idea of allowing more than two objects to be compared,
+    however, I did not end up pursuing this idea until the end.'''
 
     def __init__(self, objects):
         self.objects = objects
@@ -73,53 +84,56 @@ def __init__(self, objects):
                 "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
                 )
                 self.missing_object = 0
-                self.study_title = self.objects[1].study_title
+                self.sub_title = self.objects[1].sub_title
                 self.section_title = self.objects[1].section_title
             else:
                 self.warning = _(
                 "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
             )
                 self.missing_object = 1
-                self.study_title = self.objects[0].study_title
+                self.sub_title = self.objects[0].sub_title
                 self.section_title = self.objects[0].section_title
 
         else:
             self.warning = None
             self.missing_object = None
-            self.study_title = self.objects[0].study_title
+            self.sub_title = self.objects[0].sub_title
             self.section_title = self.objects[0].section_title
         self.rows = self.make_diff_rows()
 
     def make_diff_rows(self):
         '''This function generates a nested list, where each sublist contains:
-        [verbose_name, value_1, value_2]'''
+        [verbose_name, value_1, value_2] if both objects are present.'''
             
-        if self.warning is not None:            
+        if self.warning is not None:
+            '''If there is a missing object, the template can just use the make_rows function
+            of the object that is not missing.'''         
             if self.missing_object == 0:
-                diff_dict = self.objects[1].make_rows()
+                rows = self.objects[1].make_rows()
             else:
-                diff_dict = self.objects[0].make_rows()
-            return diff_dict
+                rows = self.objects[0].make_rows()
+            return rows
         else:
+            '''This is a bit clunky and could probably be improved. I designed it to be able to
+            process more than two objects, however, the rest of this class is not designed as such'''
             initial_rows_dicts = [{row.verbose_name(): row.value() for row in object.make_rows()}  
                                   for object in self.objects]
 
-
             #creating a list containing all fields in all objects
             all_fields = list(initial_rows_dicts[0].keys())
             for rows_dict in initial_rows_dicts[1:]:
                 all_fields.extend(field for field in rows_dict.keys() if field not in all_fields)
 
-            diff_list = [[field] for field in all_fields]
+            rows = [[field] for field in all_fields]
 
             for rows_dict in initial_rows_dicts:
-                for field in diff_list:
+                for field in rows:
                     if field[0] in rows_dict:
                         field.append(rows_dict[field[0]])
                     else:
                         field.append('')
 
-        return diff_list
+        return rows
 
     def render(self, context):
         context = context.flatten()
@@ -132,10 +146,10 @@ def render(self, context):
                     "missing_object": self.missing_object
                 }
             )
-        if self.study_title is not None:
+        if self.sub_title is not None:
             context.update(
                 {
-                    "study_title": self.study_title,
+                    "sub_title": self.sub_title,
                 }
             )
 
@@ -148,9 +162,10 @@ def render(self, context):
         return template.render(context)
     
 class RowClass:
-    '''This class creates rows for either one or two objects, and gets initated
+    '''This class creates rows for one objects, and gets initated
     in the make_rows method of Section classes. The classmethods of Rowclass
-    are called in the templates of the render method of the PDF class.'''
+    are called in the templates of the render method of the PDF class, as well as in 
+    the make_diff_rows() method of the DiffSectionClass'''
 
     verbose_name_diff_field_dict = {
         'get_metc_display': 'metc',
@@ -180,7 +195,7 @@ def get_verbose_name(self, field):
 
 class RowValueClass:
     '''The RowValueClass manages the values of fields and correctly retrieves and/or formats
-    the right values per field. This class get initiated in the value and value_2 methods
+    the right values per field. This class get initiated in the value method
     of the RowClass. It returns mostly strings, but sometimes some html as well.'''
 
     def __init__(self, object, field):
@@ -258,18 +273,21 @@ def yes_no_doubt(self, value):
         return d[value]
     
 class StudyTitleClass:
-
-    def __init__(self, object, study_title_type):
-        if study_title_type == 'study':
-            self.study_title = self.get_study_title(object)
-        elif study_title_type == 'session':
-            self.study_title = self.get_session_title(object)
-        elif study_title_type == 'task':
-            self.study_title = self.get_task_title(object)
-        elif study_title_type == 'task_overview':
-            self.study_title = _('Overzicht van het takenonderzoek')
+    '''This class can return a study title to the base section class,
+    according to the argument with which it is initiated. This argument gets passed
+    in overwritten __init__ methods of for instance, the StudySection class.'''
+
+    def __init__(self, object, sub_title_type):
+        if sub_title_type == 'study':
+            self.sub_title = self.get_study_title(object)
+        elif sub_title_type == 'session':
+            self.sub_title = self.get_session_title(object)
+        elif sub_title_type == 'task':
+            self.sub_title = self.get_task_title(object)
+        elif sub_title_type == 'task_overview':
+            self.sub_title = _('Overzicht van het takenonderzoek')
         else:
-            self.study_title = None
+            self.sub_title = None
         
     def get_study_title(self, study):
 
@@ -355,7 +373,12 @@ class GeneralSection(BaseSection):
     '''This class generates the data for the general section of a proposal and showcases
     the general workflow for creating sections. All possible row fields are provided, and
     removed according to the logic in the get_row_fields method.
-    This class receives a proposal object.'''
+    This class receives a proposal object.
+    
+    This is one of two SectionClasses (the other being the CommentsSection) which overrides
+    the render method of the BaseSection class to allow for formatting certain values outside of 
+    a <table> element and in a <p> element. The implementation of this is slightly clunkily 
+    hardcoded as of now ... See the slicing in the render method.'''
 
     section_title = _("Algemene informatie over de aanvraag")
     row_fields = [
@@ -404,7 +427,22 @@ def get_row_fields(self):
 
         return rows
     
+    def render(self, context):
+        '''Note the special template for dealing with these cases.'''
+
+        context = context.flatten()
+        template = get_template('proposals/table_and_text_with_header.html')
+        rows = self.make_rows()
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": rows[:-2],
+                "paragraph_rows": rows[-2:],
+            }
+        )
+        return template.render(context)    
 class PageBreakMixin(BaseSection):
+    '''A Mixin for adding page break formatting to a section.'''
 
     def render(self, context):
         context.update(
@@ -413,10 +451,10 @@ def render(self, context):
             }
         )
         return super().render(context)
-
     
 class WMOSection(PageBreakMixin, BaseSection):
     '''This class receives a proposal.wmo object.'''
+
     section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
     row_fields = [
         'get_metc_display',
@@ -438,9 +476,8 @@ def get_row_fields(self):
         return rows
     
 class METCSection(PageBreakMixin, BaseSection):
-    '''This class receives a proposal.wmo object.
-    This class exists because the RowValueClass does some
-    funky things for working with the metc_decision_pdf field'''
+    '''This class receives a proposal.wmo object.'''
+
     section_title = _("Aanmelding bij de METC")
     
     row_fields = [
@@ -469,7 +506,9 @@ def get_row_fields(self):
         return rows
 
 class StudySection(BaseSection):
-    '''This class receives a proposal.study object.'''
+    '''This class receives a proposal.study object
+    Note the overwritten __init__ method for adding a sub_title.'''
+
     section_title = _('De deelnemers')
     row_fields = [
         'age_groups',
@@ -489,6 +528,10 @@ class StudySection(BaseSection):
         'hierarchy_details',
     ]
 
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'study')
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.object
@@ -519,63 +562,9 @@ def get_row_fields(self):
 
         return rows
 
-#NOTE: When implementing the v1 and v2 versions I found that I preferred the old method
-#for dealing with the different versions. 
-'''
-class BaseInterventionSection:
-
-    section_title = _('Het interventieonderzoek')
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'period',
-        'duration',
-        'measurement',
-        'experimenter',
-        'description',
-        'has_controls',
-        'controls_description'
-    ]
-
-    def get_row_fields(self):
-        rows = copy(self.row_fields)
-        obj = self.object
-
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        if not obj.has_controls:
-            rows.remove('controls_description')   
-
-        return rows
-
-class InterventionSectionV1(BaseInterventionSection):
-
-    def __init__(self, object):
-        super().__init__(object)
-        self.row_fields = super().get_row_fields(object)
-        self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
-        self.row_fields.append('extra_task')
-    
-class InterventionSectionV2(BaseInterventionSection):
-
-    def __init__(self, object):
-        super().__init__(object)
-        self.row_fields = super().get_row_fields(object)
-        self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
-        self.row_fields.append('extra_task')
-'''
-
-
 class InterventionSection(BaseSection):
     '''This class receives an intervention object'''
+
     section_title = _('Het interventieonderzoek')
     row_fields = [
         'setting',
@@ -595,6 +584,10 @@ class InterventionSection(BaseSection):
         'extra_task'
     ]
 
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'study')
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.object
@@ -626,9 +619,8 @@ def get_row_fields(self):
         return rows
 
 class ObservationSection(BaseSection):
-    '''This class receives an observation object
-    It inherits from the InterventionSection, as it can repurpose the same overridden
-    render method.'''
+    '''This class receives an observation object'''
+
     section_title = _('Het observatieonderzoek')
     row_fields = [
         'setting',
@@ -655,6 +647,10 @@ class ObservationSection(BaseSection):
         'registrations_details'        
     ]
 
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'study')
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.object
@@ -711,9 +707,7 @@ def get_row_fields(self):
         return rows
 
 class SessionsOverviewSection(BaseSection):
-    '''This class receives an study object
-    This Section looks maybe a bit unnecessary, but it does remove some logic, plus
-    the study_title.html from the template.'''
+    '''This class receives an study object'''
 
     section_title = _("Het takenonderzoek en interviews")
 
@@ -730,6 +724,10 @@ class SessionSection(BaseSection):
         'tasks_number',       
     ]
 
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'session')
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.object
@@ -746,7 +744,7 @@ def get_row_fields(self):
         return rows
     
 class TaskSection(BaseSection):
-    '''This class receives an task object'''
+    '''This class receives a task object'''
     
     row_fields = [
         'name',
@@ -760,6 +758,10 @@ class TaskSection(BaseSection):
         'description'
     ]
 
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'task')
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.object
@@ -778,14 +780,15 @@ def get_row_fields(self):
         return rows
     
 class TasksOverviewSection(BaseSection):
-    '''Gets passed a session object
-    This might be unecessary ... Maybe just use the existing template language ...
-    Because the verbose name of this field is formatted, the method for retrieving
-    the verbose name in the RowClass is quite convoluded.'''
+    '''Gets passed a session object'''
 
     row_fields = [
         'tasks_duration'
     ]
+
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'task_overview')
     
 class StudyOverviewSection(BaseSection):
     '''This class receives a Study object.'''
@@ -802,6 +805,10 @@ class StudyOverviewSection(BaseSection):
         'risk_details'
     ]
 
+    def __init__(self, object):
+        super().__init__(object)
+        self.sub_title = self.get_sub_title(self.object, 'study')
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.object
@@ -931,7 +938,29 @@ def get_row_fields(self):
             rows.remove('embargo_end_date')
 
         return rows
-    
+
+class CommentsSection(BaseSection):
+    '''Gets passed a proposal object.'''
+
+    section_title = _('Ruimte voor eventuele opmerkingen')
+
+    row_fields = [
+        'comments'
+    ]
+
+    def render(self, context):
+        context = context.flatten()
+        template = get_template('proposals/table_and_text_with_header.html')
+        rows = self.make_rows()
+        context.update(
+            {
+                "section_title": self.section_title,
+                "rows": [],
+                "paragraph_rows": rows,
+            }
+        )
+        return template.render(context)    
+
 def get_extra_documents(object):
     '''A function to retrieve all extra documents for a specific proposal.'''
     from studies.models import Documents
@@ -947,7 +976,7 @@ def get_extra_documents(object):
     return extra_documents
     
 def create_context_pdf(context, model):
-    '''A function to create the context for the PDF.'''
+    '''A function to create the context for the PDF, which gets called in the ProposalAsPdf view.'''
 
     sections = []
 
@@ -962,19 +991,19 @@ def create_context_pdf(context, model):
     if model.wmo.status == model.wmo.NO_WMO:
 
         for study in model.study_set.all():
-            sections.append(StudySection(study, 'study'))
+            sections.append(StudySection(study))
             if study.has_intervention:
-                sections.append(InterventionSection(study.intervention, 'study'))
+                sections.append(InterventionSection(study.intervention))
             if study.has_observation:
-                sections.append(ObservationSection(study.observation, 'study'))
+                sections.append(ObservationSection(study.observation))
             if study.has_sessions:
                 sections.append(SessionsOverviewSection(study))
                 for session in study.session_set.all():
-                    sections.append(SessionSection(session, 'session'))
+                    sections.append(SessionSection(session))
                     for task in session.task_set.all():
-                        sections.append(TaskSection(task, 'task'))
-                sections.append(TasksOverviewSection(session, 'task_overview'))
-            sections.append(StudyOverviewSection(study, 'study'))
+                        sections.append(TaskSection(task))
+                sections.append(TasksOverviewSection(session))
+            sections.append(StudyOverviewSection(study))
             sections.append(InformedConsentFormsSection(study.documents))
 
         extra_documents = get_extra_documents(model)
@@ -986,23 +1015,29 @@ def create_context_pdf(context, model):
             sections.append(DMPFileSection(model))
             
         sections.append(EmbargoSection(model))
+        sections.append(CommentsSection(model))
 
     context['sections'] = sections
     
     return context
 
-def multi_sections_missing_objects(section_type, list_of_objects, study_title_type = None):
-    if study_title_type is None:
+def multi_sections_missing_objects(section_type, list_of_objects, count = None):
+    '''A function that creates a list of sections of a specified type, from a list of
+    objects, where it is possible for an object, such as a study, to be missing.
+    Gets called in the create context diff.'''
+    if count is None:
         return [section_type(obj) if obj is not None else obj for obj in list_of_objects]
     else:
-        return [section_type(obj, study_title_type) if obj is not None else obj for obj in list_of_objects]
+        return [section_type(obj, count) if obj is not None else obj for obj in list_of_objects]
 
 def create_context_diff(context, p_p, p):
-    '''A function to create the context for the diff page.'''
-    '''I am using 'p' as a shorthand for proposal and 'p_p' for parent proposal
+    '''A function to create the context for the diff page which gets 
+    called in the ProposalDifference view.
+    It gets a little crazy with the list comprehensions, but it works, i guess ...
+    I am using 'p' as a shorthand for proposal and 'p_p' for parent proposal
     to cut down on the verbosity here ...'''
 
-    both_ps = (p_p, p)
+    both_ps = [p_p, p]
 
     sections = []
 
@@ -1018,32 +1053,28 @@ def create_context_diff(context, p_p, p):
 
         for p_study, study in zip_equalize_lists(p_p.study_set.all(), p.study_set.all()):
 
-            both_studies = (p_study, study)
+            both_studies = [p_study, study]
 
             sections.append(DiffSection(multi_sections_missing_objects(StudySection, 
-                                                                       both_studies,
-                                                                       'study'
-                                                                       )))
+                                                                       both_studies)))
 
             if p_study is not None and p_study.has_intervention or \
                 study is not None and study.has_intervention:
 
-                interventions = tuple((study.intervention if study is not None \
-                                       else study for study in both_studies))
+                interventions = [study.intervention if study is not None
+                                 else study for study in both_studies]
                 
                 sections.append(DiffSection(multi_sections_missing_objects(InterventionSection,
-                                                                           interventions,
-                                                                           'study')))
+                                                                           interventions)))
 
             if p_study is not None and p_study.has_observation or \
                 study is not None and study.has_observation:
 
-                observations = tuple((study.observation if study is not None \
-                                       else study for study in both_studies))
+                observations = [study.observation if study is not None
+                                 else study for study in both_studies]
                 
                 sections.append(DiffSection(multi_sections_missing_objects(ObservationSection,
-                                                                           observations,
-                                                                           'study')))
+                                                                           observations)))
 
             if p_study is not None and p_study.has_sessions or \
                 study is not None and study.has_sessions:
@@ -1051,34 +1082,30 @@ def create_context_diff(context, p_p, p):
                 sections.append(DiffSection(multi_sections_missing_objects(SessionsOverviewSection,
                                                                            both_studies)))
 
-                p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
-                                       else study for study in both_studies))
+                p_sessions_set, sessions_set = [study.session_set.all() if study is not None
+                                                else study for study in both_studies]
                 
                 for both_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
 
                     sections.append(DiffSection(multi_sections_missing_objects(SessionSection,
-                                                                               both_sessions,
-                                                                               'session')))
+                                                                               both_sessions)))
 
-                    p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
-                                       else session for session in both_sessions))
+                    p_tasks_set, tasks_set = [session.task_set.all() if session is not None
+                                              else session for session in both_sessions]
                     
                     for both_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
 
                         sections.append(DiffSection(multi_sections_missing_objects(TaskSection,
-                                                                                   both_tasks,
-                                                                                   'task')))
+                                                                                   both_tasks)))
 
                 sections.append(DiffSection(multi_sections_missing_objects(TasksOverviewSection,
-                                                                           both_sessions,
-                                                                           'task_overview')))
+                                                                           both_sessions)))
 
             sections.append(DiffSection(multi_sections_missing_objects(StudyOverviewSection,
-                                                                       both_studies,
-                                                                       'study')))
+                                                                       both_studies)))
 
-            both_documents = tuple(study.documents if study is not None \
-                              else study for study in both_studies)
+            both_documents = [study.documents if study is not None 
+                              else study for study in both_studies]
             
             sections.append(DiffSection(multi_sections_missing_objects(InformedConsentFormsSection,
                                                                        both_documents)))
@@ -1097,6 +1124,7 @@ def create_context_diff(context, p_p, p):
                                                                        both_ps)))
             
         sections.append(DiffSection([EmbargoSection(p) for p in both_ps]))
+        sections.append(DiffSection([CommentsSection(p) for p in both_ps]))
 
     context['sections'] = sections
 

From 9c42b830776c4b6b149f7f3e8bb375707c1a5163 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 10 Oct 2023 10:29:41 +0200
Subject: [PATCH 038/148] Incorporating changes requested by Ty

---
 .../templates/proposals/proposal_diff.html    |    4 -
 .../proposals/table_and_text_with_header.html |    3 +-
 .../proposals/table_with_header_diff.html     |    6 +-
 proposals/templatetags/proposal_filters.py    |    2 +
 proposals/utils/pdf_diff_logic copy.py        | 1165 --------------
 proposals/utils/pdf_diff_logic.py             | 1377 +++++++++--------
 6 files changed, 765 insertions(+), 1792 deletions(-)
 delete mode 100644 proposals/utils/pdf_diff_logic copy.py

diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index d417ce240..2102a23e8 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -14,10 +14,6 @@
 {% block html_head %}
     <script src="{% static 'main/js/htmldiff.js' %}"></script>
     <script>
-        // The new implementation causes some issues with the js, 
-        // - The loading icon does not go away sometimes.
-        // - The colors appear for the first instance of a missing section warning,
-        //   which is kindoff ugly.
         $(function () {
             // Color changes between proposals
             $('tr:not(.diff-ignore) td:nth-child(2)').each(function () {
diff --git a/proposals/templates/proposals/table_and_text_with_header.html b/proposals/templates/proposals/table_and_text_with_header.html
index 3495da262..4f7a01050 100644
--- a/proposals/templates/proposals/table_and_text_with_header.html
+++ b/proposals/templates/proposals/table_and_text_with_header.html
@@ -2,7 +2,8 @@
 
 {% if page_break %}
     <h2 style="page-break-before: always"> {% trans section_title %} </h2>
-{% elif section_title %}
+{% endif %}
+{% if section_title %}
     <h2> {% trans section_title %} </h2>
 {% endif %}
 {% if sub_title %}
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 611bf8e78..0ff304716 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -18,7 +18,7 @@ <h3 class='mt-3'> {{ sub_title }} </h3>
     <tr class="diff-ignore">
         <th>{{ row.verbose_name }}</th>
         {# If the first object is missing, place a warning on the first TD #}
-        {% if missing_object == 0 %}
+        {% if missing_object == 'old' %}
             <td rowspan='{{rows|length}}'>
                 <div class='warning'>
                     {{ warning }}
@@ -26,7 +26,7 @@ <h3 class='mt-3'> {{ sub_title }} </h3>
             </td>
             <td>{{ row.value }}</td>
         {# Otherwise, we're missing the second one, thus we place the warning on the second #}
-        {% elif missing_object == 1 %}
+        {% elif missing_object == 'new' %}
             <td>{{ row.value }}</td>
             <td rowspan='{{rows|length}}'>
                 <div class='warning'>
@@ -44,7 +44,7 @@ <h3 class='mt-3'> {{ sub_title }} </h3>
 {% else %}
     {% for row in rows %}
         <tr>
-            <th>{{ row.0 }}</th><td>{{ row.1 }}</td><td>{{ row.2 }}</td>
+            <th>{{ row.verbose_name }}</th><td>{{ row.value.0 }}</td><td>{{ row.value.1 }}</td>
         </tr>
     {% endfor %}
 {% endif %}
diff --git a/proposals/templatetags/proposal_filters.py b/proposals/templatetags/proposal_filters.py
index c243b42a4..2ee7688a7 100644
--- a/proposals/templatetags/proposal_filters.py
+++ b/proposals/templatetags/proposal_filters.py
@@ -14,6 +14,7 @@ def needs_details(selected_values, field='needs_details'):
             return True
     return False
 
+
 @register.filter
 def medical_traits(selected_values, field='medical_traits'):
     for sv in selected_values:
@@ -33,6 +34,7 @@ def necessity_required(study):
     age_groups = study.age_groups.values_list('id', flat=True)
     return check_necessity_required(study.proposal, age_groups, study.legally_incapable)
 
+
 @register.simple_tag
 def show_yesno(doubt=False):
     result = '<ul>'
diff --git a/proposals/utils/pdf_diff_logic copy.py b/proposals/utils/pdf_diff_logic copy.py
deleted file mode 100644
index f3db97943..000000000
--- a/proposals/utils/pdf_diff_logic copy.py	
+++ /dev/null
@@ -1,1165 +0,0 @@
-
-from datetime import date
-from copy import copy
-
-from django.conf import settings
-from django.contrib.auth import get_user_model
-from django.template.loader import get_template
-from django.utils.html import format_html
-from django.utils.safestring import mark_safe
-from django.utils.translation import ugettext as _
-
-from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
-necessity_required, has_adults
-from proposals.templatetags.diff_tags import zip_equalize_lists
-
-'''NOTE: As of now, the diff has no workaround for when observations or interventions are of a
-different version, in the different proposals.'''
-
-class BaseSection:
-
-    section_title = None
-    row_fields = None
-
-    def make_rows(self):
-        if self.object and self.object_2:
-            row_fields_1 = self.get_row_fields(self.object)
-            row_fields_2 = self.get_row_fields(self.object_2)
-
-            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
-
-            #The merging above messes with the order, so I reorder it here
-            row_fields = [row for row in self.row_fields if row in row_fields_both]
-
-            rows = [RowClass(self.object, field, self.object_2) for field in row_fields]
-        else:
-            if self.object is None:
-                obj = self.object_2
-            else:
-                obj = self.object          
-
-            row_fields = self.get_row_fields(obj)
-
-            rows = [RowClass(obj, field) for field in row_fields]
-        return rows
-    
-    def get_row_fields(self, obj):
-        return self.row_fields
-
-class PDFDiffSection(BaseSection):
-    '''This is the main class, from which most classes are constructed.
-    It can take one object or two objects in a tuple, and produce html tables accordingly.
-    The most important methods are render and make_rows. Make rows makes use of get_row_field,
-    which is mostly overwritten for specific sections.
-    If this class is used in the diff, object should be the parent object and object_2 the 
-    revision/amendment.'''
-    
-    def __init__(self, object):
-        if isinstance(object, tuple):
-            self.object = object[0]
-            self.object_2 = object[1]
-        else:
-            self.object = object
-            self.object_2 = None
-
-    def render(self, context):
-        context = context.flatten()
-        if self.object_2:
-            template = get_template("proposals/table_with_header_diff.html")
-        else:
-            template = get_template("proposals/table_with_header.html")
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": self.make_rows(),
-            }
-        )
-        return template.render(context)
-
-class DiffSectionMissingObjects(BaseSection):
-    '''The DiffSectionMissingObjects class overrides the __init__ and render methods of the PDFDiffSection.
-    This exists for instances of tables in the diff, where it is possible
-    for objects to be entirely missing from one version or the other, such as studies.
-    If neccesary, it provides an object is missing warning and some info for formatting the
-    diff table. (self.missing_object)
-    The resulting diff section class inherit from this class, plus their own section class.
-
-    eg. class StudySectionDiff(DiffSectionMissingObjects, StudySection)'''
-
-    def __init__(self, objects_tuple):
-        if objects_tuple[0] is None:
-            self.warning = _(
-                "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
-                )
-            self.missing_object = 0
-        elif objects_tuple[1] is None:
-            self.warning = _(
-                "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
-            )
-            self.missing_object = 1
-        else:
-            self.warning = None
-            self.missing_object = None
-        self.object = objects_tuple[0]
-        self.object_2 = objects_tuple[1]
-    
-    def render(self, context):
-        context = context.flatten()
-        template = get_template("proposals/table_with_header_diff.html")
-
-        if self.warning is not None:
-            context.update(
-                {
-                    "warning": self.warning,
-                    "missing_object": self.missing_object
-                }
-            )
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": self.make_rows(),
-            }
-        )
-        return template.render(context)
-class RowClass:
-    '''This class creates rows for either one or two objects, and gets initated
-    in the make_rows method of Section classes. The classmethods of Rowclass
-    are called in the templates of the render method of the PDF class.'''
-
-    verbose_name_diff_field_dict = {
-        'get_metc_display': 'metc',
-        'get_is_medical_display': 'is_medical'
-    }
-
-    def __init__(self, object, field, object_2 = None):
-        self.object = object
-        self.object_2 = object_2
-        self.field = field
-    
-    def verbose_name(self):
-        if self.field in self.verbose_name_diff_field_dict:
-            verbose_name_field = self.verbose_name_diff_field_dict[self.field]
-            verbose_name = self.get_verbose_name(verbose_name_field)
-        else:
-            verbose_name= self.get_verbose_name(self.field)
-        return verbose_name   
-    
-    def value(self):
-        return RowValueClass(self.object, self.field).get_field_value()
-    
-    def value_2(self):
-        return RowValueClass(self.object_2, self.field).get_field_value()
-    
-    def get_verbose_name(self, field):
-        if field != 'tasks_duration':
-            return mark_safe(self.object._meta.get_field(field).verbose_name)
-        else:
-            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
-
-class RowValueClass:
-    '''The RowValueClass manages the values of fields and correctly retrieves and/or formats
-    the right values per field. This class get initiated in the value and value_2 methods
-    of the RowClass. It returns mostly strings, but sometimes some html as well.'''
-
-    def __init__(self, object, field):
-
-        self.object = object
-        self.field = field
-
-    def get_field_value(self):
-        from ..models import Relation
-        from studies.models import Compensation
-        
-        value = getattr(self.object, self.field)
-
-        User = get_user_model()
-
-        if value in ('Y', 'N', '?'):
-            return self.yes_no_doubt(value)
-        elif isinstance(value, bool):
-            return _('ja') if value else _('nee')
-        elif isinstance(value, (str, int, date)):
-            return value
-        elif value is None:
-            return _('Onbekend')
-        elif isinstance(value, User):
-            return self.handle_user(value)
-        elif isinstance(value, Relation) or isinstance(value, Compensation):
-            return value.description
-        elif value.__class__.__name__ == 'ManyRelatedManager':
-            if value.all().model == User:
-                return self.get_applicants_names(value)
-            else:
-                return self.get_object_list(value)
-        elif value.__class__.__name__ == 'FieldFile':
-            return self.handle_field_file(value)
-        elif callable(value):
-            return value()
-        
-    def handle_user(self, user):
-        return user.get_full_name()
-    
-    def get_applicants_names(self, applicants):
-        applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
-        return self.create_unordered_html_list(applicant_names)
-    
-    def get_object_list(self, object):
-        list_of_objects = [obj for obj in object.all()]
-        return self.create_unordered_html_list(list_of_objects)
-    
-    def create_unordered_html_list(self, list):
-        html_output = mark_safe('<ul class="p-0">')
-
-        for item in list:
-            html_output += format_html('<li>{}</li>',
-                item
-            )
-        
-        html_output += mark_safe('</ul>')
-
-        return html_output
-    
-    def handle_field_file(self, field_file):
-        if field_file:
-            output = format_html('<a href={}>{}</a>',
-                f'{settings.BASE_URL}{field_file.url}',
-                _('Download')
-            )
-        else:
-            output = _('Niet aangeleverd')
-
-        return output
-    
-    def yes_no_doubt(self, value):
-        from main.models import YES_NO_DOUBT
-        d = dict(YES_NO_DOUBT)
-        return d[value]
-    
-class StudyTitleMixin:
-
-    def get_study_title(self, study):
-        if study.name:
-            study_title = format_html('{}{} <em>{} </em>',
-                                      _('Traject '),
-                                      study.order,
-                                      study.name
-            )
-        else:
-            study_title = format_html('{}{}',
-                                      _('Traject'),
-                                      {study.order}
-            )
-        return study_title
-    
-    def get_session_title(self, session):
-        if session is None:
-            return ''
-        else:
-            order = session.order 
-            study_order = session.study.order 
-            study_name = session.study.name 
-            studies_number = session.study.proposal.studies_number 
-            sessions_number = session.study.sessions_number
-
-            if studies_number > 1 and sessions_number > 1:
-                session_title = format_html('{}{} <em>{} </em> {}{}',
-                                        _('Traject '),
-                                        study_order,
-                                        study_name,
-                                        _('sessie '),
-                                        order
-                )
-            elif studies_number > 1:
-                session_title = format_html('{}{} <em>{} </em>',
-                                        _('Traject '),
-                                        study_order,
-                                        study_name,
-                )
-            elif sessions_number >= 1:
-                session_title = format_html('{}{}',
-                                            _('Sessie '),
-                                            order
-                )
-            return session_title
-    
-    def get_task_title(self, task):
-        if task is None:
-            return ''
-        else:
-            order=task.order 
-            session_order=task.session.order 
-            study_order=task.session.study.order 
-            study_name=task.session.study.name 
-            studies_number=task.session.study.proposal.studies_number
-            if studies_number > 1:
-                task_title = format_html('{}{} <em>{} </em>, {}{}{}{}',
-                                        _('Traject '),
-                                        study_order,
-                                        study_name,
-                                        _('sessie '),
-                                        session_order,
-                                        _(', taak '),
-                                        order
-                )
-            else:
-                task_title = format_html('{}{}{}{}',
-                                        _('Sessie '),
-                                        session_order,
-                                        _(', taak '),
-                                        order
-                                        )
-            return task_title
-        
-def get_render_mixin(base, section):
-
-    if section == 'study_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-            def render(self, context):
-                '''Overriding the render function to pass study_title to the context.'''
-                if self.object.proposal.studies_number > 1:
-                    context.update(
-                        {
-                            'study_title': super().get_study_title(self.object)
-                        }
-                    )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'sub_study_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                '''Overriding the render function to pass study_title to the context.'''
-                if self.object.study.proposal.studies_number > 1:
-                    context.update(
-                        {
-                            'study_title': super().get_study_title(self.object.study)
-                        }
-                    )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'session_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                context.update(
-                    {
-                        'study_title': super().get_session_title(self.object)
-                    }
-                )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'task_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                context.update(
-                    {
-                        'study_title': super().get_task_title(self.object)
-                    }
-                )
-                return super().render(context)
-            
-        return RenderStudyTitle
-    
-    elif section == 'task_overview_title':
-        class RenderStudyTitle(base, StudyTitleMixin):
-
-            def render(self, context):
-                context.update(
-                    {
-                        'study_title': _('Overzicht van het takenonderzoek')
-                    }
-                )
-                return super().render(context)
-                    
-        return RenderStudyTitle
-    
-
-study_title = get_render_mixin(PDFDiffSection, 'study_title')
-study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'study_title')
-sub_study_title = get_render_mixin(PDFDiffSection, 'sub_study_title')
-sub_study_title_diff = get_render_mixin(DiffSectionMissingObjects, 'sub_study_title')
-session_title = get_render_mixin(PDFDiffSection, 'session_title')
-session_title_diff = get_render_mixin(DiffSectionMissingObjects, 'session_title')
-task_title = get_render_mixin(PDFDiffSection, 'task_title')
-task_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_title')
-task_overview_title = get_render_mixin(PDFDiffSection, 'task_overview_title')
-task_overview_title_diff = get_render_mixin(DiffSectionMissingObjects, 'task_overview_title')
-
-class GeneralSection(PDFDiffSection):
-    '''This class generates the data for the general section of a proposal and showcases
-    the general workflow for creating sections. All possible row fields are provided, and
-    removed according to the logic in the get_row_fields method.
-    This class receives a proposal object.'''
-
-    section_title = _("Algemene informatie over de aanvraag")
-    row_fields = [
-        'relation',
-        'supervisor',
-        'student_program',
-        'student_context',
-        'student_context_details',
-        'student_justification',
-        'other_applicants',
-        'applicants',
-        'other_stakeholders',
-        'stakeholders',
-        'date_start',
-        'title',
-        'funding',
-        'funding_details',
-        'funding_name',
-        'self_assessment',
-        'summary'
-    ]
-    
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not obj.relation.needs_supervisor:
-            rows.remove('supervisor')
-        if not obj.relation.check_in_course:
-            rows.remove('student_program')
-            rows.remove('student_context')
-            if obj.student_context is not None:
-                if not obj.student_context.needs_details:
-                    rows.remove('student_context_details')
-            else:
-                rows.remove('student_context_details')
-            rows.remove('student_justification')
-        if not obj.other_applicants:
-            rows.remove('applicants')
-        if not obj.other_stakeholders:
-            rows.remove('stakeholders')
-        if not needs_details(obj.funding.all()):
-            rows.remove('funding_details')
-        if not needs_details(obj.funding.all(), 'needs_name'):
-            rows.remove('funding_name')
-
-        return rows
-    
-class PageBreakMixin(PDFDiffSection):
-
-    def render(self, context):
-        context.update(
-            {
-                'page_break': True
-            }
-        )
-        return super().render(context)
-
-    
-class WMOSection(PageBreakMixin, PDFDiffSection):
-    '''This class receives a proposal.wmo object.'''
-    section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
-    row_fields = [
-        'get_metc_display',
-        'metc_details',
-        'metc_institution',
-        'get_is_medical_display',  
-    ]
-    
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not obj.metc == 'Y':
-            rows.remove('metc_details')
-            rows.remove('metc_institution')
-        else:
-            rows.remove('get_is_medical_display')
-
-        return rows
-    
-class METCSection(PageBreakMixin, PDFDiffSection):
-    '''This class receives a proposal.wmo object.
-    This class exists because the RowValueClass does some
-    funky things for working with the metc_decision_pdf field'''
-    section_title = _("Aanmelding bij de METC")
-    
-    row_fields = [
-        'metc_application',
-        'metc_decision',
-        'metc_decision_pdf'
-    ]
-    
-class TrajectoriesSection(PageBreakMixin, PDFDiffSection):
-    '''This class receives a proposal object.'''
-
-    section_title = _("Eén of meerdere trajecten?")
-
-    row_fields = [
-        'studies_similar',
-        'studies_number'
-    ]
-    
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if obj.studies_similar:
-            rows.remove('studies_number')
-
-        return rows
-
-class StudySection(study_title):
-    '''This class receives a proposal.study object.'''
-    section_title = _('De deelnemers')
-    row_fields = [
-        'age_groups',
-        'legally_incapable',
-        'legally_incapable_details',
-        'has_special_details',
-        'special_details',
-        'traits',
-        'traits_details',
-        'necessity',
-        'necessity_reason',
-        'recruitment',
-        'recruitment_details',
-        'compensation',
-        'compensation_details',
-        'hierarchy',
-        'hierarchy_details',
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not has_adults(obj):
-            rows.remove('legally_incapable')
-            rows.remove('legally_incapable_details')
-        elif not obj.legally_incapable:
-            rows.remove('legally_incapable_details')
-        if not obj.has_special_details:
-            rows.remove('special_details')
-            rows.remove('traits')
-            rows.remove('traits_details')
-        elif not medical_traits(obj.special_details.all()):
-            rows.remove('traits')
-            rows.remove('traits_details')
-        elif not needs_details(obj.traits.all()):
-            rows.remove('traits_details')
-        if not necessity_required(obj):
-            rows.remove('necessity')
-            rows.remove('necessity_reason')
-        if not needs_details(obj.recruitment.all()):
-            rows.remove('recruitment_details')
-        if not obj.compensation.needs_details:
-            rows.remove('compensation_details')
-        if not obj.hierarchy:
-            rows.remove('hierarchy_details')
-
-        return rows
-    
-    
-class StudySectionDiff(study_title_diff, StudySection):
-    '''An example of a DiffSectionMissingObjects. Unfortunately I found myself having to repeat the overriding
-    of the render function from the studySection, due to the mro.'''
-    pass
-
-class BaseInterventionSection(sub_study_title):
-
-    section_title = _('Het interventieonderzoek')
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'period',
-        'duration',
-        'measurement',
-        'experimenter',
-        'description',
-        'has_controls',
-        'controls_description'
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-        
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        if not obj.has_controls:
-            rows.remove('controls_description')   
-
-        return rows
-
-class BaseInterventionSectionDiff(sub_study_title_diff, BaseInterventionSection):
-    pass
-
-class InterventionSectionV1(BaseInterventionSection):
-
-    def __init__(self, object):
-        super().__init__(object)
-        self.row_fields = super().get_row_fields(object)
-        self.row_fields[5:5] = ['multiple_sessions', 'session_frequency']
-        self.row_fields.append('extra_task')
-    
-class InterventionSectionV1Diff(BaseInterventionSectionDiff, InterventionSectionV1):
-    pass
-
-class InterventionSection(sub_study_title):
-    '''This class receives an intervention object'''
-    section_title = _('Het interventieonderzoek')
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'period',
-        'multiple_sessions', 
-        'session_frequency',
-        'amount_per_week',
-        'duration',
-        'measurement',
-        'experimenter',
-        'description',
-        'has_controls',
-        'controls_description',
-        'extra_task'
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if obj.version == 1:
-            fields_to_remove = ['multiple_sessions',
-                                'session_frequency',
-                                'extra_task']
-            for field in fields_to_remove:
-                rows.remove(field)
-        else:
-            rows.remove('amount_per_week')
-            if not obj.multiple_sessions:
-                rows.remove('session_frequency')
-            if obj.settings_contains_schools:
-                rows.remove('extra_task')
-        
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        if not obj.has_controls:
-            rows.remove('controls_description')   
-
-        return rows
-    
-class InterventionSectionDiff(sub_study_title_diff, InterventionSection):
-    pass
-    
-class ObservationSection(sub_study_title):
-    '''This class receives an observation object
-    It inherits from the InterventionSection, as it can repurpose the same overridden
-    render method.'''
-    section_title = _('Het observatieonderzoek')
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'days',
-        'mean_hours',
-        'details_who',
-        'details_why',
-        'details_frequency',
-        'is_anonymous',
-        'is_anonymous_details',
-        'is_in_target_group',
-        'is_in_target_group_details',
-        'is_nonpublic_space',
-        'is_nonpublic_space_details',
-        'has_advanced_consent',
-        'has_advanced_consent_details',
-        'needs_approval',
-        'approval_institution',
-        'approval_document',
-        'registrations',
-        'registrations_details'        
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if obj.version == 1:
-            to_remove_if_v1 = ['details_who',
-                            'details_why',
-                            'is_anonymous_details', 
-                            'is_in_target_group_details',
-                            'is_nonpublic_space_details',
-                            'has_advanced_consent_details'
-                            ]
-            for field in to_remove_if_v1:
-                rows.remove(field)
-
-            if not obj.is_nonpublic_space:
-                rows.remove('has_advanced_consent')
-            if not obj.needs_approval:
-                rows.remove('approval_institution')
-                rows.remove('approval_document')
-            elif obj.study.proposal.is_practice():
-                rows.remove('approval_document')
-        else:
-            to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
-            for field in to_remove_if_v2:
-                rows.remove(field)
-
-            if not obj.is_anonymous:
-                rows.remove('is_anonymous_details')
-            if not obj.is_in_target_group:
-                rows.remove('is_in_target_group_details')
-            if not obj.is_nonpublic_space:
-                rows.remove('is_nonpublic_space_details')
-                rows.remove('has_advanced_consent')
-                rows.remove('has_advanced_consent_details')
-            elif obj.has_advanced_consent:
-                rows.remove('has_advanced_consent_details')
-            if not needs_details(obj.setting.all(), 'is_school'):
-                rows.remove('needs_approval')
-            if not obj.needs_approval:
-                rows.remove('approval_institution')
-
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-        if not needs_details(obj.registrations.all()):
-            rows.remove('registrations_details')
-
-        return rows
-    
-class ObservationSectionDiff(sub_study_title_diff, ObservationSection):
-    '''Note that the diff sections follow a similar pattern of inheritance as 
-    the regular sections, due to repurposing overriden methods, when applicable, 
-    eg.:
-
-    class InterventionSection(PDFDiffSection)
-    class InterventionSectionDiff(DiffSectionMissingObjects, InterventionSection)
-
-    class ObservationSection(InterventionSection)
-    class ObservationSectionDiff(InterventionSectionDiff, ObservationSection)
-    '''
-    pass
-
-class SessionsOverviewSection(study_title):
-    '''This class receives an study object
-    This Section looks maybe a bit unnecessary, but it does remove some logic, plus
-    the study_title.html from the template.'''
-
-    section_title = _("Het takenonderzoek en interviews")
-
-    row_fields = ['sessions_number']
-
-
-class SessionsOverviewSectionDiff(study_title_diff, SessionsOverviewSection):
-    '''Needed to override get_row_fields, due to mro issue'''
-    pass
-
-class SessionSection(session_title):
-    '''This class receives a session object'''
-    
-    row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'tasks_number',       
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
-        elif obj.supervision:
-            rows.remove('leader_has_coc')
-
-        return rows
-
-class SessionSectionDiff(session_title_diff, SessionSection):
-    pass
-    
-class TaskSection(task_title):
-    '''This class receives an task object'''
-    
-    row_fields = [
-        'name',
-        'duration',
-        'registrations',
-        'registrations_details',
-        'registration_kinds',
-        'registration_kinds_details',
-        'feedback',
-        'feedback_details',
-        'description'
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not needs_details(obj.registrations.all()):
-            rows.remove('registrations_details')
-        if not needs_details(obj.registrations.all(), 'needs_kind') or \
-        not needs_details(obj.registration_kinds.all()):
-            rows.remove('registration_kinds')
-            rows.remove('registration_kinds_details')
-        elif not needs_details(obj.registration_kinds.all()):
-            rows.remove('registration_kinds_details')
-        if not obj.feedback:
-            rows.remove('feedback_details')
-
-        return rows
-    
-class TaskSectionDiff(task_title_diff, TaskSection):
-    pass
-    
-class TasksOverviewSection(task_overview_title):
-    '''Gets passed a session object
-    This might be unecessary ... Maybe just use the existing template language ...
-    Because the verbose name of this field is formatted, the method for retrieving
-    the verbose name in the RowClass is quite convoluded.'''
-
-    row_fields = [
-        'tasks_duration'
-    ]
-    
-class TasksOverviewSectionDiff(task_overview_title_diff, TasksOverviewSection):
-    pass
-    
-class StudyOverviewSection(study_title):
-    '''This class receives a Study object.'''
-
-    section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
-    row_fields = [
-        'deception',
-        'deception_details',
-        'negativity',
-        'negativity_details',
-        'stressful',
-        'stressful_details',
-        'risk',
-        'risk_details'
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        rows_to_remove = []
-        for x in range(0, 7, 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]
-
-        if not obj.has_sessions and not obj.deception == 'N':
-            rows.remove('deception')
-            rows.remove('deception_details')
-        elif not obj.has_sessions:
-            rows.remove('deception')
-
-        return rows
-
-class StudyOverviewSectionDiff(study_title_diff, StudyOverviewSection):
-    pass
-    
-class InformedConsentFormsSection(sub_study_title):
-    '''This class receives a Documents object'''
-
-    section_title = _('Informed consent formulieren')
-
-    row_fields = [
-        'translated_forms',
-        'translated_forms_languages',
-        'informed_consent',
-        'briefing',
-        'passive_consent',
-        'passive_consent_details',
-        'director_consent_declaration',
-        'director_consent_information',
-        'parents_information'
-    ]
-
-    def make_rows(self):
-
-        '''A few fields here need to access different objects, therefore this complex
-        overriding of the make_rows function ... :( '''
-
-        proposal_list = ['translated_forms', 'translated_forms_languages']
-        study_list = ['passive_consent', 'passive_consent_details']
-        if self.object_2:
-            row_fields_1 = self.get_row_fields(self.object)
-            row_fields_2 = self.get_row_fields(self.object_2)
-
-            row_fields_both = list(set(row_fields_1) | set(row_fields_2))
-
-            ordered_row_fields = [row for row in self.row_fields if row in row_fields_both]
-
-            rows = []
-
-            for field in ordered_row_fields:
-                if field in proposal_list:
-                    rows.append(RowClass(self.object.proposal, field, self.object_2.proposal))
-                elif field in study_list:
-                    rows.append(RowClass(self.object.study, field, self.object_2.study))
-                else:
-                    rows.append(RowClass(self.object, field, self.object_2))
-                    
-        else:
-            row_fields = self.get_row_fields(self.object)
-
-            rows = []
-
-            for field in row_fields:
-                if field in proposal_list:
-                    rows.append(RowClass(self.object.proposal, field))
-                elif field in study_list:
-                    rows.append(RowClass(self.object.study, field))
-                else:
-                    rows.append(RowClass(self.object, field))
-    
-        return rows
-    
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not obj.proposal.translated_forms:
-            rows.remove('translated_forms_languages')
-        if obj.proposal.is_practice() or not obj.informed_consent:
-            rows.remove('informed_consent')
-            rows.remove('briefing')
-        if obj.study.passive_consent is None:
-            rows.remove('passive_consent')
-        if not obj.study.passive_consent:
-            rows.remove('passive_consent_details')
-        if not obj.director_consent_declaration:
-            rows.remove('director_consent_declaration')
-        if not obj.director_consent_information:
-            rows.remove('director_consent_information')
-        if not obj.parents_information:
-            rows.remove('parents_information')
-
-        return rows
-    
-class InformedConsentSectionDiff(sub_study_title_diff, InformedConsentFormsSection):
-    pass
-    
-class ExtraDocumentsSection(PDFDiffSection):
-    '''This class receives an Documents object.
-    Overrides the __init__ to create a formatted section title'''
-
-    row_fields = [
-        'informed_consent',
-        'briefing'
-    ]
-
-    def __init__(self, object, count):
-        super().__init__(object)
-        self.section_title = _('Extra formulieren ') + str(count + 1)
-    
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not obj.informed_consent:
-            rows.remove('informed_consent')
-        if not obj.briefing:
-            rows.remove('briefing')
-
-        return rows
-    
-class ExtraDocumentsSectionDiff(DiffSectionMissingObjects, ExtraDocumentsSection):
-
-    def __init__(self, objects_tuple, count):
-        super().__init__(objects_tuple)
-        self.section_title = _('Extra formulieren ') + str(count+1)     
-    
-class DMPFileSection(PDFDiffSection):
-    '''This class receives a proposal object
-    Also unnecessary I suppose. But I though why not ...'''
-
-    section_title = _('Data Management Plan')
-    
-    row_fields = ['dmp_file']
-
-class EmbargoSection(PDFDiffSection):
-    '''Gets passed a proposal object'''
-
-    section_title = _('Aanmelding versturen')
-
-    row_fields = [
-        'embargo',
-        'embargo_end_date'
-    ]
-
-    def get_row_fields(self, obj):
-        rows = copy(self.row_fields)
-
-        if not obj.embargo:
-            rows.remove('embargo_end_date')
-
-        return rows
-    
-def get_extra_documents(object):
-    '''A function to retrieve all extra documents for a specific proposal.'''
-    from studies.models import Documents
-
-    extra_documents = []
-
-    for document in Documents.objects.filter(
-        proposal = object,
-        study__isnull = True
-    ):
-        extra_documents.append(document)
-    
-    return extra_documents
-    
-def create_context_pdf(context, model):
-    '''A function to create the context for the PDF.'''
-
-    sections = []
-
-    sections.append(GeneralSection(model))
-    sections.append(WMOSection(model.wmo))
-
-    if model.wmo.status != model.wmo.NO_WMO:
-        sections.append(METCSection(model.wmo))
-    
-    sections.append(TrajectoriesSection(model))
-
-    if model.wmo.status == model.wmo.NO_WMO:
-
-        for study in model.study_set.all():
-            sections.append(StudySection(study))
-            if study.has_intervention:
-                sections.append(InterventionSection(study.intervention))
-            if study.has_observation:
-                sections.append(ObservationSection(study.observation))
-            if study.has_sessions:
-                sections.append(SessionsOverviewSection(study))
-                for session in study.session_set.all():
-                    sections.append(SessionSection(session))
-                    for task in session.task_set.all():
-                        sections.append(TaskSection(task))
-                sections.append(TasksOverviewSection(session))
-            sections.append(StudyOverviewSection(study))
-            sections.append(InformedConsentFormsSection(study.documents))
-
-        extra_documents = get_extra_documents(model)
-        
-        for count, document in enumerate(extra_documents):
-            sections.append(ExtraDocumentsSection(document, count))
-
-        if model.dmp_file:
-            sections.append(DMPFileSection(model))
-            
-        sections.append(EmbargoSection(model))
-
-    context['sections'] = sections
-    
-    return context
-
-def create_context_diff(context, p_proposal, proposal):
-    '''A function to create the context for the diff page.'''
-
-    both_proposals = (p_proposal, proposal)
-
-    sections = []
-
-    sections.append(GeneralSection(both_proposals))
-    sections.append(WMOSection((p_proposal.wmo, proposal.wmo)))
-
-    if proposal.wmo.status != proposal.wmo.NO_WMO or p_proposal.wmo.status != p_proposal.wmo.NO_WMO:
-        sections.append(METCSection((p_proposal.wmo, proposal.wmo)))
-    
-    sections.append(TrajectoriesSection(both_proposals))
-
-    if proposal.wmo.status == proposal.wmo.NO_WMO or proposal.wmo.status == proposal.wmo.JUDGED:
-
-        for p_study, study in zip_equalize_lists(p_proposal.study_set.all(), proposal.study_set.all()):
-
-            diff_studies = (p_study, study)
-
-            sections.append(StudySectionDiff((diff_studies)))
-
-            if p_study is not None and p_study.has_intervention or \
-                study is not None and study.has_intervention:
-
-
-                interventions = tuple((study.intervention if study is not None \
-                                       else study for study in diff_studies))
-                
-                sections.append(InterventionSectionDiff(interventions))
-
-            if p_study is not None and p_study.has_observation or \
-                study is not None and study.has_observation:
-
-                observations = tuple((study.observation if study is not None \
-                                       else study for study in diff_studies))
-                
-                sections.append(ObservationSectionDiff(observations))
-
-            if p_study is not None and p_study.has_sessions or \
-                study is not None and study.has_sessions:
-
-                sections.append(SessionsOverviewSectionDiff(diff_studies))
-
-                p_sessions_set, sessions_set = tuple((study.session_set.all() if study is not None \
-                                       else study for study in diff_studies))
-                
-                for diff_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
-
-                    sections.append(SessionSectionDiff(diff_sessions))
-
-                    p_tasks_set, tasks_set = tuple((session.task_set.all() if session is not None \
-                                       else session for session in diff_sessions))
-                    
-                    for diff_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
-
-                        sections.append(TaskSectionDiff(diff_tasks))
-
-                sections.append(TasksOverviewSectionDiff(diff_sessions))
-
-            sections.append(StudyOverviewSectionDiff(diff_studies))
-
-            documents = tuple(study.documents if study is not None \
-                              else study for study in diff_studies)
-            
-            sections.append(InformedConsentSectionDiff(documents))
-
-        p_extra_docs = get_extra_documents(p_proposal)
-        extra_docs = get_extra_documents(proposal)
-
-        if p_extra_docs or extra_docs:
-            for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
-                sections.append(ExtraDocumentsSectionDiff(zipped_extra_docs, count))
-
-        if p_proposal.dmp_file or proposal.dmp_file:
-            sections.append(DMPFileSection(both_proposals))
-            
-        sections.append(EmbargoSection(both_proposals))
-
-    context['sections'] = sections
-
-    return context
-
-
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 0cadca621..2c77d5391 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -1,4 +1,3 @@
-
 from datetime import date
 from copy import copy
 
@@ -9,12 +8,17 @@
 from django.utils.safestring import mark_safe
 from django.utils.translation import ugettext as _
 
-from proposals.templatetags.proposal_filters import needs_details, medical_traits, \
-necessity_required, has_adults
+from proposals.templatetags.proposal_filters import (
+    needs_details,
+    medical_traits,
+    necessity_required,
+    has_adults,
+)
 from proposals.templatetags.diff_tags import zip_equalize_lists
 
+
 class BaseSection:
-    '''This is the main class, from which sections are constructed.
+    """This is the main class, from which sections are constructed.
     It receives one object, such as a proposal or sub-objects of proposals.
     The most important methods are render and make_rows. Make rows makes use of get_row_field,
     which gets overwritten for specific sections, if logic is involved.
@@ -25,33 +29,31 @@ class BaseSection:
     - 'session'
     - 'task'
     -'task_overview'
-
     These arguments are passed in overwritten __init__() methods, when applicable.
-    '''
-    
+    """
+
     section_title = None
     row_fields = None
 
-    def __init__(self, object):
-        self.object = object
+    def __init__(self, obj):
+        self.obj = obj
         self.sub_title = None
 
-    def make_rows(self):   
-
-        rows = [RowClass(self.object, field) for field in self.get_row_fields()]
+    def make_rows(self):
+        rows = [Row(self.obj, field) for field in self.get_row_fields()]
 
         return rows
-    
+
     def get_row_fields(self):
         return self.row_fields
 
     def render(self, context):
         context = context.flatten()
-        template = get_template('proposals/table_with_header.html')
+        template = get_template("proposals/table_with_header.html")
         if self.sub_title is not None:
             context.update(
                 {
-                    "sub_title": self.sub_title
+                    "sub_title": self.sub_title,
                 }
             )
         context.update(
@@ -61,79 +63,72 @@ def render(self, context):
             }
         )
         return template.render(context)
-    
-    def get_sub_title(self, object, sub_title_type):
-        return StudyTitleClass(object, sub_title_type).sub_title
+
+    def get_sub_title(self, obj, sub_title_type):
+        return SubTitle(obj, sub_title_type).sub_title
+
 
 class DiffSection:
-    '''For the diff page, sections are constructed by comparing two section objects.
-    The DiffSection thus received an iterable containing two versions of a specific section,
-    for instance [GeneralSection(proposal), GeneralSection(p_proposal)]
+    """For the diff page, sections are constructed by comparing two section objects.
+    for instance:
+          GeneralSection(old_proposal), GeneralSection(new_proposal)
+
     It mostly uses the make_rows methods, but also some other class variables from these objects.
     If a section is missing from a revision or an original proposal, this will be reperesented by
     None, and a warning and some formatting info get passed to the template as well.
-    
+
     Some parts of this were written with the idea of allowing more than two objects to be compared,
-    however, I did not end up pursuing this idea until the end.'''
+    however, I did not end up pursuing this idea until the end."""
 
-    def __init__(self, objects):
-        self.objects = objects
-        if None in self.objects:
-            if self.objects[0] is None:
-                self.warning = _(
+    def __init__(self, old_object, new_object):
+        self.old_object = old_object
+        self.new_object = new_object
+        if self.old_object is None:
+            self.warning = _(
                 "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
-                )
-                self.missing_object = 0
-                self.sub_title = self.objects[1].sub_title
-                self.section_title = self.objects[1].section_title
-            else:
-                self.warning = _(
+            )
+            self.missing_object = "old"
+            self.sub_title = self.new_object.sub_title
+            self.section_title = self.new_object.section_title
+        elif self.new_object is None:
+            self.warning = _(
                 "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
             )
-                self.missing_object = 1
-                self.sub_title = self.objects[0].sub_title
-                self.section_title = self.objects[0].section_title
-
+            self.missing_object = "new"
+            self.sub_title = self.old_object.sub_title
+            self.section_title = self.old_object.section_title
         else:
             self.warning = None
             self.missing_object = None
-            self.sub_title = self.objects[0].sub_title
-            self.section_title = self.objects[0].section_title
+            self.sub_title = self.old_object.sub_title
+            self.section_title = self.old_object.section_title
         self.rows = self.make_diff_rows()
 
     def make_diff_rows(self):
-        '''This function generates a nested list, where each sublist contains:
-        [verbose_name, value_1, value_2] if both objects are present.'''
-            
-        if self.warning is not None:
-            '''If there is a missing object, the template can just use the make_rows function
-            of the object that is not missing.'''         
-            if self.missing_object == 0:
-                rows = self.objects[1].make_rows()
+        """This function generates rows for diff instances."""
+
+        if self.missing_object is not None:
+            # If there is a missing object, the template can just use the make_rows function
+            # of the object that is not missing.
+            if self.missing_object == "old":
+                rows = self.new_object.make_rows()
             else:
-                rows = self.objects[0].make_rows()
+                rows = self.old_object.make_rows()
             return rows
         else:
-            '''This is a bit clunky and could probably be improved. I designed it to be able to
-            process more than two objects, however, the rest of this class is not designed as such'''
-            initial_rows_dicts = [{row.verbose_name(): row.value() for row in object.make_rows()}  
-                                  for object in self.objects]
-
-            #creating a list containing all fields in all objects
-            all_fields = list(initial_rows_dicts[0].keys())
-            for rows_dict in initial_rows_dicts[1:]:
-                all_fields.extend(field for field in rows_dict.keys() if field not in all_fields)
+            old_fields = self.old_object.get_row_fields()
+            new_fields = self.new_object.get_row_fields()
 
-            rows = [[field] for field in all_fields]
+            # creating a list containing all fields in all objects
+            all_fields = set(old_fields)
+            all_fields.update(new_fields)
 
-            for rows_dict in initial_rows_dicts:
-                for field in rows:
-                    if field[0] in rows_dict:
-                        field.append(rows_dict[field[0]])
-                    else:
-                        field.append('')
+            rows = [
+                DiffRow(field, self.old_object.obj, self.new_object.obj)
+                for field in all_fields
+            ]
 
-        return rows
+            return rows
 
     def render(self, context):
         context = context.flatten()
@@ -143,7 +138,7 @@ def render(self, context):
             context.update(
                 {
                     "warning": self.warning,
-                    "missing_object": self.missing_object
+                    "missing_object": self.missing_object,
                 }
             )
         if self.sub_title is not None:
@@ -152,286 +147,335 @@ def render(self, context):
                     "sub_title": self.sub_title,
                 }
             )
-
         context.update(
             {
                 "section_title": self.section_title,
-                "rows": self.rows
+                "rows": self.rows,
             }
         )
         return template.render(context)
-    
-class RowClass:
-    '''This class creates rows for one objects, and gets initated
-    in the make_rows method of Section classes. The classmethods of Rowclass
-    are called in the templates of the render method of the PDF class, as well as in 
-    the make_diff_rows() method of the DiffSectionClass'''
 
+
+class FieldVerboseNameMixin:
     verbose_name_diff_field_dict = {
-        'get_metc_display': 'metc',
-        'get_is_medical_display': 'is_medical'
+        "get_metc_display": "metc",
+        "get_is_medical_display": "is_medical",
     }
 
-    def __init__(self, object, field):
-        self.object = object
-        self.field = field
-    
+    def _get_object(self):
+        return self.obj
+
     def verbose_name(self):
         if self.field in self.verbose_name_diff_field_dict:
             verbose_name_field = self.verbose_name_diff_field_dict[self.field]
             verbose_name = self.get_verbose_name(verbose_name_field)
         else:
-            verbose_name= self.get_verbose_name(self.field)
-        return verbose_name   
-    
-    def value(self):
-        return RowValueClass(self.object, self.field).get_field_value()
-    
+            verbose_name = self.get_verbose_name(self.field)
+        return verbose_name
+
     def get_verbose_name(self, field):
-        if field != 'tasks_duration':
-            return mark_safe(self.object._meta.get_field(field).verbose_name)
+        if field != "tasks_duration":
+            return mark_safe(self._get_object()._meta.get_field(field).verbose_name)
         else:
-            return mark_safe(self.object._meta.get_field(field).verbose_name % self.object.net_duration())
+            return mark_safe(
+                self._get_object()._meta.get_field(field).verbose_name
+                % self.obj.net_duration()
+            )
 
-class RowValueClass:
-    '''The RowValueClass manages the values of fields and correctly retrieves and/or formats
-    the right values per field. This class get initiated in the value method
-    of the RowClass. It returns mostly strings, but sometimes some html as well.'''
 
-    def __init__(self, object, field):
+class Row(FieldVerboseNameMixin):
+    """This class creates rows for one objects, and gets initated
+    in the make_rows method of Section classes. The classmethods of Rowclass
+    are called in the templates of the render method of the PDF class, as well as in
+    the make_diff_rows() method of the DiffSection"""
+
+    def __init__(self, obj, field):
+        self.obj = obj
+        self.field = field
+
+    def value(self):
+        return RowValue(self.obj, self.field).get_field_value()
+
 
-        self.object = object
+class DiffRow(FieldVerboseNameMixin):
+    def __init__(self, field, old_object, new_object):
+        self.old_object = old_object
+        self.new_object = new_object
+        self.field = field
+
+    def _get_object(self):
+        if self.old_object:
+            return self.old_object
+
+        # Note: when both are not present this will fail.
+        # Should not happen
+        return self.new_object
+
+    def value(self):
+        old_value = ""
+        if self.old_object:
+            old_value = RowValue(self.old_object, self.field).get_field_value()
+
+        new_value = ""
+        if self.new_object:
+            new_value = RowValue(self.new_object, self.field).get_field_value()
+
+        return old_value, new_value
+
+
+class RowValue:
+    """The RowValue class manages the values of fields and correctly retrieves and/or formats
+    the right values per field. This class get initiated in the value method
+    of the Row class. It returns mostly strings, but sometimes some html as well."""
+
+    def __init__(self, obj, field):
+        self.obj = obj
         self.field = field
 
     def get_field_value(self):
         from ..models import Relation
         from studies.models import Compensation
-        
-        value = getattr(self.object, self.field)
+
+        value = getattr(self.obj, self.field)
 
         User = get_user_model()
 
-        if value in ('Y', 'N', '?'):
+        if value in ("Y", "N", "?"):
             return self.yes_no_doubt(value)
         elif isinstance(value, bool):
-            return _('ja') if value else _('nee')
+            return _("ja") if value else _("nee")
         elif isinstance(value, (str, int, date)):
             return value
         elif value is None:
-            return _('Onbekend')
+            return _("Onbekend")
         elif isinstance(value, User):
             return self.handle_user(value)
         elif isinstance(value, Relation) or isinstance(value, Compensation):
             return value.description
-        elif value.__class__.__name__ == 'ManyRelatedManager':
+        elif value.__class__.__name__ == "ManyRelatedManager":
             if value.all().model == User:
                 return self.get_applicants_names(value)
             else:
                 return self.get_object_list(value)
-        elif value.__class__.__name__ == 'FieldFile':
+        elif value.__class__.__name__ == "FieldFile":
             return self.handle_field_file(value)
         elif callable(value):
             return value()
-        
+
     def handle_user(self, user):
         return user.get_full_name()
-    
+
     def get_applicants_names(self, applicants):
         applicant_names = [applicant.get_full_name() for applicant in applicants.all()]
         return self.create_unordered_html_list(applicant_names)
-    
+
     def get_object_list(self, object):
         list_of_objects = [obj for obj in object.all()]
         return self.create_unordered_html_list(list_of_objects)
-    
+
     def create_unordered_html_list(self, list):
         html_output = mark_safe('<ul class="p-0">')
 
         for item in list:
-            html_output += format_html('<li>{}</li>',
-                item
-            )
-        
-        html_output += mark_safe('</ul>')
+            html_output += format_html("<li>{}</li>", item)
+
+        html_output += mark_safe("</ul>")
 
         return html_output
-    
+
     def handle_field_file(self, field_file):
         if field_file:
-            output = format_html('<a href={}>{}</a>',
-                f'{settings.BASE_URL}{field_file.url}',
-                _('Download')
+            output = format_html(
+                "<a href={}>{}</a>",
+                f"{settings.BASE_URL}{field_file.url}",
+                _("Download"),
             )
         else:
-            output = _('Niet aangeleverd')
+            output = _("Niet aangeleverd")
 
         return output
-    
+
     def yes_no_doubt(self, value):
         from main.models import YES_NO_DOUBT
+
         d = dict(YES_NO_DOUBT)
         return d[value]
-    
-class StudyTitleClass:
-    '''This class can return a study title to the base section class,
+
+
+class SubTitle:
+    """This class can return a sub title to the base section class,
     according to the argument with which it is initiated. This argument gets passed
-    in overwritten __init__ methods of for instance, the StudySection class.'''
+    in overwritten __init__ methods of for instance, the StudySection class."""
 
     def __init__(self, object, sub_title_type):
-        if sub_title_type == 'study':
+        if sub_title_type == "study":
             self.sub_title = self.get_study_title(object)
-        elif sub_title_type == 'session':
+        elif sub_title_type == "session":
             self.sub_title = self.get_session_title(object)
-        elif sub_title_type == 'task':
+        elif sub_title_type == "task":
             self.sub_title = self.get_task_title(object)
-        elif sub_title_type == 'task_overview':
-            self.sub_title = _('Overzicht van het takenonderzoek')
+        elif sub_title_type == "task_overview":
+            self.sub_title = _("Overzicht van het takenonderzoek")
         else:
             self.sub_title = None
-        
-    def get_study_title(self, study):
 
+    def get_study_title(self, study):
         from studies.models import Study
 
         if not isinstance(study, Study):
             study = study.study
-        if study.proposal.studies_number > 1:        
+        if study.proposal.studies_number > 1:
             if study.name:
-                study_title = format_html('{}{} <em>{} </em>',
-                                        _('Traject '),
-                                        study.order,
-                                        study.name
+                study_title = format_html(
+                    "{}{} <em>{} </em>",
+                    _("Traject "),
+                    study.order,
+                    study.name,
                 )
             else:
-                study_title = format_html('{}{}',
-                                        _('Traject'),
-                                        {study.order}
+                study_title = format_html(
+                    "{}{}",
+                    _("Traject"),
+                    {study.order},
                 )
         else:
             study_title = None
         return study_title
-    
+
     def get_session_title(self, session):
         if session is None:
-            return ''
+            return ""
         else:
-            order = session.order 
-            study_order = session.study.order 
-            study_name = session.study.name 
-            studies_number = session.study.proposal.studies_number 
+            order = session.order
+            study_order = session.study.order
+            study_name = session.study.name
+            studies_number = session.study.proposal.studies_number
             sessions_number = session.study.sessions_number
 
             if studies_number > 1 and sessions_number > 1:
-                session_title = format_html('{}{} <em>{} </em> {}{}',
-                                        _('Traject '),
-                                        study_order,
-                                        study_name,
-                                        _('sessie '),
-                                        order
+                session_title = format_html(
+                    "{}{} <em>{} </em> {}{}",
+                    _("Traject "),
+                    study_order,
+                    study_name,
+                    _("sessie "),
+                    order,
                 )
             elif studies_number > 1:
-                session_title = format_html('{}{} <em>{} </em>',
-                                        _('Traject '),
-                                        study_order,
-                                        study_name,
+                session_title = format_html(
+                    "{}{} <em>{} </em>",
+                    _("Traject "),
+                    study_order,
+                    study_name,
                 )
             elif sessions_number >= 1:
-                session_title = format_html('{}{}',
-                                            _('Sessie '),
-                                            order
+                session_title = format_html(
+                    "{}{}",
+                    _("Sessie "),
+                    order,
                 )
             return session_title
-    
+
     def get_task_title(self, task):
         if task is None:
-            return ''
+            return ""
         else:
-            order=task.order 
-            session_order=task.session.order 
-            study_order=task.session.study.order 
-            study_name=task.session.study.name 
-            studies_number=task.session.study.proposal.studies_number
+            order = task.order
+            session_order = task.session.order
+            study_order = task.session.study.order
+            study_name = task.session.study.name
+            studies_number = task.session.study.proposal.studies_number
             if studies_number > 1:
-                task_title = format_html('{}{} <em>{} </em>, {}{}{}{}',
-                                        _('Traject '),
-                                        study_order,
-                                        study_name,
-                                        _('sessie '),
-                                        session_order,
-                                        _(', taak '),
-                                        order
+                task_title = format_html(
+                    "{}{} <em>{} </em>, {}{}{}{}",
+                    _("Traject "),
+                    study_order,
+                    study_name,
+                    _("sessie "),
+                    session_order,
+                    _(", taak "),
+                    order,
                 )
             else:
-                task_title = format_html('{}{}{}{}',
-                                        _('Sessie '),
-                                        session_order,
-                                        _(', taak '),
-                                        order
-                                        )
+                task_title = format_html(
+                    "{}{}{}{}",
+                    _("Sessie "),
+                    session_order,
+                    _(", taak "),
+                    order,
+                )
             return task_title
+
+class PageBreakMixin(BaseSection):
+    """A Mixin for adding page break formatting to a section."""
+
+    def render(self, context):
+        context.update({"page_break": True})
+        return super().render(context)
+
 class GeneralSection(BaseSection):
-    '''This class generates the data for the general section of a proposal and showcases
+    """This class generates the data for the general section of a proposal and showcases
     the general workflow for creating sections. All possible row fields are provided, and
     removed according to the logic in the get_row_fields method.
     This class receives a proposal object.
-    
-    This is one of two SectionClasses (the other being the CommentsSection) which overrides
-    the render method of the BaseSection class to allow for formatting certain values outside of 
-    a <table> element and in a <p> element. The implementation of this is slightly clunkily 
-    hardcoded as of now ... See the slicing in the render method.'''
+
+    This is one of two Sections (the other being the CommentsSection) which overrides
+    the render method of the BaseSection class to allow for formatting certain values outside of
+    a <table> element and in a <p> element. The implementation of this is slightly clunkily
+    hardcoded as of now ... See the slicing in the render method."""
 
     section_title = _("Algemene informatie over de aanvraag")
     row_fields = [
-        'relation',
-        'supervisor',
-        'student_program',
-        'student_context',
-        'student_context_details',
-        'student_justification',
-        'other_applicants',
-        'applicants',
-        'other_stakeholders',
-        'stakeholders',
-        'date_start',
-        'title',
-        'funding',
-        'funding_details',
-        'funding_name',
-        'self_assessment',
-        'summary'
+        "relation",
+        "supervisor",
+        "student_program",
+        "student_context",
+        "student_context_details",
+        "student_justification",
+        "other_applicants",
+        "applicants",
+        "other_stakeholders",
+        "stakeholders",
+        "date_start",
+        "title",
+        "funding",
+        "funding_details",
+        "funding_name",
+        "self_assessment",
+        "summary",
     ]
-    
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not obj.relation.needs_supervisor:
-            rows.remove('supervisor')
+            rows.remove("supervisor")
         if not obj.relation.check_in_course:
-            rows.remove('student_program')
-            rows.remove('student_context')
+            rows.remove("student_program")
+            rows.remove("student_context")
             if obj.student_context is not None:
                 if not obj.student_context.needs_details:
-                    rows.remove('student_context_details')
+                    rows.remove("student_context_details")
             else:
-                rows.remove('student_context_details')
-            rows.remove('student_justification')
+                rows.remove("student_context_details")
+            rows.remove("student_justification")
         if not obj.other_applicants:
-            rows.remove('applicants')
+            rows.remove("applicants")
         if not obj.other_stakeholders:
-            rows.remove('stakeholders')
+            rows.remove("stakeholders")
         if not needs_details(obj.funding.all()):
-            rows.remove('funding_details')
-        if not needs_details(obj.funding.all(), 'needs_name'):
-            rows.remove('funding_name')
+            rows.remove("funding_details")
+        if not needs_details(obj.funding.all(), "needs_name"):
+            rows.remove("funding_name")
 
         return rows
-    
+
     def render(self, context):
-        '''Note the special template for dealing with these cases.'''
+        """NOTE the special template for dealing with these cases."""
 
         context = context.flatten()
-        template = get_template('proposals/table_and_text_with_header.html')
+        template = get_template("proposals/table_and_text_with_header.html")
         rows = self.make_rows()
         context.update(
             {
@@ -440,417 +484,414 @@ def render(self, context):
                 "paragraph_rows": rows[-2:],
             }
         )
-        return template.render(context)    
-class PageBreakMixin(BaseSection):
-    '''A Mixin for adding page break formatting to a section.'''
+        return template.render(context)
+
 
-    def render(self, context):
-        context.update(
-            {
-                'page_break': True
-            }
-        )
-        return super().render(context)
-    
 class WMOSection(PageBreakMixin, BaseSection):
-    '''This class receives a proposal.wmo object.'''
+    """This class receives a proposal.wmo object."""
 
-    section_title = _("Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?")
+    section_title = _(
+        "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+    )
     row_fields = [
-        'get_metc_display',
-        'metc_details',
-        'metc_institution',
-        'get_is_medical_display',  
+        "get_metc_display",
+        "metc_details",
+        "metc_institution",
+        "get_is_medical_display",
     ]
-    
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
-        if not obj.metc == 'Y':
-            rows.remove('metc_details')
-            rows.remove('metc_institution')
+        if not obj.metc == "Y":
+            rows.remove("metc_details")
+            rows.remove("metc_institution")
         else:
-            rows.remove('get_is_medical_display')
+            rows.remove("get_is_medical_display")
 
         return rows
-    
+
+
 class METCSection(PageBreakMixin, BaseSection):
-    '''This class receives a proposal.wmo object.'''
+    """This class receives a proposal.wmo object."""
 
     section_title = _("Aanmelding bij de METC")
-    
-    row_fields = [
-        'metc_application',
-        'metc_decision',
-        'metc_decision_pdf'
-    ]
-    
+
+    row_fields = ["metc_application", "metc_decision", "metc_decision_pdf"]
+
+
 class TrajectoriesSection(PageBreakMixin, BaseSection):
-    '''This class receives a proposal object.'''
+    """This class receives a proposal object."""
 
     section_title = _("Eén of meerdere trajecten?")
 
-    row_fields = [
-        'studies_similar',
-        'studies_number'
-    ]
-    
+    row_fields = ["studies_similar", "studies_number"]
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if obj.studies_similar:
-            rows.remove('studies_number')
+            rows.remove("studies_number")
 
         return rows
 
+
 class StudySection(BaseSection):
-    '''This class receives a proposal.study object
-    Note the overwritten __init__ method for adding a sub_title.'''
+    """This class receives a proposal.study object
+    Note the overwritten __init__ method for adding a sub_title."""
 
-    section_title = _('De deelnemers')
+    section_title = _("De deelnemers")
     row_fields = [
-        'age_groups',
-        'legally_incapable',
-        'legally_incapable_details',
-        'has_special_details',
-        'special_details',
-        'traits',
-        'traits_details',
-        'necessity',
-        'necessity_reason',
-        'recruitment',
-        'recruitment_details',
-        'compensation',
-        'compensation_details',
-        'hierarchy',
-        'hierarchy_details',
+        "age_groups",
+        "legally_incapable",
+        "legally_incapable_details",
+        "has_special_details",
+        "special_details",
+        "traits",
+        "traits_details",
+        "necessity",
+        "necessity_reason",
+        "recruitment",
+        "recruitment_details",
+        "compensation",
+        "compensation_details",
+        "hierarchy",
+        "hierarchy_details",
     ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'study')
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "study")
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not has_adults(obj):
-            rows.remove('legally_incapable')
-            rows.remove('legally_incapable_details')
+            rows.remove("legally_incapable")
+            rows.remove("legally_incapable_details")
         elif not obj.legally_incapable:
-            rows.remove('legally_incapable_details')
+            rows.remove("legally_incapable_details")
         if not obj.has_special_details:
-            rows.remove('special_details')
-            rows.remove('traits')
-            rows.remove('traits_details')
+            rows.remove("special_details")
+            rows.remove("traits")
+            rows.remove("traits_details")
         elif not medical_traits(obj.special_details.all()):
-            rows.remove('traits')
-            rows.remove('traits_details')
+            rows.remove("traits")
+            rows.remove("traits_details")
         elif not needs_details(obj.traits.all()):
-            rows.remove('traits_details')
+            rows.remove("traits_details")
         if not necessity_required(obj):
-            rows.remove('necessity')
-            rows.remove('necessity_reason')
+            rows.remove("necessity")
+            rows.remove("necessity_reason")
         if not needs_details(obj.recruitment.all()):
-            rows.remove('recruitment_details')
+            rows.remove("recruitment_details")
         if not obj.compensation.needs_details:
-            rows.remove('compensation_details')
+            rows.remove("compensation_details")
         if not obj.hierarchy:
-            rows.remove('hierarchy_details')
+            rows.remove("hierarchy_details")
 
         return rows
 
+
 class InterventionSection(BaseSection):
-    '''This class receives an intervention object'''
+    """This class receives an intervention object"""
 
-    section_title = _('Het interventieonderzoek')
+    section_title = _("Het interventieonderzoek")
     row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'period',
-        'multiple_sessions', 
-        'session_frequency',
-        'amount_per_week',
-        'duration',
-        'measurement',
-        'experimenter',
-        'description',
-        'has_controls',
-        'controls_description',
-        'extra_task'
+        "setting",
+        "setting_details",
+        "supervision",
+        "leader_has_coc",
+        "period",
+        "multiple_sessions",
+        "session_frequency",
+        "amount_per_week",
+        "duration",
+        "measurement",
+        "experimenter",
+        "description",
+        "has_controls",
+        "controls_description",
+        "extra_task",
     ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'study')
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "study")
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if obj.version == 1:
-            fields_to_remove = ['multiple_sessions',
-                                'session_frequency',
-                                'extra_task']
+            fields_to_remove = ["multiple_sessions", "session_frequency", "extra_task"]
             for field in fields_to_remove:
                 rows.remove(field)
         else:
-            rows.remove('amount_per_week')
+            rows.remove("amount_per_week")
             if not obj.multiple_sessions:
-                rows.remove('session_frequency')
+                rows.remove("session_frequency")
             if obj.settings_contains_schools:
-                rows.remove('extra_task')
-        
+                rows.remove("extra_task")
+
         if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
+            rows.remove("setting_details")
+        if not obj.study.has_children() or not needs_details(
+            obj.setting.all(), "needs_supervision"
+        ):
+            rows.remove("supervision")
+            rows.remove("leader_has_coc")
         elif obj.supervision:
-            rows.remove('leader_has_coc')
+            rows.remove("leader_has_coc")
         if not obj.has_controls:
-            rows.remove('controls_description')   
+            rows.remove("controls_description")
 
         return rows
 
+
 class ObservationSection(BaseSection):
-    '''This class receives an observation object'''
+    """This class receives an observation object"""
 
-    section_title = _('Het observatieonderzoek')
+    section_title = _("Het observatieonderzoek")
     row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'days',
-        'mean_hours',
-        'details_who',
-        'details_why',
-        'details_frequency',
-        'is_anonymous',
-        'is_anonymous_details',
-        'is_in_target_group',
-        'is_in_target_group_details',
-        'is_nonpublic_space',
-        'is_nonpublic_space_details',
-        'has_advanced_consent',
-        'has_advanced_consent_details',
-        'needs_approval',
-        'approval_institution',
-        'approval_document',
-        'registrations',
-        'registrations_details'        
+        "setting",
+        "setting_details",
+        "supervision",
+        "leader_has_coc",
+        "days",
+        "mean_hours",
+        "details_who",
+        "details_why",
+        "details_frequency",
+        "is_anonymous",
+        "is_anonymous_details",
+        "is_in_target_group",
+        "is_in_target_group_details",
+        "is_nonpublic_space",
+        "is_nonpublic_space_details",
+        "has_advanced_consent",
+        "has_advanced_consent_details",
+        "needs_approval",
+        "approval_institution",
+        "approval_document",
+        "registrations",
+        "registrations_details",
     ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'study')
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "study")
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if obj.version == 1:
-            to_remove_if_v1 = ['details_who',
-                            'details_why',
-                            'is_anonymous_details', 
-                            'is_in_target_group_details',
-                            'is_nonpublic_space_details',
-                            'has_advanced_consent_details'
-                            ]
+            to_remove_if_v1 = [
+                "details_who",
+                "details_why",
+                "is_anonymous_details",
+                "is_in_target_group_details",
+                "is_nonpublic_space_details",
+                "has_advanced_consent_details",
+            ]
             for field in to_remove_if_v1:
                 rows.remove(field)
 
             if not obj.is_nonpublic_space:
-                rows.remove('has_advanced_consent')
+                rows.remove("has_advanced_consent")
             if not obj.needs_approval:
-                rows.remove('approval_institution')
-                rows.remove('approval_document')
+                rows.remove("approval_institution")
+                rows.remove("approval_document")
             elif obj.study.proposal.is_practice():
-                rows.remove('approval_document')
+                rows.remove("approval_document")
         else:
-            to_remove_if_v2 = ['days', 'mean_hours', 'approval_document']
+            to_remove_if_v2 = ["days", "mean_hours", "approval_document"]
             for field in to_remove_if_v2:
                 rows.remove(field)
 
             if not obj.is_anonymous:
-                rows.remove('is_anonymous_details')
+                rows.remove("is_anonymous_details")
             if not obj.is_in_target_group:
-                rows.remove('is_in_target_group_details')
+                rows.remove("is_in_target_group_details")
             if not obj.is_nonpublic_space:
-                rows.remove('is_nonpublic_space_details')
-                rows.remove('has_advanced_consent')
-                rows.remove('has_advanced_consent_details')
+                rows.remove("is_nonpublic_space_details")
+                rows.remove("has_advanced_consent")
+                rows.remove("has_advanced_consent_details")
             elif obj.has_advanced_consent:
-                rows.remove('has_advanced_consent_details')
-            if not needs_details(obj.setting.all(), 'is_school'):
-                rows.remove('needs_approval')
+                rows.remove("has_advanced_consent_details")
+            if not needs_details(obj.setting.all(), "is_school"):
+                rows.remove("needs_approval")
             if not obj.needs_approval:
-                rows.remove('approval_institution')
+                rows.remove("approval_institution")
 
         if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
+            rows.remove("setting_details")
+        if not obj.study.has_children() or not needs_details(
+            obj.setting.all(), "needs_supervision"
+        ):
+            rows.remove("supervision")
+            rows.remove("leader_has_coc")
         elif obj.supervision:
-            rows.remove('leader_has_coc')
+            rows.remove("leader_has_coc")
         if not needs_details(obj.registrations.all()):
-            rows.remove('registrations_details')
+            rows.remove("registrations_details")
 
         return rows
 
+
 class SessionsOverviewSection(BaseSection):
-    '''This class receives an study object'''
+    """This class receives an study object"""
 
     section_title = _("Het takenonderzoek en interviews")
 
-    row_fields = ['sessions_number']
+    row_fields = ["sessions_number"]
+
 
 class SessionSection(BaseSection):
-    '''This class receives a session object'''
-    
+    """This class receives a session object"""
+
     row_fields = [
-        'setting',
-        'setting_details',
-        'supervision',
-        'leader_has_coc',
-        'tasks_number',       
+        "setting",
+        "setting_details",
+        "supervision",
+        "leader_has_coc",
+        "tasks_number",
     ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'session')
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "session")
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not needs_details(obj.setting.all()):
-            rows.remove('setting_details')
-        if not obj.study.has_children() or \
-        not needs_details(obj.setting.all(), 'needs_supervision'):
-            rows.remove('supervision')
-            rows.remove('leader_has_coc')
+            rows.remove("setting_details")
+        if not obj.study.has_children() or not needs_details(
+            obj.setting.all(), "needs_supervision"
+        ):
+            rows.remove("supervision")
+            rows.remove("leader_has_coc")
         elif obj.supervision:
-            rows.remove('leader_has_coc')
+            rows.remove("leader_has_coc")
 
         return rows
-    
+
+
 class TaskSection(BaseSection):
-    '''This class receives a task object'''
-    
+    """This class receives a task object"""
+
     row_fields = [
-        'name',
-        'duration',
-        'registrations',
-        'registrations_details',
-        'registration_kinds',
-        'registration_kinds_details',
-        'feedback',
-        'feedback_details',
-        'description'
+        "name",
+        "duration",
+        "registrations",
+        "registrations_details",
+        "registration_kinds",
+        "registration_kinds_details",
+        "feedback",
+        "feedback_details",
+        "description",
     ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'task')
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "task")
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not needs_details(obj.registrations.all()):
-            rows.remove('registrations_details')
-        if not needs_details(obj.registrations.all(), 'needs_kind') or \
-        not needs_details(obj.registration_kinds.all()):
-            rows.remove('registration_kinds')
-            rows.remove('registration_kinds_details')
+            rows.remove("registrations_details")
+        if not needs_details(
+            obj.registrations.all(), "needs_kind"
+        ) or not needs_details(obj.registration_kinds.all()):
+            rows.remove("registration_kinds")
+            rows.remove("registration_kinds_details")
         elif not needs_details(obj.registration_kinds.all()):
-            rows.remove('registration_kinds_details')
+            rows.remove("registration_kinds_details")
         if not obj.feedback:
-            rows.remove('feedback_details')
+            rows.remove("feedback_details")
 
         return rows
-    
+
+
 class TasksOverviewSection(BaseSection):
-    '''Gets passed a session object'''
+    """Gets passed a session object"""
+
+    row_fields = ["tasks_duration"]
+
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "task_overview")
 
-    row_fields = [
-        'tasks_duration'
-    ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'task_overview')
-    
 class StudyOverviewSection(BaseSection):
-    '''This class receives a Study object.'''
+    """This class receives a Study object."""
 
-    section_title = _('Overzicht en eigen beoordeling van het gehele onderzoek')
+    section_title = _("Overzicht en eigen beoordeling van het gehele onderzoek")
     row_fields = [
-        'deception',
-        'deception_details',
-        'negativity',
-        'negativity_details',
-        'stressful',
-        'stressful_details',
-        'risk',
-        'risk_details'
+        "deception",
+        "deception_details",
+        "negativity",
+        "negativity_details",
+        "stressful",
+        "stressful_details",
+        "risk",
+        "risk_details",
     ]
 
-    def __init__(self, object):
-        super().__init__(object)
-        self.sub_title = self.get_sub_title(self.object, 'study')
+    def __init__(self, obj):
+        super().__init__(obj)
+        self.sub_title = self.get_sub_title(self.obj, "study")
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         rows_to_remove = []
         for x in range(0, 7, 2):
-            if getattr(obj, rows[x]) == 'N':
-                rows_to_remove.append(rows[x+1])
+            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]
 
-        if not obj.has_sessions and not obj.deception == 'N':
-            rows.remove('deception')
-            rows.remove('deception_details')
+        if not obj.has_sessions and not obj.deception == "N":
+            rows.remove("deception")
+            rows.remove("deception_details")
         elif not obj.has_sessions:
-            rows.remove('deception')
+            rows.remove("deception")
 
         return rows
-    
+
+
 class InformedConsentFormsSection(BaseSection):
-    '''This class receives a Documents object'''
+    """This class receives a Documents object"""
 
-    section_title = _('Informed consent formulieren')
+    section_title = _("Informed consent formulieren")
 
     row_fields = [
-        'translated_forms',
-        'translated_forms_languages',
-        'informed_consent',
-        'briefing',
-        'passive_consent',
-        'passive_consent_details',
-        'director_consent_declaration',
-        'director_consent_information',
-        'parents_information'
+        "translated_forms",
+        "translated_forms_languages",
+        "informed_consent",
+        "briefing",
+        "passive_consent",
+        "passive_consent_details",
+        "director_consent_declaration",
+        "director_consent_information",
+        "parents_information",
     ]
 
     def make_rows(self):
+        """A few fields here need to access different objects, therefore this complex
+        overriding of the make_rows function ... :("""
 
-        '''A few fields here need to access different objects, therefore this complex
-        overriding of the make_rows function ... :( '''
-
-        proposal_list = ['translated_forms', 'translated_forms_languages']
-        study_list = ['passive_consent', 'passive_consent_details']
+        proposal_list = ["translated_forms", "translated_forms_languages"]
+        study_list = ["passive_consent", "passive_consent_details"]
 
         row_fields = self.get_row_fields()
 
@@ -858,99 +899,145 @@ def make_rows(self):
 
         for field in row_fields:
             if field in proposal_list:
-                rows.append(RowClass(self.object.proposal, field))
+                rows.append(Row(self.obj.proposal, field))
             elif field in study_list:
-                rows.append(RowClass(self.object.study, field))
+                rows.append(Row(self.obj.study, field))
             else:
-                rows.append(RowClass(self.object, field))
-    
+                rows.append(Row(self.obj, field))
+
         return rows
-    
+
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not obj.proposal.translated_forms:
-            rows.remove('translated_forms_languages')
+            rows.remove("translated_forms_languages")
         if obj.proposal.is_practice() or not obj.informed_consent:
-            rows.remove('informed_consent')
-            rows.remove('briefing')
+            rows.remove("informed_consent")
+            rows.remove("briefing")
         if obj.study.passive_consent is None:
-            rows.remove('passive_consent')
+            rows.remove("passive_consent")
         if not obj.study.passive_consent:
-            rows.remove('passive_consent_details')
+            rows.remove("passive_consent_details")
         if not obj.director_consent_declaration:
-            rows.remove('director_consent_declaration')
+            rows.remove("director_consent_declaration")
         if not obj.director_consent_information:
-            rows.remove('director_consent_information')
+            rows.remove("director_consent_information")
         if not obj.parents_information:
-            rows.remove('parents_information')
+            rows.remove("parents_information")
 
         return rows
-    
+
+
+class InformedConsentFormsSectionDiff(DiffSection):
+    """As the regular Informed Consent section, the diff version needed its own version of an 
+    overwritten make_rows method ... :("""
+
+    def make_diff_rows(self):
+        if self.missing_object is not None:
+            # If there is a missing object, the template can just use the make_rows function
+            # of the object that is not missing.
+            if self.missing_object == "old":
+                rows = self.new_object.make_rows()
+            else:
+                rows = self.old_object.make_rows()
+            return rows
+        else:
+            # Note: This uses the 2 new variables replacing 'objects' I proposed earlier
+            old_fields = self.old_object.get_row_fields()
+            new_fields = self.new_object.get_row_fields()
+
+            proposal_list = ["translated_forms", "translated_forms_languages"]
+            study_list = ["passive_consent", "passive_consent_details"]
+
+            # creating a list containing all fields in all objects
+            all_fields = set(old_fields)
+            all_fields.update(new_fields)
+
+            rows = []
+
+            for field in all_fields:
+                if field in proposal_list:
+                    rows.append(
+                        DiffRow(
+                            field,
+                            self.old_object.obj.proposal,
+                            self.new_object.obj.proposal
+                        )
+                    )
+                elif field in study_list:
+                    rows.append(
+                        DiffRow(
+                            field, self.old_object.obj.study, self.new_object.obj.study
+                        )
+                    )
+                else:
+                    rows.append(
+                        DiffRow(field, self.old_object.obj, self.new_object.obj)
+                    )
+            return rows
+
+
 class ExtraDocumentsSection(BaseSection):
-    '''This class receives an Documents object.
-    Overrides the __init__ to create a formatted section title'''
+    """This class receives an Documents object.
+    Overrides the __init__ to create a formatted section title"""
 
-    row_fields = [
-        'informed_consent',
-        'briefing'
-    ]
+    row_fields = ["informed_consent", "briefing"]
+
+    def __init__(self, obj, num):
+        super().__init__(obj)
+        self.section_title = _("Extra formulieren ") + str(num + 1)
 
-    def __init__(self, object, count):
-        super().__init__(object)
-        self.section_title = _('Extra formulieren ') + str(count + 1)
-    
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not obj.informed_consent:
-            rows.remove('informed_consent')
+            rows.remove("informed_consent")
         if not obj.briefing:
-            rows.remove('briefing')
+            rows.remove("briefing")
+
+        return rows
+
 
-        return rows   
-    
 class DMPFileSection(BaseSection):
-    '''This class receives a proposal object
-    Also unnecessary I suppose. But I though why not ...'''
+    """This class receives a proposal object
+    Also unnecessary I suppose. But I though why not ..."""
+
+    section_title = _("Data Management Plan")
+
+    row_fields = ["dmp_file"]
 
-    section_title = _('Data Management Plan')
-    
-    row_fields = ['dmp_file']
 
 class EmbargoSection(BaseSection):
-    '''Gets passed a proposal object'''
+    """Gets passed a proposal object"""
 
-    section_title = _('Aanmelding versturen')
+    section_title = _("Aanmelding versturen")
 
-    row_fields = [
-        'embargo',
-        'embargo_end_date'
-    ]
+    row_fields = ["embargo", "embargo_end_date"]
 
     def get_row_fields(self):
         rows = copy(self.row_fields)
-        obj = self.object
+        obj = self.obj
 
         if not obj.embargo:
-            rows.remove('embargo_end_date')
+            rows.remove("embargo_end_date")
 
         return rows
 
+
 class CommentsSection(BaseSection):
-    '''Gets passed a proposal object.'''
+    """Gets passed a proposal object. Again has a pretty funky overwritten render method
+    to account for formatting in <p> elements, similar to the GeneralSection."""
 
-    section_title = _('Ruimte voor eventuele opmerkingen')
+    section_title = _("Ruimte voor eventuele opmerkingen")
 
-    row_fields = [
-        'comments'
-    ]
+    row_fields = ["comments"]
 
     def render(self, context):
         context = context.flatten()
-        template = get_template('proposals/table_and_text_with_header.html')
+        template = get_template("proposals/table_and_text_with_header.html")
         rows = self.make_rows()
         context.update(
             {
@@ -959,24 +1046,23 @@ def render(self, context):
                 "paragraph_rows": rows,
             }
         )
-        return template.render(context)    
+        return template.render(context)
+
 
-def get_extra_documents(object):
-    '''A function to retrieve all extra documents for a specific proposal.'''
+def get_extra_documents(obj):
+    """A function to retrieve all extra documents for a specific proposal."""
     from studies.models import Documents
 
     extra_documents = []
 
-    for document in Documents.objects.filter(
-        proposal = object,
-        study__isnull = True
-    ):
+    for document in Documents.objects.filter(proposal=obj, study__isnull=True):
         extra_documents.append(document)
-    
+
     return extra_documents
-    
+
+
 def create_context_pdf(context, model):
-    '''A function to create the context for the PDF, which gets called in the ProposalAsPdf view.'''
+    """A function to create the context for the PDF, which gets called in the ProposalAsPdf view."""
 
     sections = []
 
@@ -985,11 +1071,10 @@ def create_context_pdf(context, model):
 
     if model.wmo.status != model.wmo.NO_WMO:
         sections.append(METCSection(model.wmo))
-    
+
     sections.append(TrajectoriesSection(model))
 
     if model.wmo.status == model.wmo.NO_WMO:
-
         for study in model.study_set.all():
             sections.append(StudySection(study))
             if study.has_intervention:
@@ -1007,128 +1092,182 @@ def create_context_pdf(context, model):
             sections.append(InformedConsentFormsSection(study.documents))
 
         extra_documents = get_extra_documents(model)
-        
-        for count, document in enumerate(extra_documents):
-            sections.append(ExtraDocumentsSection(document, count))
+
+        for num, document in enumerate(extra_documents):
+            sections.append(ExtraDocumentsSection(document, num))
 
         if model.dmp_file:
             sections.append(DMPFileSection(model))
-            
+
         sections.append(EmbargoSection(model))
         sections.append(CommentsSection(model))
 
-    context['sections'] = sections
-    
+    context["sections"] = sections
+
     return context
 
-def multi_sections_missing_objects(section_type, list_of_objects, count = None):
-    '''A function that creates a list of sections of a specified type, from a list of
-    objects, where it is possible for an object, such as a study, to be missing.
-    Gets called in the create context diff.'''
-    if count is None:
-        return [section_type(obj) if obj is not None else obj for obj in list_of_objects]
-    else:
-        return [section_type(obj, count) if obj is not None else obj for obj in list_of_objects]
 
-def create_context_diff(context, p_p, p):
-    '''A function to create the context for the diff page which gets 
-    called in the ProposalDifference view.
-    It gets a little crazy with the list comprehensions, but it works, i guess ...
-    I am using 'p' as a shorthand for proposal and 'p_p' for parent proposal
-    to cut down on the verbosity here ...'''
+def multi_sections(section_type, objects, num=None):
+    """A function that creates a list of sections of a specified type, from a list of
+    objects, where it is possible for an object, such as a study, to be missing."""
 
-    both_ps = [p_p, p]
+    if num is None:
+        return [section_type(obj) if obj is not None else None for obj in objects]
+    else:
+        return [section_type(obj, num) if obj is not None else None for obj in objects]
 
-    sections = []
 
-    sections.append(DiffSection([GeneralSection(p) for p in both_ps]))
-    sections.append(DiffSection([WMOSection(p.wmo) for p in both_ps]))
+def get_all_related(objects, related_name):
+    """Helper function for retrieving related objects"""
 
-    if p.wmo.status != p.wmo.NO_WMO or p_p.wmo.status != p_p.wmo.NO_WMO:
-        sections.append(DiffSection([METCSection(p.wmo) for p in both_ps]))
-    
-    sections.append(DiffSection([TrajectoriesSection(p) for p in both_ps]))
+    return [
+        getattr(obj, related_name, None) if obj is not None else None for obj in objects
+    ]
 
-    if p.wmo.status == p.wmo.NO_WMO or p.wmo.status == p.wmo.JUDGED:
 
-        for p_study, study in zip_equalize_lists(p_p.study_set.all(), p.study_set.all()):
+def get_all_related_set(objects, related_name):
+    """Helper function for retrieving a set of related objects."""
 
-            both_studies = [p_study, study]
+    return [
+        getattr(obj, related_name, None).all() if obj is not None else None
+        for obj in objects
+    ]
 
-            sections.append(DiffSection(multi_sections_missing_objects(StudySection, 
-                                                                       both_studies)))
 
-            if p_study is not None and p_study.has_intervention or \
-                study is not None and study.has_intervention:
+def create_context_diff(context, old_proposal, new_proposal):
+    """A function to create the context for the diff page."""
 
-                interventions = [study.intervention if study is not None
-                                 else study for study in both_studies]
-                
-                sections.append(DiffSection(multi_sections_missing_objects(InterventionSection,
-                                                                           interventions)))
+    sections = []
 
-            if p_study is not None and p_study.has_observation or \
-                study is not None and study.has_observation:
+    sections.append(
+        DiffSection(GeneralSection(old_proposal), GeneralSection(new_proposal))
+    )
+    sections.append(
+        DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
+    )
 
-                observations = [study.observation if study is not None
-                                 else study for study in both_studies]
-                
-                sections.append(DiffSection(multi_sections_missing_objects(ObservationSection,
-                                                                           observations)))
+    if (
+        new_proposal.wmo.status != new_proposal.wmo.NO_WMO
+        or old_proposal.wmo.status != old_proposal.wmo.NO_WMO
+    ):
+        sections.append(
+            DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
+        )
 
-            if p_study is not None and p_study.has_sessions or \
-                study is not None and study.has_sessions:
+    sections.append(
+        DiffSection(
+            TrajectoriesSection(old_proposal), TrajectoriesSection(new_proposal)
+        )
+    )
 
-                sections.append(DiffSection(multi_sections_missing_objects(SessionsOverviewSection,
-                                                                           both_studies)))
+    if (
+        new_proposal.wmo.status == new_proposal.wmo.NO_WMO
+        or new_proposal.wmo.status == new_proposal.wmo.JUDGED
+    ):
+        for old_study, new_study in zip_equalize_lists(
+            old_proposal.study_set.all(), new_proposal.study_set.all()
+        ):
+            both_studies = [old_study, new_study]
+
+            sections.append(DiffSection(*multi_sections(StudySection, both_studies)))
+
+            if (
+                old_study is not None
+                and old_study.has_intervention
+                or new_study is not None
+                and new_study.has_intervention
+            ):
+                interventions = get_all_related(both_studies, "intervention")
+
+                sections.append(
+                    DiffSection(*multi_sections(InterventionSection, interventions))
+                )
 
-                p_sessions_set, sessions_set = [study.session_set.all() if study is not None
-                                                else study for study in both_studies]
-                
-                for both_sessions in zip_equalize_lists(p_sessions_set, sessions_set):
+            if (
+                old_study is not None
+                and old_study.has_observation
+                or new_study is not None
+                and new_study.has_observation
+            ):
+                observations = get_all_related(both_studies, "observation")
 
-                    sections.append(DiffSection(multi_sections_missing_objects(SessionSection,
-                                                                               both_sessions)))
+                sections.append(
+                    DiffSection(*multi_sections(ObservationSection, observations))
+                )
 
-                    p_tasks_set, tasks_set = [session.task_set.all() if session is not None
-                                              else session for session in both_sessions]
-                    
-                    for both_tasks in zip_equalize_lists(p_tasks_set, tasks_set):
+            if (
+                old_study is not None
+                and old_study.has_sessions
+                or new_study is not None
+                and new_study.has_sessions
+            ):
+                sections.append(
+                    DiffSection(*multi_sections(SessionsOverviewSection, both_studies))
+                )
 
-                        sections.append(DiffSection(multi_sections_missing_objects(TaskSection,
-                                                                                   both_tasks)))
+                old_sessions_set, new_sessions_set = get_all_related_set(
+                    both_studies, "session_set"
+                )
 
-                sections.append(DiffSection(multi_sections_missing_objects(TasksOverviewSection,
-                                                                           both_sessions)))
+                for both_sessions in zip_equalize_lists(
+                    old_sessions_set, new_sessions_set
+                ):
+                    sections.append(
+                        DiffSection(*multi_sections(SessionSection, both_sessions))
+                    )
 
-            sections.append(DiffSection(multi_sections_missing_objects(StudyOverviewSection,
-                                                                       both_studies)))
+                    old_tasks_set, new_tasks_set = get_all_related_set(
+                        both_sessions, "task_set"
+                    )
 
-            both_documents = [study.documents if study is not None 
-                              else study for study in both_studies]
-            
-            sections.append(DiffSection(multi_sections_missing_objects(InformedConsentFormsSection,
-                                                                       both_documents)))
+                    for both_tasks in zip_equalize_lists(old_tasks_set, new_tasks_set):
+                        sections.append(
+                            DiffSection(*multi_sections(TaskSection, both_tasks))
+                        )
 
-        p_extra_docs = get_extra_documents(p_p)
-        extra_docs = get_extra_documents(p)
+                sections.append(
+                    DiffSection(*multi_sections(TasksOverviewSection, both_sessions))
+                )
 
-        if p_extra_docs or extra_docs:
-            for count, zipped_extra_docs in enumerate(zip_equalize_lists(p_extra_docs, extra_docs)):
-                sections.append(DiffSection(multi_sections_missing_objects(ExtraDocumentsSection,
-                                                                           zipped_extra_docs,
-                                                                           count)))
+            sections.append(
+                DiffSection(*multi_sections(StudyOverviewSection, both_studies))
+            )
 
-        if p_p.dmp_file or p.dmp_file:
-            sections.append(DiffSection(multi_sections_missing_objects(DMPFileSection,
-                                                                       both_ps)))
-            
-        sections.append(DiffSection([EmbargoSection(p) for p in both_ps]))
-        sections.append(DiffSection([CommentsSection(p) for p in both_ps]))
+            both_documents = get_all_related(both_studies, "documents")
 
-    context['sections'] = sections
+            sections.append(
+                InformedConsentFormsSectionDiff(
+                    *multi_sections(InformedConsentFormsSection, both_documents)
+                )
+            )
 
-    return context
+        old_extra_docs = get_extra_documents(old_proposal)
+        new_extra_docs = get_extra_documents(new_proposal)
+
+        if old_extra_docs or new_extra_docs:
+            for num, zipped_extra_docs in enumerate(
+                zip_equalize_lists(old_extra_docs, new_extra_docs)
+            ):
+                sections.append(
+                    DiffSection(
+                        *multi_sections(ExtraDocumentsSection, zipped_extra_docs, num)
+                    )
+                )
+
+        if old_proposal.dmp_file or new_proposal.dmp_file:
+            sections.append(
+                DiffSection(
+                    *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+                )
+            )
 
+        sections.append(
+            DiffSection(EmbargoSection(old_proposal), EmbargoSection(new_proposal))
+        )
+        sections.append(
+            DiffSection(CommentsSection(old_proposal), CommentsSection(new_proposal))
+        )
 
+    context["sections"] = sections
 
+    return context

From 3134534cf74096f895b07d1fec8fa05d1cb20795 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 12 Oct 2023 10:29:24 +0200
Subject: [PATCH 039/148] Michael's requests

---
 proposals/utils/pdf_diff_logic.py | 37 +++++++++++++++++++++++++------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 2c77d5391..2632e9046 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -120,8 +120,13 @@ def make_diff_rows(self):
             new_fields = self.new_object.get_row_fields()
 
             # creating a list containing all fields in all objects
-            all_fields = set(old_fields)
-            all_fields.update(new_fields)
+            all_fields_set = set(old_fields)
+            all_fields_set.update(new_fields)
+
+            # reordering the fields according to the row_fields class variable
+            all_fields = [
+                field for field in self.old_object.row_fields if field in all_fields_set
+            ]
 
             rows = [
                 DiffRow(field, self.old_object.obj, self.new_object.obj)
@@ -406,13 +411,19 @@ def get_task_title(self, task):
                 )
             return task_title
 
+
 class PageBreakMixin(BaseSection):
     """A Mixin for adding page break formatting to a section."""
 
     def render(self, context):
-        context.update({"page_break": True})
+        context.update(
+            {
+                "page_break": True,
+            }
+        )
         return super().render(context)
 
+
 class GeneralSection(BaseSection):
     """This class generates the data for the general section of a proposal and showcases
     the general workflow for creating sections. All possible row fields are provided, and
@@ -588,7 +599,7 @@ def get_row_fields(self):
             rows.remove("necessity_reason")
         if not needs_details(obj.recruitment.all()):
             rows.remove("recruitment_details")
-        if not obj.compensation.needs_details:
+        if not obj.compensation or obj.compensation.needs_details:
             rows.remove("compensation_details")
         if not obj.hierarchy:
             rows.remove("hierarchy_details")
@@ -931,7 +942,7 @@ def get_row_fields(self):
 
 
 class InformedConsentFormsSectionDiff(DiffSection):
-    """As the regular Informed Consent section, the diff version needed its own version of an 
+    """As the regular Informed Consent section, the diff version needed its own version of an
     overwritten make_rows method ... :("""
 
     def make_diff_rows(self):
@@ -963,7 +974,7 @@ def make_diff_rows(self):
                         DiffRow(
                             field,
                             self.old_object.obj.proposal,
-                            self.new_object.obj.proposal
+                            self.new_object.obj.proposal,
                         )
                     )
                 elif field in study_list:
@@ -983,7 +994,13 @@ class ExtraDocumentsSection(BaseSection):
     """This class receives an Documents object.
     Overrides the __init__ to create a formatted section title"""
 
-    row_fields = ["informed_consent", "briefing"]
+    row_fields = [
+        "informed_consent",
+        "briefing",
+        "director_consent_declaration",
+        "director_consent_information",
+        "parents_information",
+    ]
 
     def __init__(self, obj, num):
         super().__init__(obj)
@@ -997,6 +1014,12 @@ def get_row_fields(self):
             rows.remove("informed_consent")
         if not obj.briefing:
             rows.remove("briefing")
+        if not obj.director_consent_declaration:
+            rows.remove("director_consent_declaration")
+        if not obj.director_consent_information:
+            rows.remove("director_consent_information")
+        if not obj.parents_information:
+            rows.remove("parents_information")
 
         return rows
 

From e694489f285d97a6e23702b109063a042d1abd67 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 23 Oct 2023 10:29:21 +0200
Subject: [PATCH 040/148] Fixed original purpose of the PR, Michaels comment
 ...

---
 proposals/utils/pdf_diff_logic.py | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 2632e9046..069750db4 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -118,6 +118,8 @@ def make_diff_rows(self):
         else:
             old_fields = self.old_object.get_row_fields()
             new_fields = self.new_object.get_row_fields()
+            
+            irrelevant_fields = [field for field in old_fields if field not in new_fields]
 
             # creating a list containing all fields in all objects
             all_fields_set = set(old_fields)
@@ -128,10 +130,13 @@ def make_diff_rows(self):
                 field for field in self.old_object.row_fields if field in all_fields_set
             ]
 
-            rows = [
-                DiffRow(field, self.old_object.obj, self.new_object.obj)
-                for field in all_fields
-            ]
+            rows = []
+
+            for field in all_fields:
+                if field in irrelevant_fields:
+                    rows.append(DiffRow(field, self.old_object.obj, None))
+                else:
+                    rows.append(DiffRow(field, self.old_object.obj, self.new_object.obj))
 
             return rows
 
@@ -184,7 +189,7 @@ def get_verbose_name(self, field):
         else:
             return mark_safe(
                 self._get_object()._meta.get_field(field).verbose_name
-                % self.obj.net_duration()
+                % self._get_object().net_duration()
             )
 
 

From 51355c601c602d44a7c42bfadbfff99c98e4ea30 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 23 Oct 2023 12:11:09 +0200
Subject: [PATCH 041/148] Initial implementation of new pdf styling. Looks ugly
 tho

---
 .../proposals/pdf_font/OpenSans-Bold.ttf      | Bin 0 -> 130864 bytes
 .../proposals/pdf_font/OpenSans-Regular.ttf   | Bin 0 -> 130836 bytes
 .../templates/proposals/proposal_pdf.html     |  58 +++++++++++++-----
 .../proposals/table_and_text_with_header.html |  21 -------
 .../proposals/table_with_header.html          |  15 +++--
 proposals/utils/pdf_diff_logic.py             |  38 +-----------
 6 files changed, 53 insertions(+), 79 deletions(-)
 create mode 100644 proposals/static/proposals/pdf_font/OpenSans-Bold.ttf
 create mode 100644 proposals/static/proposals/pdf_font/OpenSans-Regular.ttf
 delete mode 100644 proposals/templates/proposals/table_and_text_with_header.html

diff --git a/proposals/static/proposals/pdf_font/OpenSans-Bold.ttf b/proposals/static/proposals/pdf_font/OpenSans-Bold.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..4a5bc3958b164df21ed073620b89b58c1d1e420c
GIT binary patch
literal 130864
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
F{|o0Ho-Y6Z

literal 0
HcmV?d00001

diff --git a/proposals/static/proposals/pdf_font/OpenSans-Regular.ttf b/proposals/static/proposals/pdf_font/OpenSans-Regular.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..29e9e605d38445507c405b444419ed76c7e63bfd
GIT binary patch
literal 130836
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%0D63!IPi3
zFo--3`R5P(gag-1c}_y+%Q86mAj;w~1}#MSHTaA+eq($Kzu|@hhCccy`Z4_O!KYZm
z^bqYA{C<Yt#ag1)PxEExw0`V9wg<muYy`8?lXNF7ra|Nac?YY*M6}3T^+hnUC5S1_
z^wJofa|USJwH?|{ZI`xNyF=Tf?bY_-6STXu1KL6DZtV}+J=(q6ecB)KDfBUX9(`Eb
zkJ<xBJW0T*hMRF#;TG~0IfK&$-;uNA2l6jkN^9sme3o@5K1Y9)J+C=5r?%}fjzPqr
zJ)!+cds6!||3n)jA5H#FPLWT^KfI;TSA8f_6k5-<TlPOiKm%qt6g}vLXVMLj+yres
z;;~u>;sWs`TL9Wd$eZuPcpLcKU$w#DXZwgx1Sjc*dXZkNPu8dCQ}q%(N6*#s^ig`g
zUZ9WG$LM4AacGZ$KlDYn>FIcSyP}nA+2gfZ=B<eO1U$xF-3oH-x<gOaow`d;(Npy_
zJ^jD*WrALESu2nf&ZRIsUGvttq@=X)W&x6GzzGT-DDViZr#V>9xdw8Z5YMGJOX1OT
zd~OV!p;RG%VkP^2l@o#bp7tpj0lu;=t7@wka<PtyGQpxxRy_%6-dYHPv?qdfjQ4kl
zo-N8!yd~*s)yQ<Dc-bymAHDZwDWe|6>&uz(()oyb@K2ufI&D6=0c(8w6`xDhv;HXC
zg9PA-{Mx?MjNP(_CznD$@%hzky;Ps3PlxSYr_aQv$YpxDUZKy?p4Ohxp4Fbyp4VQ`
zUeu1GX21W~_82_ZPk=Q}!rp2Mo@hLrFn{!4NKyKdmnP;8pO|gdj%W{ps?%Atl`f^X
zUS<niKHR2tG{mrX;xbFRW<H-&nLk0ym#pUxs#Qptq22`ElF$oYlBWnhoxYrwBxv15
z%v+Fs+@d|K-KsqzN?srrsS$5@JR=h&Jf9-+64XS^I0w^sS&4plH?$RJT5i)G)3#|x
zaq8u9<oc2q$cyBC@&SCx_cWP0FB?}2d~+R{iM{)1yq8IV9}0&rK<k<tb`~bEOJ3}v
z7rWrae(_>Id$FIq*f(D6D~0*toXsoR``U-vN7_m4l=cZu-E{e+Mo3~9^k2tbGZecu
ze{CtwKl$ngoodSz#<b-EGlI54VeGORi@Y^%@YY!Dt+B*g12ai)q_<qgeG53R!>O(|
zoS2vbZ<j^VU<ZS^6d*N*111dmZq%?F(Sx)WoD&M7+$ZWd5yf*k_JJ3B(Sy-sfyuf}
z9M`VDtnPQ7a+o7eD=#R_AN->+D-QG|2k*+p!kgffm9TWKH8ath2eeL{RKkfRoK}(^
zBvyD3?m4nhrVncK8r&1;p0i`{B0N7FLHY*1o-%Qw3WLR|Gj0J!@EZr6`G$U{;q;c`
zO7RS4V|`e6=1YIV35yTu33`k^NDt6$bRAtp+h`-L!x@ZeSU1N*W3%Wmnu4<@u{45)
z(gCy=4TNSB@(VeKb?ytCIQtN5>ucmC@*H^zC(<6o3B5z;jlb{!1pcKvQhepmh#9}#
zVD*zggEo^MG=K)+Y#d)vdI_H$f>omgw#eZ5vF2a}7>hVnAA>kWAC1_h7a(@xBqGB~
zF$%Fm&qHk2a}nG09K`8pgV&vkI8~p5I7Od~*rgXEcIrilll4Nx4t)}0yFL-IO`m|C
zhKRK;nDZrrIA1c5^Cbf~U(%oRg*OCW(wFna3JSiYH~4DWN^KQRurckZ-hz0Wb|+!1
zzxF)ZuGi;at{3V_=vy{c*b3}FhUkgtV-{B2a-`Dr1oSl%D{vV~F3{uA=M1dKvyhjj
z$D!{du|h**SgIb2F^s^9eI4ewU5~+7hGPYvfmE9wjWG?w37F|f-JnNdY(sG(W*YI)
z=Id6Bafm)1GA>1*>h#%&YxG*gRXWc7dG&H98I5(Qf$xR*nu#6C(_BxbmnVy*m-p_H
zJU&b9V$`ll?wOQN<ercFGwh*m!7geu_EGTWYA^K{uKk`JmEOwFS!nyw*C>o724jtb
zED|6q?sZ2)-y_6+i?83K$rz#Iay2PbtBGeP=JA`J{gm99iG3ONgTg;^FU)-^_Gz=Q
zQ)|Uu4J(V>uhEyd<#=~(F7B<hZIItk$ags8KN9nkiTT6IoiTdH_S?6uU325=RV!C4
zU$%6~;u{t%TrhuLds}PE_03I<a~tN&uCJ@DsjjN5C@-5e^ST++r<ImWoie$&Xwt+9
z<HwC1GrAyuR9>_x$louX9trTzwq#fPC&ZH@{sBM(65?s6F}u@85IZNtnQ`o`By3D!
zNp4PXSXgPWC9E@}Q;*E$p}eZ2(vwk&CQu7?(ZrY{%a}>iO3b+(Wug`+#aE<cej0C4
z<SDF^Wfzxp=EZ?7a%6gxNTZ-k=3kXv;K{a_JITb3j;bR>i$pUS!AGb-4B6{TF_KbC
zXGNSP%u-T~rjGcMz_8-7Y+!*NjG9M*gZXF>sX(ZlYB@?3Hm#)7Tvk(>kJ5xic8b5E
zqr_!dAn~$JbEVnbX^gZ~Of2aL>!f9tV3jT`fy8Kea7UOW%v@S})cte_FKr1!Ta08K
zvCwssj%3hvMbk>aw9~w<xa2`bS#}u?6GkAf<fxf+W(X?dR8HhY%sfHHP|VDO%vY2T
zKAJ%~my29o5Jb8XqYyM%=<y8bcI8nfX+fgg5i4he9EKcS=46N*&~(szC2hGZ9j!|H
zA}5IFJdOpDKy>J{{DG7(ks1Dm4BrgDj6l|nVJ<l7K~SE6_4`rsP$2C_gO8w1i~!`L
zbomj#j9~N@ElJW7bU8|L+Hx-qJ?F(PYX~gmz$bT&VDhw*hXM)O7coj?@t=hF+#_s!
zoTW>xCzW6VbC1yRab-~LF-U5Wxn`(!XGT#8FIyH2oewK5%}I#o+GQ@WR0ms1kM!x&
z(VTlEC@6bOM>Z54x+WCtNV(Bk7S~bI$yJUknk8rm)K-fusI=sjp@;=$gTDfhDyNvs
zIxEWJfSQByI*@IyEa#<3zavbGJc9GZbOadzxfugH{Vmm5odK3CZ_Y?EQsx+Wj*lg)
zllGHR&$Z;52h?{|S}LG{852utgKJ95(ROEsrMy$OWCb75NfxYY0L74UkC5?k7~2@=
z;Doq|(_y4s80L<S9P^P3-CAB*&eJ(zu=@^`Wy#6mM(e4OYwqaGD6cF-iQH0AI3XTg
z=*YE{o2%eFFkDEk$ik1$PUBpPr<HUBR#~bnkZ?vuM>&QaY_2Q~?kKGk5=VE?HIfi-
z=<-g=IWg`7A}ebU!7M7uEEST#t@CPH?bU=Dl)9W|8O_<Dv!i*h0Xs%pa;s2+hw`dU
z4O$pxuELpKt}<kz@EgBb2u*kknK7rL@s6OOTyJ;^`67h`{yI8quT0i?lX=L7GU$<s
zQdc^4E7!b|u+G`Roeia2Uu2Q;&gB(2IT~acV&Rd{vr)($Rn}>U9M!qJvK-@pPlE1&
zFd77NNd<Hn4d#_~cr*^xbgP$BXCvnRvL@kDX)#!{NG^rW<rB?irRK6SP_Zb41)Dn!
zfaaQVu3X&hP6U7aO@!|UDDNmjUBV40xYGwKKuvkIB@E6Tv{E5gF@4}Z8X8j4NrF2%
zEFGN`U5v~_VKi^;G+GNdz+ZEmrMw!G$oZMet3};BbXQ1+_b)it5>|>LERxHe3l83*
zf=87d(8kW|U~PuTo*lh9%;_EQTGzqh>ek9BWmp!>LFPQOnCfz9G8aMtPnDt}S<nv_
zE9#>O-kZ5`N3QdU?4p1e+1V5)3;T*z(X+ym&WW5U|ML-lK(3GLWc|~S$tQ>w!hgUk
zV4}G243Py8Zw6E^nAbLUGAw1nX~_BoylSwbsA`}HzspxmtShn$0kXf6sgbwe87Thz
zB0GH}G0~km`XIA?_;5UJ3LKr5b<ibrR}KI;Sn+j^|A~Q=se~R0v7<e)H1YxPna?PP
z)t6g>kGhXdgpVvks?1Va%Gu)&YR7AcraNTATwG|`_nM+moFwyr$j$(i;zN)G8T&_e
z;tzvDpLw1X99V!P`pfw!>7iFV1<47y3DNNiTI5<j5in9^ch$k2b)|7tvN59s1!j0u
zc<#zcVz)6J)?f+qfgghe;LyySMR8a}#Mst~8dj({cOhIWX`Y4TL5CEAR~Vhdl23U=
zU|N>^PKKlxvpk6RF20sD4*V=>M;P^iw}%h51a%99qwlCJtC9;fq)gI+hw-fv<bjFC
zALe!*cTL45hG3mr7A&fBzMN8+739JTc=PAO6LM)uN&51<4sRwGq^QiL4bv3yyf|O9
z_v>06zQ2zdR6)#Ur=REu_eNG<-m%|ig$D#aL8CbX049eqnh(VQLBpmyIx5St!@90J
zx6nXqPtbc|Oz9X}x*8i~vl!!^$ho5r7_dkdm+;{SKnaBM1Rx^_a(r5<b^tPiFz~10
z&{V&Vy4_rWs<adx<cs!%o~vwO7`!oFZ+=`Uusj~hP%4iHWk~_bN&~O*`l@+3r+!yv
zTD*<%h2G+Ak*AK(Kx~HfU;{W>%|Q^?5HWRDj0EY9AxEf>RTY3n24R>(IywR@a!Ijp
z_y0JaI*8a@l2Ul*D+!%TF!dcBzTK{!<9l`aZlVG=e#~+=FXXK#bMVjZ49MpD7ffKM
zANNCvnBOJOb9IAOi0#B>%b_4)Sjt%CA~}G|9)d;{NW4inGhWamw;Ey6vbn3N#U)F?
zgiGpq2qUPI0vfDgJOp#m37zYNWi-W=$}QItt{W?bNv(`Co9nU9%BI+DVW9+WhBrWI
zU#oC(9oX>Hmt$#$AL4$ebO82Jg?x96Cjd*3nGPev<YSRVYFrW406nr~Sa5nNo-2;J
zzYO923Zh|H<PnNH%;un;$m%fn!h=TVjocJ<m1hw&tl~ziD#b@|V_ZjvEXVicfvjUp
z5rn{>*!<Ii{n01y^Vjyc|CEizDZ3c{>L{tREC}PWI7(((7Gk@QZRs?dXTT|9sXt1_
zg_L%5U`g$;@aL*2{6PmX&!k6*Erjn6_+G|aesBn$)h;Ilq5+KUsQca!{@~QbcZHYl
zeDLKx=<qN;N@}mkma80{&SUW>hI*7>HMYo(=vKwMV@Ag`JT8VEC83<X>JLwM58-ZH
zbm&&zA^jEdG{FzU=V2lYCfhU{S!;+RPW@K0%y<W>F}y{Z=+k5^n?VW@M(A~<6nV9*
z7b#-5f;Nb3W8dOU4`>LFBUB^IK!`_JjnIa09Rkm<73Bw!OqFisP-`P5pLjCQfKSc9
z`#8Q`y2NmT9LGDN<9J7V-0(WmpONEi7=qP3LkF%WkmEiMa@=S{NGD75*A)B?d6lFd
z{p@9U8~u46-`K7sq558YMzjzw3Ad8*Y!5la`wW;2{u8wo?h7o96oTJO{U783?QPNm
z*rG2bE$j&DmJpNv1$lrO$UbIpZ`Pdxf54}XJizJT&C5T4aJ`m``mbS}?-Mif?!tR!
zVob)nF&l}}`5VY%;D;}u>(%rOV78D6mp^0=oXal<VIhKvm(fGWBK<C!V!WGFu{TMM
z_HQx)d9_^joTd}^FWOwZ<KndA_&)P-5-G-VmONk>P8M-_(-&|q@;DjGE|P52A7?m2
zvW$@=-Z+GWLG~^ocP{&@g7GZAyNtOI^T6jq1vbom4s-D^;0Zt@=4yy%9{5~b9?-8F
zd796~<w48^=1e~ixpBE)BN#s;GsRqB9{5~%0_NZ+%*D-sk05-mzf7+8&I6x|%LC*h
z(wGZAAKrku5OW5|$Ibcw3S#V>KbOHZA=gpp2_HY&Z4vU}{p51`50L9K*QwuxT))3?
zKL(vAXtxjK{6~!QCcqy6-vRs_@J-0R1ahzg{u%E}kL&)>PuK_YHVYepo^oA<tsLg^
z;x+@gN<mIPj?cL`9E3V&`5c1Z16M;sJz-v&w6zvKr(CWc=u<<M_-rH1I_!_zfPzaD
zyp7u=w~OC|uvcL-S3zOJn77{xxvdL(<F?M{SlK+cJ8t`zLv|bbc`JF!(9?a1&p+39
zu5+F-dHRa+6!O5%1NI_?v;lYp;I~M3Ak2gB*u#AFJ=Dx~h})c@FWS1veTkh0ycu@%
z0N`r(S@xLwZDD8db9xNIeiAA41%2Z_j`PNR9vAcXCVZFjaqwr^JkRhZ^0?isBl+CN
z@$nhU;P2qyjOC=sIFd}@Hp%Jwr=&%D1OA%(uE)sT`YGr?Xa*hQ?oa&S|C@Qf_8xSW
z`>`j;^`actnSA#-9X<q~2N3OVm{-iT!G$;duaX1WhbRxd*Zzuk`)JefB+}E}-x>YL
zT}C@;#TdU7yto}ApVRml4IiVw7_(t8bO-vt$I1K3b=KzwLVfO0Wlmvy-{U?7j8)j=
zKLC}y3=2shZ_D^6e9m<bnPBWgUg80KjvMx&4amzQM~|$8596{zn;u#5GKLN0ux}<g
z?mGtf5?liESHNBf0c0d@sNlR4xnAhcka_xc`1MxEV+Z^=Y};@OpCNusvJL&<XA$&p
zgsr3-#(2LW2sj`6kAP}D(VinQTptaOLzY+z3=DZ6kexoE<N=>Vw6Tm>;gcWGkAlw+
zB-6Mbcq0iHegr;%^VZHn=6r3D>k#(=n~jf=Za#xi7G*>qxX%BKbSms{0oqpfa5WVA
z!OP-|IS#RipyjzQ(CH)?VGurL&g3|INrXYr|4h9nS&6VvW8_}w;x@mTq=x<<*0Xdn
zk<~))YRNe54AvXtrPZ1Z<G&TMyOrb_tz-|N)3~0jMIW1et>k%Q2r+S8)z6U{<2Et^
zArc`UVJ2*%n%jlpbMm6WkBmm$TD=PC{iI#%3BBd%%flZ?gT9BnhYtX6!pW&sfGe=x
z^+gzgFa*KLKZ50lbv%&W13N{UP66#!VY7rn*9pHLME#(AF%MkMTqgQIp?hm#Z%>kb
zT+e*!FmGz@Kzr>N&k}B5#zd@j<8adkxo8l&%Jq}$4D`gO5OT=C{MV2^hVG<~&n)QK
zPiUtS{a8qRe5OLT2O)i&^f&Y-fj+Qx<KvjmyGaK0Em+t%x3gi=|H77uj*}7|=y!-L
z@x2FqSPNf~Oj>-S$WrLnd@tX@_;l(k%+1GSuFsbw&gT$`gMA)1*umoz_H0j+!TLwA
zKj^KF^PAWo1Q`;M9)`a6#a$<9((Z)r!*1{?8rSjTLibK#&*CIK4U0%O{Uos(+-TQ@
z^<*L7d*lJ%c^J#*NT;B0{U8suuELK6Y0ttw;IsIC$qT=SA1ftM#*fkFQzXW48#%0h
zjoVvbx3Dh`|H}Oq<dbH|CkY<N{fZI(f!nBICHi(f<cYIG`T^MI+en{79g02;2c5UY
z?Jx)FZ^-?;u4hg?(6cV^xfJvG5m^8@+n}I_7xzb8F8aMVS@aDV%>5Fdb1(F)nQHF5
za|nOKZJzrlv1VNbJ$;01k8AJ)+)oK#q2>pE+KA6^qp$`TxNm_DF6I8&CmL&V1Znn3
zB4dp;u(b<hEZUgh^Qzlze3f+b?F$_)Kzjk0kAawvdob5_%)@=8k*^DeyCJjvklAnT
zk0d?ezvTaVUv*V`9=ZMpI0N!7_^o`**(UhJ`G7~cZ-j5UVsCO)y6md7cMs#WUymLC
z2E2MN;<5Mt2Dx5)_avUZ35VD_;tHu|LeAs9CJryuBeY)@YUu%DqYuG0)&A(}F>rn4
z{>G;rb9RU}!{^1QV8MF)z6vh`o)Bv@-wUXK_4`G>zcc&+=er2*f0AJi;2ixBdBjkG
zXP`%Az&<aO2g5${gdyDhnPCulmhU4)eL1guO)udxf=`^PjUs7)V>yoChcJZQ<NgpZ
z2EmHJ=^|in;VCcD+HUNhWFG2>GDB2*Q!&qY9&>Mo-+O@XJ-EJumdX7A^kgQtQ>5)k
z-^KGT585a^Ghpw-+vMvM`x9xQlThY$tglFGiJ&ba+4KWE*FKDAizMvvMxZS}5^peq
zuMYyw>T(?G_(6Jx?8n+1uAL-#2r0T7d#!(yN_vr0;S^1~{x{MH`3-|zmg>h~TOZ?e
zOgrrHS*+=9w0SovH1xsu@Ho7ij8$-=;LZ78vk&g4nA!cJ<nMm=3jW~j<*RsJiyt2c
zbZj8>W;r33I)US|l}m3Uyo7ah58yulBN1@!<`T-D=jn2k9|D+)FdcXXLJsOqMVJN}
z-YHz#hwz3BZs?RdT!lQqe1tzC97Bj!@HGW_*&?O4V*%y!Y}Z=Oby}?FfEM`MR_wi#
z_1Tc+Ix<z?No;^i_08CC_QI)|hw<#ZnbiF5_U^-eID*9DtjlDaSs1FX$NujIJd5wZ
z{x6M$i9N>-QX$|B?7wG_+Yx3Vj6v{0C_^Yl$U+#4koS9e^XGZ`H!@L$;ef;0A4&cd
z0q-n~`Q(0MBlhV^|FPF;1D;F{5V@fNaPP*6sB8S_ZP@QHd<#><HmK{=yF7=~4JVFz
z;N*EvoFDlQXTeDr2`3huFp0z&q$r%-iXpMM_=lhGO~lDS8@`X^KyRGHh0}JaIMtO-
zhTuCN!*E;I2r?2cWHWJQE1TqyT#`pd;lx+LRcBNt;RIL_&g)Gk{M=&+DJ9d$bTR|?
ze9eSsDkJ4o$Ifas?m_!A?mzp2tiieB_2drn2XcTKNC!2NRk*Xvhx+37G(WPAJWD>N
z{^Gv0f8jjVk7PgjBl#=N3*JvENF~{fGtYk`)wnV3CGskH8N0s|xD~91yh&aoufsZO
zaSH1eoZfniyiMxJ*W{n%CivNUd{<{KPRcftefZAD_4qal|NaR7F3CJHpL~VyN-iP`
z$ql$sZ82UW-iiC0mXhUUg*f;81Wt7EBLv-P51hKbNG{QyI5F0n_91Q@N$X4d(f*X;
z6xl#Jhz8RTIv8ilOw>%nXgIZypUBTRWfn=TG>S&k7@RqaqxjgFCekEv`;mhtlV5OJ
z$AuGVsWgqI(;;*y&ZiBhBj`w)K{II<&ZB)wvuO^^rFnFeIB_|ej-g}eIGkpiKqtZz
zc9J8skl%fVo6n~3d(UwCXBu|E=W#0NH2DXeL9e4TaUQ4)w=GrRzNISM%Tj|o(duYD
zolWP^209mK<eF$Ry`KDuw&2uI8}3W{jC@Y#kwdsOZ2|7{SwwH3i|G=&l)Ot$;bh<k
z<U{fiIZ56lf5-hz%jpWblCGkwae{FTU5j&fH_;Bdo^GHU=_YzJ-Ar%64M?}rt@JjW
z%DbIzr#o<teHYzL@1T3=Ub>H;C#QGe%-%tIh#sbQ(?8IA=)Lql`bT;{?oH~XM{uI=
zA^I?Vgg#0iBfD^a*5mXE`X~A%{WE=v{skxgo~F;xXX$hFdHMo<kshai#d)W{(U<8f
zI1l(LeT}|O-=J^Ox9HpS9r}N`m*zeCKK%fv1wW!6)4$_f{VDnh{gj@j|Dd1I&*>NR
zOPnSAnx4U}RNv5Vac|T2^ep{>p5u4p(0}8k;m`CJdY)dO7wIM3T19Z0hB1xl%)pGy
z2WMscm_G|({8UPJ)`JDHo~##c!s)~MvVN>T?tmJ|2H~!&5H^^FG7}Ekgt2gDVG%5n
zSy>c|W-%<5#gPZeLoA*pkVna5<T;i|9wv{F=gCTZOJXf<27G}fF&lY`{Ds-clgvT>
z&61fDciW}#)6rxDzqN-AWy5g)&Iq!djl{Q}ci?8SgJcWYO%CIH|5kDv*8L2Y$+B2B
z%VD`JkBwsatN=ITjbUSPGv0XIi#L%?Vuh>-cjHZFQ`l5ig8R9qvFU6EyN=Cdvsf7`
zXBDiHRk3PT!)jR_t7o&>9M-_*;@+Po*37PFEv%Kbv353(&1VbPLbizAz!vix_HZlO
za<&4u?5$#}*^O)sTg%q5n^*^1&o<!BpiS&%wwc|+wy;~-R(2cP#%^cZ*$%do?P9yx
z9r#|vUbc_j$@a6m*a3Es9b$*s-RuvzYv^8lZ{m;ae)a(CWJhp+-$U$S_6SbDJ;si*
z$JrCOi|9%AXZ95P3p>W1X3wx^*>mi9_5$u5JC1v~USfY^FSA$J3HB;`jlIs^U~jUw
z*xR_j=>KqM*L&=J_5u44_mh3h{?1OaQ|uG=DLc*n!9HW3voF|}>?`&)JH!6TzG2_8
z@7VY3Ec=0-WB+15vVXIm*w5@2cAi~e7uhA|hJ&XX(=^<4X24BgKANxQr}=9Exc97^
z)*Uy41!+CCURrOhkJcC83F)s5&<1LQv|uen8?1$DCe5scY2lhhi_ju9s}_ZO(qgn&
z+_Ds}CE!~mNt#WwYYyC3=)`S>DO#$Qrlo5`w4vHCZMZf<8>wYznOc^Xt>tLBTAnsa
z%hw9D(b^botTs*?uT9V<;=ZOrtw<}@CTml)salCvs!h|TYcsU#w3*s0txPM|Dzr+i
zN~_jtv|6oBtJh|0bF>C=!mvqe)~?rDv{szvZO6Tc^R)%qLfnja1HR+3L|dvY)0S&1
z<VjQQMs1C@R$Hgtgqz;h<0iC?xC`xOoUXh@+k%tmxH}PNP;V#4$kW&SR?B|%y_Q4x
z9?O;AZQ*A<`T5L;aH9PYoJfBRr_moL|L6Ut%2V23@coykuRQgSli@FEf74#Z`S26k
ztJ-V0lkE-dP3<l1ZS5WH|Fn0t_i%3f195WvW9{#r)8pD{?H~C5&ga?}+Lzi_+Sl3{
z?Vs8=+PB(w+V|R7?Fa3g_Al*6?cdr@+Ryl|&w1^Fc2T>expAKz)tRp8I!>1x`K?^?
zPA+lFU3YQ6CT`;rw{rdZp3P9*gu6DwaNDLukI*Bpb=Fk3UE{kb*Esumt?#FZ6Sfm^
z2KUNu)m-bl6P5hrEkA=R?h2cYd%_y@xq72G4}Lwr!BTJ2+x2<+e0_nwP+z3qpfA>!
z=;J4k9gE|5KJAV5He04m!5qJ)dDShgl}#<xl9J_6Fj+yDg6Te)bIU7Rni_q|B{XJM
zv{cWlHkJ$Eli5_;)L1>or(D8-?8^F<%J#W64b=+*D!Xt!yQ-;8uS8_bsVqlx#wrPN
z&~|y7Pp)E8t(fFWCiqq;c=_j|UU_9@bz_@<wHNitRjjKeH0H_{s|5%c)x|uZwhPxs
z@s89Y5(Bh5<iPEY<beFHQUP^cxSn58-lEqbG8VMeH&j&{>jm&BP<^gfeJ+rFu9t!-
zP`#^{kQIz(^|J#;ceNWZy9<|nNlsBPHE<5T7F*reP~KQoUuhg$UfJGOZEO%g70FUC
z+c;JZyFmbbEFWG2BI9^jtMRg0PC2V~XNqyWtko!m)mYB2Np5LsuB+B^8*8=d##)~V
zYIsd*coXFCngr-Jp{~8Lw!Ec%ZbNx{TeqgmQ^rEc8DD`!w`D(FYG|%hW1-~SB0-TX
z+bTdnQI|*pTDx%3hQpqzV3x61R&EnOFXj`}#wTd9oS=3&L6g-8+SLdq%Mr8-V3^!e
z-&kvC=W(~mm-oM0`{gO0$!a3oB@CF_)vtj0m*J(C;S0NP<1{(KMFRLw!_+8MUgSj$
z4NZ-;t^S$3FS1y<7xl@^6(pbXY5@Z#v^JEt)=9jn3s<s9Q!w4o*3{V4+O4X-x~00c
zzE!0BGaH)g$_46I-q_Su-B4X$9+=zQT8|D0vTtsi$}d1a1u1aC+<NW+WMcAVh5aYY
zt*(`Yde)=(6}$|Bm!4JKR&E$oK6h@p=vZ>P(?{{sry)xNKSOaHFr70rj45w!E{DR;
zt*9zz<J#Hyc2-gkRTMp76YI6Yx+X(WeeK+Gt+>41NA*UVSXZxQBTQ_qmuxcA19^L%
z9`#TKJ!$`PuOI@eFB_3BIwHlx$0M*l_!cb}kEg028bp1)0>urrd~k-U>V~#*AJvw=
z2pJmBY!gG{jTz>Mp*4u1$xdcvv&MF|px&oRj!$c;YmzzH4nwOLWE%#lI-oUUfRza7
zkD-Z6K9INT=~s`d`WdJimD8p&MZ#ZH7O3FnwAmGuzR+oti-6PSRCMV!oHl91PFt#?
zOJ#G~(p6d-sM98$lhc;1=(!5!NobeLkkhXC+7(~B;%irY?TW8m@wF?ycE#7O_$tTX
zv@5=L#n+yr_$mH&#owX$I~0Gl1~?sxzeDkNDE<z`-=X+B6n}@}?@;4*DE<z`-=X+B
z6n}@}pRD*NEB?u9{K<-cvf`ht_^WlnnXLFHEB?uff3o7AtoSD@{>h4evf`ht_&XJU
zr{eEa{GE!wQ}I{Jh103V?^OJqioa9wcPjo)#owv;I~9MY;_p=aU5c+u@pUP_F2&cS
z#;q0&r%Um5DZVbn*QNNn6knI(>r(t&ieI`KZ@S$$wYH@ko0s_#Och?#I9~w2sUB1E
zoA1GlrLy2c0k}3fY<5?-_Qoo;d#b8v=yrWOJSpF&w6s=N8RynF^2NHfx)MIauX;fx
zEFPs~-PAn4@|ya3TUxr)Zfve@g^SR0+gpUyJM1<wZiijk0ick(!|q7&t8Q(>HlwY&
z$`8A(>U#VyfV#l8I_wc7-WpI-KhJ{)wxTbMDnsyf*iyRTwvGCRhWbje_yviDv$6@E
zOD;yjP?8-fJujoRa2HsuIxeQhVM~==w55tEL0U|S!)6mA1{6~ZD5e%rOf8_QuZC!o
zt^{<|j?L4Km|D=q)B=jB&CAUbQ<;~SC#D!ss+K)ZPOT$LPJMEYRITJ3sanZ7LWK5Q
zX##+v9eb|qFQ6>%$V)a%sB3CzG&G5LvWVMxtk*R)%@N{p%1Sn;P3g5u>6J^RQ&c)d
z>353K?-ZrqDN4UnlzyiuyGl{|ouc$RMd^2n((e?d-ziGJQ#|~Xo~I~1PgVR=75`Ml
zKUMKhRs7{7+MKD1znn~@75`MlKUMKhRs2&G|5U|4Rq;<%{L>WwG{rwn@lR9jrm1$*
zRJ&=a-89v1nrb&qwVS5eO;_!tt8rit!5?Rw=}M02Y8>fGj_HbDy5g6v_@yg;>55;v
z;+L-Yr7M2wG0B;!#*wM`XDa@gihri!pQ-p~D*l;@f2QJ}srY9q{+Wt@rsAKe_-88q
zSxSysiobd|b7m?2S&Dy_;-97XXDR+!ihq{kpQZR`DgMe>oLP#0mg1kK_-8Br*@}O*
z8h^IppRM?3EB@Jvf41VEt@vjv{@IFuw&I_y#-FYDXDj~MihqvcuZ-ELjM<r^_~$78
zIf}nDa+@<p@y}8Ga}@s^#Xm>!&r$qy6#pE>KS%M;Rs3_+_;c0xa~1zw#Xnc^&sF2k
zRs3@m|6IjCSMkqP{BsrmT*W_E@y}KKl~Z%(DgJqif1cu>r}*b7{&|Xjp5mXU_~$A9
zd5V9Y;xC=3&8eKIGf(lCPS)m9e$J(wqf0t-&?SGD+84T{GY4Jrcd31$OFDDVC4ZN6
z=15EaF10UoDL?A6N&YUI9KTEL4_#`1=u-Pbms}U^xzauXg?s>od;mrN0EK)2g?s=-
z{{V%20EK)2MgIVWd;mrN0LA<OiunN){R0&Jv*$|t1XTQ`eIl*+OZ!Ax@t5|AwBj%A
z6KTa?+9%SAzqC)J6@O`;NGtx*KJB^EJ^|JErF|l;#xLy?X*GUnpGd3mOZ!AxjbGX)
z(rWzDK9N@Am-cDTmG%j!#xLy?X*GUnpGd3mdlq47pP(!L(ms(^{H1*&t@um(L|XBe
z_G!<R_6ex?OZ!Ax@t5|AwBj%A6KN%XX`e_d`AhpmTFGD9C(=s((ms(^@|X5$&z1HG
zsN^l}5oslFX^%*&@k)Di*fO(vcfB7Fdr$1TDlVgm-6p5?>MF;#Ay*X>Z#g)vyV%ru
zTarm{Bi%%<r@qYeRt@s(3weG+bxm7O51|6POwcAvXJuEL8N1rdz#7CN46Rg9l~Yd5
z;Y#nutCv^cO(X9kFJ;e@j|BESIi=V?3Rep#L<X4Nn=kFjS?Rb_J`Dj6qc+<$X!fgU
zDc2~+X{uZ{oY&RuT|v9L+-2=~%Zc`U@qR23w{O`!h{J;<_YhsT*};kzO;c%Xg0D#P
zd_Jtp^JUs2`dLkFbIV)iXf?BH3<$I8MJ%2n?74Ecl9?*K4WLu-u_tFG@;k$DPo7LW
zUEZ{MNh{L0JFka&bLvg2ca`3>dgbLw8w(QoePhPa0t6HY%~H5fI)MijbSbMKbT9Bc
zMyaww=>#6A-kqupp`a>5zGV}MKB`}{__)w-LF`fBeQhSvJ_WK{L6^N+l}&MlgRi?h
zktq`0`KuxE{zD}Fcv4_JId(;-1NoHV#fP^MBvLO=bTw~tX4^!Lum^{HSjY4TCzP4x
zN)F&{;YBmo9yMjzLd0EDmf}sT_vxM~=%HS6d(-N*vNx^XPI}VDTG5rD%ieqoLO^Yo
zto`^~a7nFcXu=D}M1F^y=$SLwE?UARd{P40dETKpY;xZXsEk(byO9=t4p8`2K;a?)
zg^K``F2beucP_QRbE*BEOYQGmYJcZa`#YD~-?`NO&ZYKuF15dNsr{Wx?eAP_f9F#B
zJD1wuxzzs7rS^9&wZC(z{hdqg?_6qs=TiGSm)hUC)c($;_IEC|zjH}fn3pBr0|AQh
z0*dhhigg4~tYd&;9m&g*?|}ftItD1#aX_(-0g816P^b`~kT;-^GoX+&ppY}5;w#_(
zAg%bx_dR)8@_i4WYG1zRL0Yvd-|rx;+L!NlkXG$Gv;4e^il2A25$c|7bNG4J6h#re
z=e|#+#p=ubo=VFFBw6hWlhv*;S?vOo?T$d`XGL{G(|phRVM|u8;F3MB;L?O>Y|b>v
z#F-|BhO}hvQjbzD^(f_1k5Vr6DCJU*QZDr<<x-DQF7+toQjbzD^(f_1k5Vr6DCJU*
zQZDr<<x-DKF7?Rd%1-s;S1%^=TOob%>P8}M^CiV!yuuMQznZ4@7KPzejx5(&zd#`V
z;*E|(#d{rDu(4h>=p%SE)Zn7X>O=tEenX9~Y`vkzN3_i$ZyEW#UF6GFfyg#dK(yFU
zBm2zno)mo+2yc@ks?QvieU=z+S(M{#i*mAcfy(wpLBT;36n$=Lt?}WV=8$s$^po8N
z<}3Ow5Z*j5!&~QNWaAu@ZSz8+X(0ZhW%0>~97r3_<y-{9*>FS+grjmG662giInGLy
zle`2fnTdje8^^ddJFvG<P}nlk!j=JrLIMhf1QZGjC=?b@SOuW+o$4KlOYZrxArig=
z`3lN+E=UX8M!xc~^4$#RDlOlsI2`gFI`*8BZg<#%_!~$&-=)C38me1cy#$vc1j61t
zF9sdm)k>rCy318HOC@o*4!6PJ2Cp=nQWN+35;Jx&4aCgv^(AJ0uP-sndws=M4)}ep
z;_C*4@huMNH+Rn5IXH30&+IXr$CGFGaDSP$k}=9}Y&7C59{zU%0>%FYI0X0%?q=(a
z6E>T0s%<4smd(Stv)MSmHWR1h3USL*9!}Q{!O6QsoXVpYU&o1idhsO#ZUnse7o6Is
z7yra#_rDE~0^e&4LyMZxjJR3gzQ%RPy=3?+D8%pyVuthc;Er!9(2E_0cR1Z>0{*p#
z2lAM$G~&*wi+?oUf>G%5b~W*zDyg_*jfwy4*#j2^kTjh1Ov5SAG>!)$;QrJ!osiT^
z2tOg5ML46<_}*LUNrd-R`Ypf{2#+G*lxixzyOE0Xj;Z)RqU87eS5c2N`MfQLgeW8x
zh?xmN--3jc$)ypXvP*q1p8c2Z1g>4;cZzo1D2HCB;@cvrn8%b02tOjci-2>kDKD$=
z0^l))<1A~+!wCBkwjr!WYybU!n;M`C;?6~ygVTkK+=G4^aJ~@dNr@S_MusFUQnQTv
z6^&IWuMulf4RQyOKF}#@tmSPOtN09QIBAO$;g5*f(h=kGCUFCy4S5fWw1Z0^VFuEV
z@=`PjHE_$DM>5)jqJ?inUOdOy2vJY|A5wyIpd@89LJpxRBLLG7aQ-v}Wm9;b8DS7Y
z9|UN;NaJfYDUhR!%Mtl5$kO#4p{}nGP9uDbG-T_7Y+aD8>jlt`Av}TbunPAB;u{Jg
zy&n)~=Uv+XI}q@HR$UDkg|Gadv*N$A%G>`mp`SYRGZf#JFzaTVBM!&6SNJKHNStc*
z<0B-#eCB}xx>_7h;2#H{CV}jG$K8(o4)7twvCXmB(IK$aj-`$T0&8(JIBFba$erdW
zc8nLad`FgJn7~pTHb<<$A{?QP0ghfM7l{83#!1Bfi~XGa8-aac|HS^Gz}~UHW`D{4
z9CDwsAGJRyX!qF<+4l)-r+uq^lYJd>SK1fb=P6pVeUrduqZO_j#6HuJWiJs}p?$19
z&z=F=5WCZ!C}`34aC?Zr`q_i*{sPl&mux?A%y!mx#s+HycGC8~4R#3ZgzdQP8G$`%
zd(;Md1nnN%0UOSX1KV!fV%uO_18li%k*!V88f|s93W3eAO|eZB*l1ghZG<fi<s7zn
z8}vkAW`zy1^|5sqv_Ups8%w%CNYal<-z9y;X-TJ(K2Ca9U~f2zlU`1G0kmUDPb57o
zX!j@GodlZ$ZFkbPq|E~BNLrn=RA38|T9O)IExeU7)yg#dSGVyZH$N#WNz7JKN|G%}
z%vMrFQfSfuk=rXNFv%z|lK2aUge0Cz{6=A4I0RSFy0A~Yv=6=5J6`NHFZNO*W|{vu
zRwq6svBaZ};$LA8dTIB0u|tXbRJon@Lkin!-})<Tlb5#6i>>rxixY(gq4&*pr>fh9
z&Gyo&yx2_J8C9;tzF1*}iDMO(XFL8YEW=A1;>Da^EYXWaCx*+qwtEtVZlYKHY>QNT
zU09Hp=I_PygiETN7fblbLrXa8#m*#rCd(z9O!`=1?|WpL(1pF_rJe9%$30lm8wt;-
zx=$vR{R(^3OY8Jv_aud?at9LjC~Uizw#B0n2^&1pNLb^gE%(wECA7)9wi5}Bs+Bs&
zQiWC64k&Dfmo~*qo9LyD_R_9ZF2~WJc)+G5mgv>Bgb@j_UH+5c@JJ&e-ZKjcRxi!$
zr491Z`gmxLX$iv0xwlBbn!tY&yL8+;zX{A?lezI1yx5N(%#jlRoyz^np`;ss+Lj|}
zj)?e=Rqnf<nT~(MqX+RXd$AWhn9UJ?Ox1WI{$YjPZ$Brogr96?iP^u1zguFqLGjA=
z<9FNoNLu_h`)dl@Y*S;izZ2i#t+85Sc6fOYt*hMcqs1@vSbV~hp0U~Qi(eqyOFA9j
zBC+@eZ@EW3<>G7N%VaKUO!L+#mOe3lyvH-d=X>TYKFdoR=Ak8eJx!O*#HYl2W-B&6
zLiHfj{)xf{Bw;tif9$h8@=Mws-%HZs1HI*po^rSzI7{Zn{gR}l7I)4|`^H1F&y4#*
zmP_i0Q{1jut}yOHRc=AtJF4Z^>|+)7Qj(II9qXm1oQD?ooZTsD@Ec{S##0_z+)*#>
zK`-q-FYS<*w$DTB^0t^k)t-Gw+)mkY(&@OZipM5<kiym_d8Dz@<ALKAdpt<oJTI-;
z_P(kyJ1J0MRbJXmFRjE&EA-OF#^tFR8F51t=8Q{JShU9v#f5v;t+)`6&raOxSxFM!
z_jpIlOg~u{Go!}A_fo1o|2SP@v6o_hQrOwpGYb1G_N2nzk9|vFCt{CF%+pHjGqF#`
zKB{s%WABle?PTl$Rc@N2m}9Ze@STjJVIL-GcI>4j&5qrd#A5e&dyn0h%Ej(W<!+Bv
zKG9PbJ=hStMwP>kOkp!)mn+PxO?+3yX{fO%woT<?&n2-gTH<2atJr6{W;M3avu?%K
z#a5^qGvdYA(Bc%2Tw*82j#jxj-Wnrf(_$T*8XF&LjWr8wP;4I#35nnBZLfQ*@>j9U
z({juO+xsy;@^UfXd3bdBx|pwGPV+qEejM|z!rq8^Sz#~49Fthm8*&y<?unR(Rqp*U
zcPngv%x+Z<J3K|(7PDE=?)Qu+rXxmqftaN+3u1(|#x%s#s2XK4(<GK~*3;9NVsG8?
z-X7$8X<42ciQZjR%&?dg)t=3xO);@C5t7FD)C&70M(7YmG$5vzsu37tRG7Dw#G^5i
zM52F*J}1%G4bk67%%jDGM1K*j^p8JbsB&I?j{Y$E9aTf=GitmR{gR|bKNtO!#Oynx
zmBvOt=*8~y_TW(TK2^@E*$!n3@XB6WxRyRU@U)}qdi6Par*}lx&}T<P^j29TdQ<c|
zg{_QM_7OcVx>?a?M^`CqW^{?d3Zus=EH64kVMC&w3QP2OB>qgIXwjaPGdesvMA7<1
zE1whXAFWFoe>#y^)TOAO6m~XB`JAZFqE0H>`yMRjji|R2?L?H~7WIs0zY+DMr!QSP
z9`$Hcr>w!BP9(;klvFGCL@A6vVJO<3sO_o-o<9_AOVkF1t%+K$utiaAzrq@$>J+Ua
zYKFq5L`_uK=%^fpjfhH9m?J7)Vu{}UbClI%@lj@v)S?D?>L%eiO4i^{Z4&F+Q-fxf
zw5UE&YF~%{=*<+(>al6-1&<`HKYB)P{m%N8EN4A!{a9h|THjFE%bwNG`hsWmvtEmK
z%v<gWPq{?zb4o(j-rKu}vz?V3@EYS`kC(UJpY)xiI_|dKEiu~(>wbyZcY4;hnES2D
zU)hJmDw!sowr-Q<x}M*xn>{wz^%P_6h&n0DSyx+?MOhbEg)c*28m!8jS<9@-n^}vk
z<5i7(tMWe9VOHg(tTxZOZ;iD^sB)p!0SfD74OE!XV^LNT`HQ4Qo{Lm|DDsO)<$WSQ
zj8vYcYdz}nv0XCgdIE}k&Eu~kUy6KAwfvNqcGOFIF!DZ?dnj_B#A0G2cS<a}U!?LD
zk((mdNm}H}NaZae=S4Ov+H8Bc!o0Mk`xEvkT9vJj!e)B3II<+NP|?Ol<|!;Aa)`u|
zHb*)YEip1$Vd0U=gWx~e2T5AY(nx=mt9#auh)W)Qc1-j5*odDzJ&67=Lg`q<8E@`q
z5hrCUQBOv^FR_TXB2IW{9$yl1JmMLZ`((tU3hRuxM_~t|PD;$NIzo-yc29)zAojwD
zEiyOio`?++^XxnbiC7b{{I_Y5uSG19xe;v<jS8!asE}ApM}+b(5mO?Re~B0!q5Mn4
z2#=SKNQ-c&x?QyR2&<x*BL*ofK0?h_ME3|^MPr^-&2quxpDjOHlwC$SEXrG0PFs|>
zaOGRxm38eyEN@6G>QT$fsy(m7la5(lP_z-2V-mAGVR=|#_gj?3|3Ajw12C#8`yYSz
zy*D$-q-WAdpG+zt3CW~VLP8Q+2#|yzJp`$t1SS}IC-fSM2v`;s1W~G>*bo~Qu=`zI
zE4u2gSXgy;)y&KPbIzL?vf%FjXPi5iGv}S#&OP^>bI-lccF^XU-L^e$P1UyDz0PFb
z@Zxwp7`BaWZP>QPtqt3jx%Ca(0{4nzbGUU2+f18lp4%pPV52>-;hsJi;^~6{?ls=l
z*S%ULWqM$}Y%Y0V>+Y60wyr6kx!RWKfyKIEnH~>NhR3V%N3+`&;g)(Cm)v@>EjYEr
zMcLQALfDLMUBD)}WqX20<H_)NIud?%<K2+T3E#UpC*d3SN|$go;Um3_r11$ZiIniB
zTR%v6)xFXsO-gXfobd_IxSn`3;c-2e_IAQ4J(qCIt!F13a<8ySo|#PEOBddK3Hw~R
zU7p<51eZigSe3BE^=nIlOClvSCQNd{#wUz)<!TZJyK?;!N?f@f?lmeQHzCsnOYQEO
z-3bW^(Jok++Y(6#bgwBlbo2ysf~w<LHS53iT+Tz*f9SdHSFG1uzkcQBUF&CV-nD+{
zfxY`bVOKnOmpphEJ+P<Tu*|FOax+Uj<(~E6op9q>{|I)}gZF?3?;a0quN#)J)?G%%
z3U?Vfqphyd>b}D2l5p0w?)hf*Xn58|9@sqh9JJ2%z^46A*hCNBSP$L^4{VqlmU+ru
zm&`y<T?XCoC|O<7F?*l2SRa|Jx7|-z3*FYI)#FREcJshIzO+At#e48P{xxfe2j=gt
zY35dUxf$<z%Js6!dR^k%-D{ck4`A{C^x*yI#*6>E2lk~0_DQ@;0>{4{?~=ROJ>p%`
zHtWmy3$D`6XS>$g_%m4(T(C#uU2-@6V7yE2#{Us)j|XqN2XCVXw#EZn7Qetn*%3ce
z&vpMtyi3~N(759#xb>#^(QbJaKimTw;)Z3{#1GJ^WG#sAtLL)!#rJZ--gf&jyA5%}
zx(#r{;`7}SJ-&N<SN)0jM7M4F|C5XL^zQ%8MZ^cYYUT0f#rwt^U8PBJzv;OfmL}~{
zxt{3Z9*?-6<GzpkhM-;d#$C;32^jZLoJ%|GlzZO;d()G9)suU{lY7RK`#J7$y)=~J
z&Yg1qnw=VV%=PObHw<|9>9Eun;#{(r>gU3{QSSeQrTyrhgK0myt&_N2aa(mNH@xRJ
z{LeSMzc;*ZaqHu@>U&Bzo{d}OrV_WrlWU2a6W2(zJJoa&N$<GvaU<huXvK*e9M><d
zB(4W?xyWV4r6QLQ7abQyx^i3~a^^V5_E;@0I`-eOkm#}3V!zUVjr|O;4`bg2><V(1
z;;{C_UW|Pz_AITxu_t1W#y$`WO)z$EY+LN+*tN*5h+PyrFLpL^(_$yaj*T6G+%P;l
zD3+cm#uJ6HImmU3O^%HxUr=l$o(+lhN6rhs%A~W#w8#82=EoT5Trpq9w#9rxR$$DZ
z0ed?J^E~Dy<SrzFO3eAV=$JDxk0SR_%)yugsrSX~iP;{rF=h=}9Wl#d7W~n8r2QD<
z(8mKg*IdOuw3&9{k<z|=4Bjv%a0|y?q#GzNy=NGQ9qT0AO)U&1>broy$?#xGMV-7K
zsRpV@`Pm`zKHyB_U%kb@kT0NL@vbn!|C^jdDPvAhssOL&U+W2icbXxU%aqYb=W>1=
z;mhL~XB<POQi<{u#t)@bjFk@{C0zt5L+}zN<N=_RpPJ84&1X9E`B{3Gn!pVvM1KXt
zS1>$^Qc=e3`jIL8$Z!k8CvjQV8GfDNkqjTl@ZT5`#;IA^fEN9e^0@zm>Ws0Zlp(9B
zTq&M0{rFjM1j-Fzh{~l?w2Bal0q@nr9V<j(HUAnxsi<d&$~0AmNc_}6e(E4&Ml*al
zj|jIHcbC$$R}u3d<l88(?4o!B+}A{PYookeZ$MNE(yu912Ow>rXbrjE7>|^svk)Vg
zXGWO50A!lBoFJxQ3<nn>Uq`9&P0m+xTFU8GPPZW?8%M}1DN06Qu24#O`7MUO#d+M2
z2FQDy|5RIy{HL66Hf;gEOsP7SaMV!@?@qN<;)#>RNv^Y<Q-K>Kh1}bOn#ck%G?b^B
z_oi0JhxL@74X3;k&eRUmQ%X2Lb(o$)o}N0)wK`1EJW4p_0Y{7Ec})2l<BVjQUvuiv
zQ>Gus^y8SmgXzaHeFxKz<7XXAIgTmEG37>6AWDh#nut;wjhIu&<L$Y~qvw@a(_5UU
z8paX@^Z;6c+hHk{xmFcKL7vMLDu@E|M4^Hx$a9%O1^3ciu1^I&HJ9tt!1bTZX_3hc
z{8leSvB*UxBj-m_-guGocq1&}R8}jORm5era#=-ORx6iP#PnO4ei2jN&S|wa7tdBR
z*S*X6ce$@_<Mb|uzt8>uK0`KhuNt_o3<OagB#7!m5Y>kv)A`rwj7e**P`=@3qqKD>
zD~f3@*H$6Fobm09V`u!kIDZ$zcj10f%om32VhUaO*`b_I=h`l$RGjC0B&CYQ@HW!P
zrc#D;iCk6`Kh;FP$}iEc@<JZ#g`5|L27>Sm`i*hc;)YQgU!?LTrfFu(O@yhK8S`Jn
z?c!flEAazARmV8j8Gjt-`!M`RJx^_s`*15RaeXRqM=9~cLeOmH9$3WiB8ImTT>dxr
z+rRnO`>8F;{d!xpR{Yw;)L!B?-piPaHDAE5VUZAWEki!!Uq9rh3N_-Wi~Q?FhFqtz
zlyO`KiSTia9?k2IwH3hZ;5v8c5FU$<`Kf6PpQe}2kojDn`3!lDOMH#tpEAuRu6Ywf
zGPJdzoWYn23620g>Pap|T;)33nL=NZE%L9NZsIzS6)BWxqNB7>Ta*@ps{^P->Hww>
z-2zYjgY)b47IEnkL*{b1`uY`1JSGP-#KFI2a@`Jb>4yj+eqj0b1LM?jP3j1)L^I`0
zOnDPO8^?Vc$C!J$hxamt^9+e(oC#ba^c$2rhavm9z596-{F$1+sUGG2!m@N5rRoR`
zGaYXTrIx<K`FHqPZ<1Z|YUX5brfKG~7IL{ikPHWB4h2q~#;Fnfui6L`Hy{zUk2$Z8
z=>~rGuT1B!L_v9(^2*DMxsEZ{ak)Jh^AuwqCkWm=OEmomj(gCNH^eaJM#kA_NI@OW
zaQ+Nawo+cP625Yj^G6wf6H8+=x9B#;pTudA^BqvwPO0(=<Lo0GC6edbNt$0uB*RY<
zTyT7#c+vo^KxUqiqm8thEal!_%JmmK%YykS(wv2|mFqK_^P?#*e&h5!;b6rfZYkvY
z6f$NtW3v1dzfoSCB)H70q&${!ER5sB@C%feFEAWhF-qLd@Fs>&;QT_KM+-UsG4sI3
zRIa#6IN~b97c>51&adZG=g&b5AH<Mg&hO?nZsPntg5!37qVpHVVa-bZj`Ksf+#!r}
zo^gI*I5b?;c`)ZE8e@@P&m*2qa5bAp4H`LU{>1qWjK6{M%4EtbGa3FY!=I(RnoM~$
zne)sEs+DnGVw_W)|C#4t8|U9-_?w(RNU73=<&~M?b)53tS6FvdCNSnROyL>MH#1H%
z=f7q6LWV4489SHqcoznzO#f-lKTY|LUr6JUw=w=UrZ9{7ll4{kN5&5|(n{LQX``NJ
z&WvC>q11bdfksm?7@=X}UA@F7nLNIkod1;bpHg0YMNf&ZIR8Dbao;n}bjIPe71}3o
z<o!B6<9x;Zna=QZ#$Uwvi#VUi@I>NdArnN6Vy+&~=}xBe9n<-a=}ck#DaJ5h@`@n)
zFg506bvEm+KQRvLwDJNjg)AQGhci?P_rp#~#kUNPWXJ+aaU(JHc6aX23jS5c`IaGh
z49VksBd0YC3FUMaL-uff59M)-I#S#wP5mZQ=?d3hnL==dYo)M+SMDGjg*icK<NTeB
z<Hh+9rt>$7k(PrfRhp@Pltnz^MW%-UUr(6wdebqagSbzAG`xm#dG?9Z)HC8!*4}GO
zq=A3R8h#CH?4NRP*D$r-tQ82x>`j=EVDU&#QeGa(Yt7f3&Z8)H`I_mUNawMoaE)|+
z<QoW1+6aDyzAdtO?Cf0bNp6LmQt>ygXAq_0Z(L#p<NS^5Q^7LxGlnl9xa8!gKI2~(
z(67pC+&{0;C@ZHqf13JAZlwA^Q=<AbvUU{9^_fRyDGJY>U%1Cuo+t{pZXWk7$D#v5
z5?kilPULcB)AxWxaxX<PUq$k-ck!>GOd*Tudr{v)_a+-erkWr{pCE-bAu_l(ex}le
zYWfZ}{F$Cr3W$zUOe2C6HAhN)-oU**nbQg$wYh{NS8$)t<u+DupU>qsGB3$@a4DZL
zg-Uu#@#Uu~c{F`>ICGINx2TBeZ|AfXx0FMNXZo#7zliC#GJV0?W3v_poMtXX@QBP~
z_&gr3c?@af9&Thf-QZ8w3U~=AxEFjvkg1F_)fmJ515E%k1vt1znEFR%%nGJZ!OvDO
zq%Zd~%THwmk3|u4V-aH(G36r0FJk;<T*@+*57U`LdULC<F}Gji-nd2(C6+Lic)|hy
zlyV9lMxMqfmT?rekJyfozhP=~na*6MGnXm<$~9cX)IMOGR^4u5%vPq*%J{8>FXk(L
zNLL#!BOR-RA{|e8#X+qT-*IoS99BLgh;)uLE?H0>_e~;|yKo!BC~stqO9|uBnOBwf
z2`<{1PCMg|<os-ztcgR0e)#nyL$WEatY-YbG30NQSE4D!Ey^@5pHUw7K@$9Pof8;x
zgi_2J;*EPLkGo_+U)`hU8AsQ1<`Erv9zjfAlqydVM0thsxQ-W3iT%V~LMFJH%$yd<
zrOT9;(y52VNBUgT;XFI$afyQ&zlGr{<<&}+tlfBeN)Dt_WR0bwopIVJk2l;Cyn!Hc
z1?QWYS`$+n!SDjgE64cPz6`0PylP{d%?vrpC0ZD#h#^IcGlMx{JVR<IuMT5KZ-(?{
zNDD)TGGqwlO+6@89wdlzl5q|&&IHDpMtQ?AhJ4MCYn->se*yhIdY<8S%BxHb(u49Z
z^REjiRbsUV06EMMwwL8qI-KYjgE${gbd*@i8$MwOd#DtJ@+NPFuuh`vqde|P#<TM8
zoM&&3V2eX#9Y$u$T4o(vI0*+@&4U=zP|AxZIAtG*(7h!;6E%bWENhJN&xB)mh*E`p
zj7l-*|4peJ#I2r4d37K|Sof3Xa{e2p_8{k3vywk!%+DF}E4S2_@&=h9tC`w%#?dtd
z)|TZ~Kx8RfO2obE5^h@`hqFO5@t2F!PfKt&`zmP*?q_e4_DX$mhx6mOh5fwr32r$5
z41Zg2L-<vkGW!yL+oZ2>ANqFOeEuy?o_&YE-O>;E+aq1a-<{IWVxY7aw}jV8-_t$e
z(hs;Ne6n;McY)s_IdRkXy}0ZApo~K_xc_;O*oFI_tHf^H09_;Y;P&U+#6H~o+#>Fw
zdz-~mxU>0$cm_8sKPJAzt;#Qm>+(xVw&=i3!*+QF?iy~8=?36t`7Yf1dxv}<?)+UN
z{|Wc`Zj+DEUB2=o%ALvs@^R&ma!h_&c~m(ezknNhPs=akhTdo7OSqBug8UY4;r&8>
zo9>T=K9Boj<sYQ3U?Au!f-LMM_{IzsbMV1hAz)Pr%nh_n640y!w0!<|KYW+q)5G=e
zTzqHZ`BZ!o@QKF1A?t9*yF}{-R6`+Y`1~86f4Dx^@cor5{~5kN#8|zHb4OQ@za%L*
z@h7CGFpg&dJAwRBaN|EZ-au}&`W{jvc}hDvI^ZS1TeOguOdU@koj|{Kbl|;hNTqP3
zPALlMuXs0u!1vRf$9mfFuMVVm>RFt6yF${y$u_L>NzOk`DauFnJ2Xn2_i_Fw#g077
zQoPNIa8ye17B$A_lve@gM$WTV?EIGUPTe<E%XyZ}pa{zHFoMXVkjj$bf1KJ%!f7~J
z+SBo+SOXqc@Xms;60;B{lb?@6mK{=hdQOmiNmlplQXAb+oo~+x3k@;a5|Ty5tjt$F
zF1P1YROHyp#U3^Ow^RLk_Uu>Drw^TXTc;e7k1$1(6nNGkR;UV5%Za><yYEVI8MYN4
z(KC5^lAMq<J;`v^`J)_2A3Te(SO1A;qog>gs06q6NBc{0aa}?~gM$N9FE1Y-e}8kh
zMK+qfq(1gO_TZu{dl3Gvpr%1~PJ(b{N2y{BMIjdc<XJ6NeC!H;LIwV*yjv=wwAbs_
z)oE|kv<}sN6LDqQ-$h34hFW2-T~jN(+rJdqeYH1~)!MP;+Awi~KFh`MrQ)nMh(1fT
zV`4b^Y<b59H5}GeBHr7OC#9BzL}g~CcJq$T@H2{#;GiTgFB`@*>#`lyLmC`jgiQDB
zioE3Hl)SL8@SsdNFE>BGAkQ9(f0+Ocij~pJrqH1L{JdQJJ0-{;fUq#x*!))Cia$?Z
z^T>#X6D^BooT$t#zh~Im$Hu<@+~S2<jbj#7PO)c9p8vL-7;`YbyDT10s^2(q%8nZ2
zBM&QS@tdNOO<HBj$W>F@PFp?{vwiD_6b{IXcvGx1WDc_T99jTgn9_00SOBZS2Yeod
zH&WQ8gp#0CM5FsTB7K96QdAVqPtri<WCgyS(<eRWbsA4MQ=l2)2}aZumjI&TNx~*9
z|K&HaZO{Ha`?ufKc4zhA!PUcSs+EE5@3krEGj<=?vwz3l9eZ71!)rf$_~B1KefZ%I
z^N$=ka_rcVhmKDCZ4mec@DG0a>4Oh{Sn$x1BM%>W_@N_oa<i%9n&A~_RY_8Jsh5;q
z(!~^8ph&^p1H6(AK0Z=Ln2#gS?8ug2nx*Fua~EZW7hy!W5yaXifswEq@oh`-m%-@C
zJU03eS$G)GxB|h=4CnEYn`Yi!cVv~=Q_wHsq4>#zMbhVwmFzs-y!p!9A=@Wq4bL5O
zxXX~Hp7*R-|7@9d-<Y{IgO|>oZn#{z`Sw+325BuNM{Zy9$#CuSlRZaek3F@rac@gu
z?u^BQCT$(u{!7Nl*+cHwGP*=fudf@tVo1fx+lEdAFJX3xo;<tEr*Stu+HzT+RXn5g
z$pk4N)o4%2w36dQ>S;ff@Gz5WbAyA?LNHWtaJVg5mTOAaPPunSTj|RByQi!zm9vkC
z5|Oaz8Lj&-_i3+apRHJcH)r$$wPH{+gIW+#lN|;rD;=eV$g;_n9~_*QE6XYNu;5_X
zT-rMI?g=YP`>t%bcWP^?Y(K0$uYEaxxkwNN_uY@zXCy9PtbM9IM>QNJuT{;^r2M6*
zl0bvENj3W@enR&3F?y}Qp+blY9vdYIuWvIcN{S_^z@W&RlEtP-ZSBtoA3OBWKeYAH
zqBX@BqBS=kPtl$nB_?SHMv01)<IQ3VN|-8rrKYMEz|sC^%--Gxqm)Gx5jBT=2(kr1
zE(F=-&EkMIX@fRN9N3_Qt=C41ht><M4^pl6Z?Q=F9%q_;Pa9SUR0$%id-mjTf3&(-
zE)cW)f(uHmOF~nv=I_G?9y&a5*vUr*aNmoM@YaSo;7PBO{2Y2d&l*~TS5<tpYZqa#
z)P+9agZ@;!eTXBwXV32>WA~J2+xzviXO~a&NLC@i6Csnep-4VwF!XpcOCK5rOf~rf
z=VuSd@MzKefE=CLaZOFfTnLonrNDDBeg;RV!H@Z#=4=RFLJIbV=m{pN9&88+rfEy#
zm~2Zh%4&N4yvJAG|K9ZacOQN5{b}uA6mOb4cT=C@jm^y)d&?i6(!RMk`IM;s{_mpt
zvD4b|Yp-iRu3IYtFTWxJHf+$YqkT`Hrf;Aoeo|<O*~e@)(yJzYQ2~-37=Q*_5Q#m^
zHB*YP%WoWn*&dgldiXZ6d86vvv#x(qe1>)HT#*f0(CSnh<Wh_jUgBd8HaPHVj%Y!|
zAn@(faShfyQH<75<xMHYGTKD*8523ws@mH7igmMg581h3`oX$UJvQ7uYTXMn#vW?Y
zF3R6-5?f{;J3ML0>H&S{WDo8({?P^VUVeU-_PmM4Xe|0L66Iz}aU}r;H98ssFtMA#
zVexhKBm@XnAd(+c76dqziGC%?u1mpWn=KDH5{Rf8>XuLat$a6l{n$s3&;RAwc`uG0
z^Zukur*3~@Rol+_hi==oe8`G9g~Nw^)%MwEYQx0sV}iZH&a^Fmp(!c-K!*L^jrDgF
zZ0)!Fwx)&gg-MR$(XV5qyP<bx8lC}{hEY9@Vc>IERlz3JA?qDZ)dbfQ+uNAw1^#6X
z$^{GCsE^c{e>v#vEkFLqU$oVD%YpE+WOvbei(2gwQM+0Bv^`yXQZTBjUqb3An{y@l
zWexfz24icLY$ZXFUAlyYL5uf_jZz%}UY&Xdh455!jm3?AarK5N#X_ree!gtq{n5fz
zKOc3xP&V+*iA{&coqn!(SNGwC^8Y!{B_%IVmQB8}Vb2G5q^91}Ew}%U*=_fR_!h{I
z?$!Ex1)=@(P@C=;r3C2cXn$}}T3T3`(H86H@H6sim7b$(321+9Zn1*?4-ZYI;gC)C
z8?0hW$dm=ITr^OjA+hqjq>+2SxHn^3LQ;MA^Y4u}`NU1wFlNQG)91XgZN{0_LE_r_
z2ikT{+EtS>Y>_;7P5TEAjPo{c^YcBZefvmGb@yp6ZMpNK`85ZxYlj~_vHhXiWu<-B
z&x7R+`$1B>q4$iErNrBS_tJPK2K82hfJ_R7-Ybu6|3Z1gdCU;Icg1h7V#d>qPD4B6
zz>mG8$P)kb2(NrqvIY7%vh-yc)1lL1W;C%PLHyWx8B^Q~G&Bo;SzpS+!g=z@1Hfoi
ztA>uhbL9N@x9|U8?uf0!2QKVC_r;6%+_(48;LY`kV^@}oUM+hDE*mnqrF^&HwPE|`
zj%vL<C4FYwq{XKvj61$~^6r^QsZ%zLY1&`?`{6k|cC-v^8ky*qJg!AqJ-2c2^vd}7
zs>VT$FbGIOeXAzj7`LEc*SHxlZk@PD=i3l}<p%!*7uasB&i0&GS1a^+mMN=ANu&1u
z_1^T^wxmhjpL~D3(KohX<Jjd-Pj7y6%gi&a1GV7R2e<B;vb!1sr}S@a|L}ovKIZLy
z0e=#qk94ojp7zq_J3n4fbN`QG<fF%TJXEu+Z{PLJ{i((*v(<^L9|fKZ4KO)elKW=a
z4bcWJgD^myJ#zeJd9FM)pl8nk<;BIIT#A)u1t`-T4n7y+Z*mC33NtN%MMT@P;{1ma
zKGr|Durz*IXsXTJr92yVRpn)ue;+>J@Zo_&Pd++8zV0Ruo|`KDq^7BV2G0eblMMoI
zvoX?Yc7+$%$#}&TI8IG#FIFzL|3mTrNgS=mI;CyXPNQzk;yE=&`5YW*!a4~11ZzL^
zZGA-(VAf{kX!{7|s4{xpI&JE@btE}EmuC=A{}mKXPZ59C3NCP}63~7f1s3D2RF$H6
zmzG$sjX-&E9bYQFn9tKm-p9q+Y-v6YUyH7_LE@7^!g|>aiO*7%1wNFt(EsSA_}I#_
zA!Ab4F1meR{~k3LTAq8i*X+u^{UT4|GArEwnA=zE$sN`_sjzg+*wSfDIkvUw`Oh96
zw|Z9Z!n#q#R_$%i>MKhv9sP~x3}^7(wV_g4iDls6!C{u9V#VQIQ4wP>_^!yzLmMMs
z$NGj^l6H(QS{s;IQy^-=4pecHKnlqiS|lJ0<wRS8$~u_}KtU)WCi2>xXwOlD1>+T1
zSY{cG=h8>69yM;Zk9YFU83&Hcc)oSiLpdQrt|}-S(|w<I{lszY`jZoOh%T=#x;kp)
zhpVq^N6*gxT$H}@f1>i~-@k7hKW~<oZ%l2*)a5<o59=S>F=FPRp;O;Dw)TzrvBBD`
zq!gc-mD5kod{+2xo&Ab-?eOc`)!q3CtCF%F6T`oMPLzMY`lR-Rwy$-`quYeR+i&6l
zj2Qki_`#=al7gYh`S~fqkZK0mfwv{G#zE^(5C*=13_oE<z*D9S*<(`Fac7)oPal(e
z-6a=l(;qfQMSGjW!@M39Z))8QPyJRdPZgJgYeq(;RaZo4c5vV&$j+xAJ5dg_d`Nq5
zFN-BQT8atwazsgNWa`qMSLIr3yvj@w>XL-8{B#L#3kuS6$+k;)$r-x1bjg?ryM{0Q
z@_^=jR75<x^Z2vvqWkj)2j0KlaQ1;0>(-47G6xLX-n8y~y;8Pp;nLa8ZO)JHT2<T9
z2i(3ClKC~}*uZmA7w|)%w@1@TAgh6utDDA^jXkAk;dAQ-H2?M3#7Am|omlv(_TKJs
zr-k82)0NuteuoWtwReBA>2dA)E^C)vu`y4Gny(HC%cWV}(zeHEq2JLPhHCVN8F$qL
zo(nX}jv#~H<GPNg+N@}%8f+r1&K6{k2l^T9;h(f-@x-U1@A1>Co#%degI;(i|LtGe
zV{i@LuRVADMKtL5S%MrnRDwd*xR2DO#MkKU4PTk;Fbh{9G_It31(7n%ALXCzZ!4M3
zC33y<Pcobed$g2Y&M!Js@}@cMro@EU4kJ2H$8|cwag>RSb0X?wkMo<|dLJ7K(Z^P*
zi4_eG@lzbp23JSxH7T_Qd8Q6#4)-uE^X>r%vMNQQqxq*jUurKOJS}R!U-XyprPa?*
zJKeFa<+m4a-`YcaSk|09Q<Be$>TkXfHBV-w?Xu<U(*E(pIqmwM@IZ0F)e-~6f^eUB
z!8PiGju-BZcl8O{0!_<~)NY7A>XeQiRivZxN#{`5XFKF37ac*ngNo$)m;mcir$U);
z##5J$k{%B)&{%D`Xar7><a-8I7qrr>9N?6BRLuN5phM~O$r&6KKPbI$eBr}m4r|N(
zeRr6Bx;2h7Jo;PxhBKq|kyO6|C4bT!6xqvPHTZR|H=Dr?HeupwLo>%bRlj=0dHulA
zqeTmPiiclzo|j+V?0gXoNGV;}SG?z3>mFC~{~9F!vuFhj9%g;L9oEoGN97G@%hkOu
zTqCt6T#7CU@bL{5s+Yf6c7z9d@k2S7y0ktt2pi@r)dO{~<C_cxn@}pXP%pfF>z;P;
zhDp5t+e4~R@zMee{%I|n2DDEyoc+B-z3|&0<)PBmcclOJv)*O{`Nu89bF#0u#RmiB
z?P6Y*5NPm?vS8+8wEDcz{)Ly~Ww_^gCDJ4t4fm<9XD{6{u>ElqP-t7ZyF`KOUZy#3
zcnbDakZxc3D~>QXGm^;H?JG90ScZEHtU$OGjI!aW5l4P|@Tl`}?Jkk=#RnqouHWZ1
z{^iKg52k(h`_YeP$R8ikzI}P-%u6Ed$Y-MFsq@<Lzn<5A+_g&to`*f&r%l5qIM08T
z_L_aAFlu3dx3`bKuk7$)P9pCHtv)0Iu>g_cZ$OvowusyhWDLF6e|+Dmqhj_8_ilc2
z{CUIKkFSh7ynLYZIm6i<&SSmS&1r+HA1&1$;Fg9#;$rS4U?EmbQBejn&Ar#j{vj2G
znhduI^hqpo|D)X#pW7}*{-piYFUs$KH2;kD(W{x-onnyu|I!Cn&<6ohgcMWa?-d;E
z>+2sB04e3~8ffZ=V6xFXHla<><kWiuhM8P@=G%G0*H?)hFKPR<H;;;y|M$)5BiLvj
zb#}|V{SzXcP4YzNJ%+P8oo}>l-AztyX*wjnfHcYiCkF;fA>C5D7}dlW#o?>EBocEn
znT6CHE_;ydp5&BF#jOLt+o#(a@chNfs#y8W-L<=xWL5sTW%k~oeeYT`ZtH~X`R{DF
z<K^1Cp(n?WUs+zdt!3qz@uGFrxe0->VfV-7^=ukaIk`5=I&{*Sx;qY!>Xy`I?N%_U
zqH4;}^sMQ3QcZ)gV%DO6Ok{1qi2_HETk5)GE;Kl+yy0OjS1r}@4e@*S;Hf9T-L#Wq
z!MbAcmL2|`c$>tHEnZ^5qbo2$hRCJu&uG`Rzdrop3u_-naqUC)|6`L#{-^S2d)4_@
z8;&<CXFwJIsgNI#L8yzj3^C-8bzbH10r%KNtPESEK&US|e|p&Y(<w0`)Ea3vM<#@d
z;ks|5y?2ksiJ6(V&*-UK08Q-Ynkqmu4Vs6)S9qclkQN&Vx&f}ycbP<>ovEbwE5xF9
zORN%JtdNAGj9g$bRcH$z);{qI$D$(p1cm!)Up=fXIr*(`Xpq0r5NHYa6Q<)L*gwJ&
zU^In91tMGog67X%>#BMN1oRj@qFZ|!+B_q3)bL@+DRm=9XDFN6XJ?JQZKy4KW=kK$
zlVVQ+ZKudQACkYa!N*G#W|F_EtDbK8i~6Bn_+Q=ooOXxS^qBZs>-jWZ0^4*(>m{$j
z()yeHl=BI>zq7xqM=9>k3-jOCh?iBWc)h8EX}W}IDM*3Y;bQ46TF+@+j%pF-@rulk
z+gCbYk+T%m)`y^O)Q8?QzfE|@A&rZdzRHs#%XTR|ENq!t)rxj+#p3i*UT(jpq^(fz
z*}LL*@=G3qhmiI^O_Kj(q$U{Q_Gae{mStYp<r!K}@uK#zuxU>je_Q`s1o0<%wElvp
zXcc6Smc9zsq92}+6CQMas*gG_?b=h~R~LN=x+80QB;sxZefaULb`btpyrlIwZ}?{Y
zujp_g4U?19a>H}zebfotMnRx{Ifrc!U<)x!oSPs%-mPuaj>$>Nf%ZxA-<@GtciXkg
zN-N&3&Hg(X?SS||8A@yWd}V`n8KH3Suc{x2uMvIV3!BPEl~x281#FygFxg1hfR96M
zV7WXI5z&9Bb#7wa@N$dMnmKnyazxCqQPnXaBwNRKTvJ|CM@uodXVO*@Y)VS<iM3cH
zA0LNmc7#hNUQ5&6n;a~|urQ{0%-_VM0=LsEKVO*KHbtI1@P%g<#(QN>T3tVB|0vub
zX?}W9(})B8?1L_d0f#R?<QU&}ULAenIcNC6Ue#&+w$6IsgqK&@R!2_4vgCZ{MUz*{
z%<-cS9z+d~L()+cNEmiFl1f6tBuA*(5p0Qz3-ECm)bMaGt|PnQC?Rho1cb>>R!%UB
z3g{{}6F88(DxTc|QD>69Gmfsg^2?mpH?2CH;g_&Ld^LY_?~P~gy6aB3a~GE_vkjV}
zeW88*gtn@o-%ewQ^Qm!9Zu5TQFQ2{n?)&I{2YRjzCj(+2p#o5eaEX1Wv=mji93D3`
zKr*#RRFMiUPuX>KS?k|-*W86SH?A&n+*vtr$E@2n7Zt1vS@hd8FFO}myKD-HpZLtC
z)~9Yy>ar^u0!F6N)I9V;xZVpvW=Ejp@G-~58BGpLNJNBQc;{ZINRWd9gHeUBa69}j
z(9(F=Qec1RBZex;d2jyo?<=>h8XxbgdL3HZ#S~Y+y3dKWP3P{~duIsVR~>;x+L~FF
z9XB&Uocs0Kf$U*f8!x>W`_^aQzV_-zu3A~p2jTDuVdh2|jgohuk0ZjxH|+Leo(T&L
zwR$>$79{ffVzb6%&6MT3&6gUTKFawc)9xEldw<hC->#bf!H(8@0_1YhbAdW`$)~%g
zKKE*JQd?5O%HJM4DU{9YA3ZQ}cP+*MU8DFTt|EeDuMtkia3g%9!l9UH5<{H}veQ(c
z#nzSwM%67}ebqya<U6$=4qd!hb6`%N>8a@nb=~U6h#=*q_8!Vh!wLp&e55AKf3=Tg
z@#<l;w-cv@s9EZGthjxoN-3ixEWx*=B;Ht5l$It%hKKjFm>k`u0G=;ocI%7&OHhKS
z25fd0up3NI!JHTvYp97`wzh;6o;hK5fI~ynBwa~@&BUI-FpJwQh%pnN|M~B$=cV^9
zs~9n3;`uc(J@Z4vf>&cxKe?FMJ=>l#DEGP3&uV|xzFU8KRIho%pBXf}=bp3k7c83Z
zSiD3F`O}W6Z4n{Ea(j*GYCGK2a(JY{+c=|3%IvZSp7V<8n;xGWv}gO-i>nHz_U~I3
zo;kW~)Hr44g674GmoJ*L0R4R&a=H{;7)kvdDLDeVm>sIYV)4E)2R-x8<=8~m>z-%Q
zr$wD=@JX1ywsOtMQ4cI#xoAh9Lzrq=snrQRhNcZavDuj~Kf7W5xHGGq&!ZGsx({M*
z8e(o}XE^YjYF3O6nTM9VKcygOaXYy%wxaG(U0TncY3W4>h4~%Z-C|!}VF5Jv!aU5N
zj_q0q(+ZTLY4s0@^fAJm(Fcs3Ngk8NWzkqV`OwnsgQMe0Qp<-QDp?ayl&%+}g#?(_
znSBONQh)v3XVSL8riQ{iF45IfiD*Nx6klQqMo+=q@$oX6{roU>%|>R=AS}6_?$Qk&
zED2=)h~aPzhgL_6na^we#Rr$PrL7MdL)!nG+T1O2N}O1ub#rc(O^Y;+j-ye*Ij9g`
z!5}FF_Yj-2b}{1cVf?})XS|4+nt~nT@aUMtB-LWEdSjkiO^!$-)GLf6?W?BKuB1IE
zoYoukt$XzJjIJyKW)Ii>*5Qz{hPuZdf1r8pz1ttOPp+D^rYFRRw{_BzeoK!ed*?r;
zj(z$qXO8?*YwP2uo%`jNMz!=DeR8GqDRsd9q9Li{>g(Z*cJUQz7fO5;V00M#A>xC)
zsebM)7V4;*D#W#r&pv+%taNr4m1~>1Rvr87J31R(dBJ&69dHjg%O$BMpak7oiiLkO
z%;1sNx`RyLWTkm&(1kT?%b0=cgnnzDY?*zob>N~e?%wk`G|hf(&5oV@`nAn__+B}A
z-Mej7Rc-ICJL7C!>pZ>YVq@dQHLIVUb`_-_*TN9PHWu<JmDa9cqa(=Q;p3Z-VDfQ<
zhIHxDseSIX%d=)-(SmGncQ#}t_IGa7OFnh^=Q*!!ylu_+IA6v4@P;t2__3|Uj!h+U
z?=ADEtS`G$9jkq%{q;$0RpyY)l-X%ou@Sf3)@E-Wd3;U$rVEp1zqsP!Us1!ks9`Q@
z=w4m@9ib4R!B|~QnAuoexsy7tE2Xf8Y1hVv^~EJn?FIHA>|7v*fTudDi8BQTpUk6c
zU-@~?<qfM3WqEa3qjj0Lxm4bMdf%QsT9|l0WlGZEDOh46pU_rM9d!4vSL6w|omg#q
z_b=bR^2(<!o=}pRC%TmQfhU+HOr{%MrgH>EEZE4$<?bo@Pu2m^p;3Kf`ra`z=kUg0
zQ^JJh>R6L;pUErl_DyxpGwOg>drzhvW$b4t^H4%p(un<oQ^Hg=zKhA>qq-QQvjx>@
zLoJ0F1$?3x%}YD1CuQFB=hrnq)Tiux!`2n{1&!11s{Q=j?T=IzmhT(ZytruD)Tw)_
zMYrkO1|(YVvgVH+no&`jk~-8eX4CEzYimsEV7&UEM@n)vLQaJg-*HWT7*UdJQThk_
zg@y(OfO#aa4dz37&SmUtk;O9E?X0B*9xGgdJ(Lt(EbKvPBcfuaX5Y58?!euBCy7$+
z+4_0@=9PZIz1vpG8>>sd*H$?fPo09Y?uTYU=Q<E^QQ{x&XLKlPa4?2l7b6e`x(eM%
z=_7}a%kEMO*GG6K%v?8k)rnCLEm^*3M+u4EeMLi3hM(9dUvU<1SU2|cD!CNp;6J>_
ze1N_mYcfi{0u9pFY26b7vxsyRu#pA!$9>v_Q`fuXnoYii;nz=T_38lU^zsLCavm&`
z@BIC7(2I~{Bb}q|O7#v+Fe?6OF<_If;1lj6-IX&L@3@Dys+h>{Yk^K|huvjy<zRTh
z%t?RVFWeGfFsc5QF#p$|)ZRXJPhd=_!OIw63G;dN^z#8R5e6?cEGF>2BidWCyew_#
zz&_#OeFjyhIa^Vy`+MCnHMvW_p+jx*V&~fK(;AW!CM_tI$Dxv_WeQeIZ?xKnJWk$5
z*hc~}L}rJ9TF)Aa&SkpEMHYcgoY7jJ5mpiZl-4S?KcijNUVBQ;mczBt;*j%i&Nsxf
z8uh2FS@1^q0nk6ey~dbmKUInd3UK&JF2YQ=R&S}^r}{2{zB8O(P#~ZBM`&WSm&rdj
z_OGWkTk_=XQ?dp`hV@A(9@96X7h1NaaO(JOIrrDei+>NFyr<g7)N1g`8eP1P+C?f6
zox<~2Y*?9Lv2owuYOyIz?Vrn|oR{Tm&g1g<*~-XOi`&T_FM`GP3@oZ7cuxGHW6X$<
zkU}i7BZ=LNtUfYtl#*u*t_xcpc3fEMgwl+sASIHK5R2jRGfPg_7tXG(o?STU^!!27
z3mRw7nU+7j5;j}^tusVU|JzbGij)!kMed9({npD}N0e*tOj{P>Ygsm3yIfwE3I-M8
znieR}H-@s+1>u-Q8$HmQ#kEbFjG_Pf9W^dPjW4-tZ1#?hj){?iQDZy~$LNh3*Scz2
zfG{hrdP*L-6iI-CSB+G6W7(i-1v6$fP0ycJx#U!RVN-Q=Q{kjj+EW|lw7PPUHGP@I
zH)Po~(Y<0snpiLTZJDXPIRLFl9nnvFwQ(z1-&1jlHBG6Nx}g7jLo61>9KHfJSYS8|
zMmu(b0x#>a4yEkpG3Dv{Z)ZhZ?%IE1R?%{M&f<Z^cZ?i3A*1KAobHPT^=gsZ;=7dR
z?#|1PN{)*x&)u0@6iIf-9&Mvo1DQ!0ndKZ@A0|JO13g7r!%_<Gv0H2w-gbmW1{wKo
zQ|4=*ROC>cUQUI4<oC}FLuo&&oZ|G@%cFb@FP2RTITslb7@pt-Acd-B*)Nj@g3)ye
z+0F)(Db$vyFV+Ql@|#s#?A;4m3!C>=4%#_;<oe=*`NLK$Jv(vI*~Ny}9#rDPH-*Mc
zcy`;?C&na1?ud$)Uw%D!>EF+s`(b79BUFQO%+GSXC&7mGIXK*635)gdiShTB!hE3|
z>YMju{Bk6LE0(}5_Q|Kfn>+ZX(auAl1@Wf*Xw!*)y?XDiUAT;-SZZmq645U89-sH}
z%ab2Bypol$HYRJuR_*iUpA2s*3){QJzkI=%&z6hqC67WElBI>hsD`V5LXGUwpc0!k
zHa0ahA|f?4Dl9xaJ}xT2*S9;i?z(sP_V@Es4c^`eiR)v}y23VxtC~Ufz?=R}fd}~o
zDFp}_qlK#=T(>(+;U*X!u*XtNDX>clZs-@R>YYnV*f4fu_JY18^Kv$gU1v>CNopOv
zse4OF-$hv)$E;6CTQP9y;33Nf4O&)JwRE8TPM`VNTSl+7rKH%_j^5mTerd_V?2V(=
zCZwb!t{b%}dwvO!2GIkRmCLB_5woGr!CVTHx|M`VAt6C#a8n=}7Zl_xLRE(^TBc7a
z3a=!!6o23f$V%#Z{9(<9Q-uEDUK$`49@oYSFYQIqQ+x5C_JZhzkE%^LDgRY|tKGTy
z(Z$+z5r8j6k>pNuopzPs%BLC3eirihyJkJj`}Tin{_X$7$Smskm$D6K0rRB_$lQP|
zt39??nG){REiuqrkTlP-^X@Wwnk~IsR0ME~+unmmHWoobE{Cj4Js+;e^Ce?MHcu%V
zJmQTDbML9NS8SQEbY||t$<y{!*B1}0{`#%CM@lm0tti<)zuO(NrthuU)?;O3er{dQ
ztxJn1C~1?I#icaWE!vtAyCOQJyg046M^e&l^M+4bYfG9nY}5Y4xb2}S5o3$H7WYm~
z89skz-mr>POH6&g{NaO=11Es{M7|+VnSnDd6oKh~CIDO6-Xu%7-#ghuNuBZ{KNqdZ
zOG(ZZD{_;P^YfFFat)50%uKxfIXm0+O&0VdM0b{Bwp$QC(if|?UqV!oS#hL>tjLns
zX^ow0J*2ZDAyE$vqpgdu;83{sRprLkwab9lcctM`G3C%kd?q$FXs;8h*zo(c?_O(~
z^O~?6yjuianK$P(?YmX4zTWV}n!c-w3UelAE#JI+Lr!yU_Oz+3e>*X${@AyhH-Gy`
z{rE?|4Vm*Q9=cyxUY#@dHSPO@2et2Bog<QeeY5rQ9q}>qBBM_3yYE<J=%TRb3loli
zw`J|$&rIg;Z%<DKhm<Q8dA8wYSePl;8}>IQCI-hy27~v7Fg@gxw&vjw04uw#8GZV}
z9fBpglPAprDGoK77(`54wPs9sileHe-rjHftT}bX1yeKAb634Pamnc7ylLYMFVCK@
z72lR#)NOQG`Pdv)&8jGjiKvgXYImw?Nsqkj+iOv?q0%DdVdX{mA^oJpl3*WSUxT-o
zm(fo#OC}>u`A|s3>p9_6HGP)Vif{yCizNMPs2Dz9`&`7$N6_(BG3pNOs))TqJ1ln-
zca>}RYWG%%JELx7F}J4*lbVS0LD-c$gUAl1uLn->oK+Low!fl;Ij@U#>k-vnqem;k
zeS`>m#K*fi#SgNft5i&$NnbC2MG6yefjZ36iuCZ#45J4fVW*iQUQ8C7g57m}ZrN;>
zKVYSloA^cUBMkQ+xV_}N2j1A&R9ioC?5s6^z(5CYViggsEM2{(VQv@g4hs4dAJ+7%
zD*yfRA2HCBTX;ou{ALVMjmDj<YsloO21`JYsm9-bR(*{j%V{mRLm4Cg8#5+Aib5QF
zpmZV3OCdo6J_7a)FC&Njk!R0se~GgbwpS0`KCymBP0fyR6DLltpFFWa88c+d*l}Bi
z4&5?t?3N*pS!n01u_I@poT=#auIh`tsz;Uh_^W<?-X=35@ku6P*zB(8z2-bbhI!;}
zkbSE1yf*Ph?CQF8N>r!l)f{Cw&hNbgZxLdCVC*h12hGP?^`*}K*1Up03ZF4q<!0xz
z-_?w?4(Z!_YF=5d%_COrDwt7qRP0lRPy1%rl$xx*{j<_W<@8!Pr`$1bAP&C@DM_i2
zx1c22gYh+*VqzjAL;M!lBovqPWe#t@krz(q4^kOfL%Cto=`oU>9ND$o+C~*u*FSu!
za&_<Wjm0yk&YwAd{<Ma=l9Hx^^5V_Lca}{Y-e@rfPOqK6D>8OreBy1DgDV<q%1TSp
zZKE>ssZO1}^TNybChvSGOcK&&3&htU6~pTio8ku#h%j11VyZ_Ci-|~{F*lQF9EZ=b
zjCFi#2^K{kRf&kuO|uY}nooKc{v$=zW1*$Eca(3KX=Upoy%WYStsb#3)e9RJhYqb+
zxnyf^veowHSEc1=M)V(*r=2wBI(xNl7<YQ5TuP-c(%RK=?86E^i+~9w$e=Hg`nE3Z
z=h`^jffu`cyHy?6^yfKoLz0$0K6&;_t#Vhb-T26_wMvDzcf$u~p8jY&y*FzQHh$MA
zl|~ahF_KKXHqr3QJ&ak8cQ-v|2{bDgf)RE0dX6iom2?x`V!`O7;4ScowR?Eaj<~`g
zORw0<VKZt+HRU7LQM=kO%cM?Mjooq!a=cH>F?a1pEf}l}7oQuSgUkyq@%AxeYe`<<
z2d4OvqZCnn61!MGOesm?^L4T!hvvr2>MMMV&$aKA^Ar2@j<IyLRE?)lVyO(W{b|D`
z?6ySETvU`WZ=Q>~&d^EaCHIj_`e38|=|^^MI(~Fl!<He=j<Hjwj2k;;@_4oBfyYlD
zIdr;u-|U4;mo8keXaVR~K|&vKNoZ&nvbWjKghN4!kJ;dhFl${rW0*yX5Cy`Ze<??_
z!}CO}c6FW@r8Q|s@1Xo0VuT#5O{)+S#e{NgTGWj!$=1FIUC|@BgRo8|N%<wwp|P<M
z5tf9gsIXu~3HEjP`TBdSYJd;{hzx~V6ZkqDmGo7VRivxJ6eD35N~ivV2MBr?#r1~T
zAS1A#QO63CGJAXbj(#_~c7yzjHe2l8v|@!eRrtt?Pj6g=^cxP8x%)e0@c75ucR9~q
zo+y_)Uw2#<ectFcJG;yH1V|@D8XMj;&|Y1zlp!UTgoLE0N82pE4u8J@v#JIP5!k85
zujjDd(yZ4Mb4?#<s_B0bJ)v(ZP21XcBqJ1DgxQ%DHi|0{MhU}8i>KuE?YX6H)vm%u
z5=QPyM`dSbgju?}YyC$OYCd}1iubLh!p=}o??S}y^(l$V?$IMRH><dyASY8%GJPE>
zsZfD~d{k?s5LPxlvT|_BMVDTG*!`X7#?2xO$|o&`y0H7hp_xQ&ZM!sRP4DtekZ=p!
z5^i>3dGVI<TiZq!51VjI>E#}+X~L{1e!cY3>Jb&Y&}tho*dz2tX67%SSlehZ1x~A-
zzuWoJt)nMPdD?uX20JKmQaa9gc}o)FDou#11aG^|$5PbUXd*3+rcgmR8z-zBk%86O
zu#~GQta5D1x`iB8`RsgzRW=POtB5>Vnnz)kd8P8P+@bT_VU_lT{|u`XnXa%($Rzw{
z@H1^UCSz|6hfJk1ktUjODxwRvp{4XI-LwAyr$t=&FF4!WbZ|4m*NhW)3!T9poNDPw
z#!0*dr__xjHA=a_@ja6ots`}=ky*!*OadwzPJ+sGw$Hc{a|HG|P9TL^yuAYzv!8-L
z1GfA9g)2}DP8w*USy`m*@q*ld4Qx2cXm#h0fOTbD=~Ok-Cns<W^Ihkoa=P<9x#ssO
zaju!;BVECD;w||cdT1%uD#Re7KFR1%le9?2iAlgYf{%MQ)z!P9++u`idV2R}oEGuO
zf5D;NWjg5Hcm4|w^_*T-qh#ftvxe%0anE)9jCyR~8bO}Wcy}CRN@fazbB*^Ii2Q+_
za9X5^H{*0%0Zx;NYQ%KJppGRs<51Lv+|xug(#vYp-sBqjb<qn$jUfAbfCDLx(jO8T
zF{Qo`10f;af&Q{1)EzBG`-v>hN)b;9gNQ;a$>D$?A{s7)Rt6!+QeOFqC_8>eJBoW`
z_U{*Me-rbx&CiQ0k+}xvpAlU7ErnUi8+OZkcQ}9Dt$B;CB8B2DT_a`aV<O(nrhXCC
zI4ni;AOs<D?tbB@Gwzoh*Jxg397MMKSDY4kB;%ysf<t}Bbi^RBoN+R4!J+!-IMt$t
zadK|Kq5jqD(<r?T9N#nfU3DbtUm>+(T`;SAVAUp;SWMnR@$!)kUS<pq&IPF|MTTP{
zP@;Qd+4OO(u*b%0_lSmi?SOXw?V>@u=XNnc-GguKo(3^NyRU&(+1s@PknBr4E+S6t
zU(k2y{9jQ?bXQteLqjt%!m+SA;?mN5e7w9863pHl%yfm8C;czIQyxn^%w3ODhN7@J
zl$3ln2&7F;5$wMUP6`PN7wp$_1@pCB7&K+x>@lM$pl`<c%8AX5<8D7)Sm3NLY#W2P
zzV?*dT=|~-jdeG|`|S4ZgAYs+ai=K6&z`wy=&p&{=V#Y`Ft~kiY6gY+t$L?Qc{Dkd
zqWv(FIVOw8zR)%H+ju-85ufGekDGB?<YdN)x&?>Ep6Ouhs~E?63l5E|URI;DpT{*V
zMo03<Ky@M4s2A6$MJ!-Sfrvrk8ewihwy0BiZbi`C3NS|a81d%?Ivn+RLkv>Sy8;z4
zF7c|s62vBzO`Y0n-KY1TIC}IgoFbH+KKE>Ya_qU+o>%<GBV18?)^N5%`q=qv?{!T(
z>C7KRtlW*LgkDl;iBD#caO9dDk-_@bjUK7!uh3Q=HjQYxV->fvGbj&dgmha3eqz>9
zv6zRckv;0_dc+JJG@!9){E@j0+w+sgHRjKonpD@nc4F7U;kAW3nyXd}J~Z#ul`AjI
zP=D?}Wk}!B)VS`wv%626UpuF*zb*dG(Bz2QhvyBc%*-D-s<3oadCAbiku~X4$NWA@
zJ-p$;L1nENWsV3kTG8|HjgoYfK7u?qpU&c)H@)9)#%U4r{tHgLn-1hPHV!~1?`ArN
zk6k!MQ9X+=dfbBXwi`og{6@m;F3!<WI@e~sr=+0*XY?h%bBde>pZ<ywQhIJK`JYg0
z<5KvpvvH3?g=8;@^bQP+C^aT^!!9^p-D#AHB77WKI1c05btc~<R!CM(bf*X`$S~7Q
zku06h>2~tqkn^u|L=+r36z-CroUFdn`s@_p?5Q3)Flk?P&E1nH+`BL}qiOGqNq3KK
z`t<PmWizYq?w330<w+|aOv!sxJ977P_stqJdh;-GX<?g>93=ARASULMw&|}v&oMCt
zGlmSD*%J{|v+k@lc=g{jH`}%>C2#cPF;kou^f0Oc+h@u#NB(sC?i!lK4lRV@me5-;
zk!YQ!8xRN%u0?zp-~(La{&ya)<W8e;Gfs<G`Co8o+?fu>{UOHbb~7CVjVj?7rN)2K
zsOF`08r6<}<CiT|ABEx@j8fSl;tjJ*+gtj$Q*bbD_VQq~;ChVz!031k7$c0R3)3)R
zg}$BZ5_p43$JfA#rn=}jQlmz<)cBt1;-@2_EJ%^L=$$dRLnsmV16WHeNva`Hu^MCJ
z<GjPdqzr#dZrTIERsoLJLyll_vyYu!mzdz};G<a_4%cvsft>9r7TO2WJ?`YZ6z9rU
z_4szc>-F1)F1UJc+vm$#{%=R+qWXC6_zk19U;2NYJ|X*;=3V{!?{qwTFlE?MV@%wj
z^bJ$ykNTVT<%7>??Q0f%y7#V+=11kHDGRSu@0->dThzt5d-%aSrrkH{&6kRsZp*<K
zbNmj^w`v+=Q7s+g{z$oLY$h-t)DRA|VP72wF%#~dCqC$m)53R<nNO$Of<t`3bifC%
zGM$W@akxG@PPKFo<K*0eL%c#b;FSm(ov!&h3XKj<CQ45DuO38>JY^w>6q3SV43fJ7
zJ0bYrbykdB$hu{uyOZ@ixv^q1i;FY66&H7Neal<duh*K2dY9(rmi8`^pDF5HlABx7
zy9i}CI-XW1sIBk=B*2=>D~XIrP7Vu;j}HwAG&xeDqs`dI=-SoWi{l77t?V~ed0J_1
zEb+;Cff9)e<`_5+T+6z_v)1RU6Bd7Q_t14kBWE@AE)xOY4%t{(H>aUjdHXY6qQ$#O
z6M7&HWlv<J*3H&XguoOz`Ao;Uq@;zFYbr0V68<7JHF^HPH3MH=Ub7)rUJ(_0_0rI_
zcIWb_=*EjQ^Em>5M|`Af#L>l=NwEk9aF6)SI4uIa1e~~AaA?Gt4o3XFKc>SopKvgm
zHX6+gt4>Cr*SxdM^%=|cX%Rh{P7?dP^!dn<HSkSE!#`{-2}bWnnkXbPz~AAWlA=d&
zz{KHbCQolCck+xOLX;xZf)#d|QfLjW_G<H-S2v7YgLp{nI2=BVVCML7YerxG`QhCM
zj_s7Uo}Rj{OirPonyReeiUAQ?fl1TsaT8;*tFyJM+PCk%^Ww$CH$R<x5xvT-;FeM=
z&{A}m?-_fF-Uz*=Xci8^yonxT%To--oFt7qw39W+YptOHIJ_R?&YJVw8|j_qEYmTK
z@X)D3z%9`UzlF}%9y(PLwr_!x(V31`Oy}ryI<P5+DL5#Lwv5+`6-^zjKTB}Af#H1a
zjP<W%eWc_vE;kux(A=B@S)sJ?XkxvAJaMlXi5$4A_k&J{G(x5Wjc_{C>2?#HeI(0i
z-9kSNk`8nIyWT>l+CyiEJmQb*W4P*}Geop8o&QyzN->4$#NSk(J)P=PDc#R>VmsC6
z64`ZZAtDY0b*>b}OeYkUc&Gj`%rS<bKK%(t&Xs=$9iOvub^yLfd7%+-S%}ynq1x*4
zz;A;8<6u{IEuqV4BB0tvnk|we#cVW1#mB?g=>x;Q58`+Fc#OxJf`WPP)E)|#-G2)X
zzI@xN`gmW1NvjY~9@@WueS}xs_|?5nY~Oh9t~>XHAUrr!#EIz4A>HF<Cazw3{`}J4
zZ5$>1;tTO_fArPsul@yfM=vP<WG+wTUKos<rieTJJ9z+DvtTYKjlcvhe}#K9p%Zs9
z9p-YKPL=c{(+RwV4sp3or%HN>=_KAlhqy$iGekVYbUJ$^^!gB&=yZmNolK{*HgpNI
z0%sF-Iy@_e0tf4ZR;*G~bSSM3IHwz83l0j3i%ZUqjt*1I$v%$EFxD{BU*~uc-2{Zz
zP@y}$`1Gx7N6=qZpfvoC;Atf!C&QW@7+sVyeR7YH-R>MV%J%I43a7rFmF=z0H2F*#
z-DB1`Yf#DUb%uoh8er`nJLX`$uPP<-Uzkt(-rVOr6ZF2Slpf%|itp6t<Tof}I&`cP
zvsc{BbTV;>(mfM6!kXy}0*+A(noaXSsj&#L*gX$)Iwa|II#uF4(@DOWj)8c9=$J&6
zv<~$FrD3;HA}-J=4Uso6rPNy}5f|u`h6u=Vcb)cl>ZJ9glc72#$)wH|@Uf%sT<uYl
z<@^{4=iNaAJ!go!p+{YUe2C^=Nq6;%F0UeP$cGL{X|>e!9jI68I31J4Wz<2CpSX?d
z0C|A_3}3>^#YsacrNrW+noRy8JUApo!VM2t7&{$BLnsAp8qonsIFNAdlNBEp0XQs5
z@f4RXU82LHNS)wjr=;d>_&5IB@cV0YepKoIJ#5?%suko<f`q+U#He74*DpbGSYmK$
zgx7NH<nyr+-Dkz&8gNIuue%_#mP1U)z@=K?+PNpR{u~{?Zt&_8?&$FSxS{dMWlyIL
zMSytMx|5roqvibw5I?=j`IY*YWly4)I}pYr?_#f&?uD!F7=v*{|ENNU-L5g}*Z{0K
zq-nY=f$EL|9*xjWmcUQI8N_l*r!=_ZPdX(dDD84ndLLLBB&l?}L=0X-qiXC#=WAfp
zv7FNBRCVmu>3D&TK4Pf%JHRR>E_KnVf+=M_?RA5Wgu8GB&L3msK}Rx*VMgMrY(SUr
z`ZZXGeoD}%!5gh6;%2?fA<_)JOl;zc=iHonNn5TQGMvRt)I`xFWyrmlQ}2UKILmMq
zaH46Fs$^{Sp^iBHD^F+s%y98u3#dXf#34`DtfjbmmyLD8g`?Y8F^I2s&+JQDPdfXH
z+F@IhW{89xKh*j-;E0k3d<eBgolDbzt&~J{0QPvI=++xQ5o9n0dm%8@<O=O%C*45V
zeO8$G3j26Mm9+-(+)LW_Z6{8c3~ES*MQp_t`O(e;;@2e_?i<yv*4&#FRnSGegR&1p
zRR7MpOBU5zYLV)=ZN8nnz}qlJiKg#SKS*}Q>5aK(KJ9}AxKrB{oIeH*=ujKxP|H^1
zq}ft#8J?sTcLZ>YG2?Gw(`qkPcN`>c4TiPiS?!Ob+`HUQ3!|J1^$<9LG|xR_*_jen
zpCR&a=WOazJnKMg0oR$}Vx*H!R7UFf*b9v=36k+P2i1fK5DC)3$0Z%OTbqLr3Wg;K
zS6;!fd}&76qeq3cT-z^ikmcgJjY_z)>ezy}w4A-@kdA+#tZ+yHI#U?PG`&qk6TQQc
zz5hWG=1tH8v&&B%TG#KgJiKB~vy$K(IBw1+XDMn;lCTet2K%0+7FpMnB0Kq>(K5&!
z*!vP&uh1k<p+C&0V>+!f;50gM4II#6S&WDh>J@NWDSJKeEOQ{Ho2OjTJh@zGXbsE-
zoqgVVxukh=xuVi#*MxN{7bBxy#LP+o4k+UWN8>ld%b0O|0^AB-_V)?%RV*=~vcux#
zI!O<g0dGZncJkmRa_`;?J4L<n;d<qzoT1V2!!imd_Gy3Cb2eNts`rgOg0uF1+q`|c
zP8*}Xnzr$t0qvJ@PJB$p>OBLL@Zajzo)|$hisJ~z!peZH6dn=b?;mZVK>rZ4=Ln2`
z?t^?6p1M%nDjz_CjCP;+plDm8QAx@!kBsV>SUhyeiiK^Zht@`U+orcxww@T(XPM_z
zjN;g^cI>HD&I|e>3>@!iUx!mN)a$g0KgE(ZhvpURo_o315vc8%SL|b8jj%??k^au3
zZR_M4U^*;mbvjkz0Mkjjg$`*0I-M#B@)=x{bPFBY0o3W#h_^w<_e@HzXBPpr<{B~o
z>6B_j3@9-cFX_5vy0qha<F|;}p)(&DB@syp2|?Zt1k)%!I1g^b3DabR!ca4@2vYz!
zg_lwuJr5s%XZtPGN)7_Pge5V&(;Xf`$;nD+ZbOC=;(S2PbG{~zZU3d)#N02m_jc|S
zDc`MpdU5X=pBycmlA1Qr@S532zyD&7m-#7Cd-bXqc79LIfloG{*RJmj3Q$`D{UH>j
zIUUzbU2z695fP_7>13NVDG7V!VQ`wp;&frRZt#=h=0dJ9R~k%-O1tZPvwGSoq>a29
z#j=5KD`fi`ZtdhG@`K{r;MnxSbZ4x3{DB#F*Vf)Mv+e!jUhiz)@yXH!pY2<JrAPAI
zHfPD9JIl7rY1&*?zC}K?Vy~Z^S$Ky!dhsW_r@s0eJ3klAZ&|#y<FV82txM(&o>8>%
zgSR$6cl*SrH*S4yqI~#Ix9_TU&2jY#%N862V+-^gb4ff7>AR&k=D3o~V_WCKu`-v?
zkpedktztOo4=w>6mLXU}h?}*ZbW#OyJj=2kd)vBfLAfMbxLnAM54qefoyy&fa`Rc|
z#k0_PE6a#C!#b79C;hqh6jns`^D3rNfW!Xon(;{%uKfrX4i*g1$-!|JH;zt+YQuD3
zKObQ_y>FpIl8)#=1Bc3LK3&k63M2{c9nh(;_c)8&Iu#lO&eG^lGTg-Qn@g>f9^_KH
z|Bq5DVc?rjr*|qf7(I_e{h&@-8`jto>fd;+C!LZ3^fn#(G(m$QiEFvnfeYDEDed4A
zz4*Mg?r*^P8s!+Tuk<9X!bDf-&q9k1fSe388;!6~eGn{6yGeXafXj|%&Tr7qd?O-G
z-!K;+bKr3vE-|o+BJE}QPn*T{y?eEQ&CYr(lb$m@3Ps(N1P9{Qx?r5N7Ar!-j1CnC
zt}(yTFC+5FwI`^%ES3Lu!l%1jzwFjCK63H$<y!t99rQuZ=zDXtpIXR0Q!SFYXF@vd
zyRn~-J+itFuUdkBjnRnc<mY2LEWLF)gXwYr;Dp^mhrCugox%L}H}mPpo9VFh*6CD<
zMy3;S3muZ)I-M#BS~|*#zJ<=eJnb4Po(3JibFv75!MBqXCibD|K1|vt(rFD9U^K>y
zz=kg?=8SjK9wv63?*l#GGf}B}#dIDbYJ+*s>C|d)TQsc(aozN)>8rsL@Tk!}7NLku
z#O`BSoQ#8wL5Ycq*&M|otSm=qCHOD)zu+V6|9RVma>|}z?H&Z9zj0FO`1F=uHC@HD
z|F{6-lj1x!^QTWOT{bN)xNKH~vEh%d!~j>^4{rtDoul^(doeKLfX8BD;0+mo!}o-F
zG)NBS(J8>?7H*lsXRug$jn;9*QXZXxPVx%??9mb(*cwDfx`*k6y7y>NmhSN-xx>Cv
zF=!%<aiZJb3k;n~shf(_*l~@=BsN$lqmK!!2(^M`CANZCR&L?4f;#y@he6^t@wkn1
z;XpG+X+ee?l3u4n))do$4z24afj84(JB;Z72R0Ju1l~f2+OE^7l#X+K%s12FJ|sF=
z0f35KEH@R>-XK0cz<zQdZa9+6xUz|LYmNZ!v_Tw>sCYSe)a{2y-Z!gvLrT~9TEnin
zYkqG~@7r*sD%^jKj|JqVXCS}*p`9ebZV!yNT76>u{c$sKq$R+mk#=%P=^BYE*q)DD
zxOb~L0)bB)Qf!t|T0AW!Eup5{xZ6ai_CwXK#?*mPais|(Yu<Zr=sv@1QU0rZLZ_^5
zTh*Sk{6Ifn(<U#U`i08t!wNTTy1&1qQpA!W81Iz{2G4bcgikK9Sh@(mI5j8;c3*&3
z_wEG+NhZW-P=rRGKJHDn+lBj-1qHeZ8}4?)z1o?$*iA86I>kaO6lQCufLmD(%jvPC
zp<#88969vlqs~7)^rg6d%G@Q=$IB8NWGc%qE6dL<FNu#WD-OF9R6Ka7O?|&heZ}Nv
z$K<jJU4Bm$ZQ5+Pt2iD}I>;7Pn4c9S%1U|^6&Dv3m5O!23Ac?-35@95zbpa<5PR)S
z4@q>dMlRz0s-)bKNMllxB{r5W*D#pNs;UO|@1K^J)ys9u#wT=LAIJFgK}f<4^$H%6
z|NrYYluq|vr;x|c9giw-P)-jt{(rfV<BQz#K1I2G%X3O5_gvmEamf;KZ+O%4tOc><
z#bN&sw{@tEB?Segr3D2g^||$Zr!+gJOmc`+-^i+}$bjhn1LNRPz*rks@(f+C&psuB
zXGGKukC(nr&olHP9Y;RTGph<4^=`?-u{KO+p9^O+(<wxtjT?ve>6i|lXKA4OCG)UN
z=f;^1&EkeW1I;3aWZzV1bT_maKz{)Nis+VqGRA{Xao3f%>aPT^Fb4PvU);H3kG#xw
z9ACPEy<G$`>e1c5bQwJ<r6u2ypWl@4NNyN~cO7NSotYA5n^I6PIWa7C=A4ZGpp5u+
zZ^>W934j#=_<^r;;iFF!zYgBcvtth#&JOUi47(|EbVHIOzc~j5w4_WL-9`N%bM}ms
zE=f}h3#TS^NtrPlZ!ti<|AO1_8=&d?o>2m1f#Z7P$lQSAPd?(rFKg+Y1Jt?;cq30B
zqV)s4R`>>}Lgkk6Sp)s-sGY-9@(bh(rmFQ5cHZeV&6qQ?xL{<V$?$dc!t%Byg*`&U
zd*%@}gBRY!aTT5c-!qcyVj7fL`~Ok)9RN{X+23<tnFcd3z|i|p6zN@xG!an{sVXS;
zE|#$?Dpo{Ptk}B(w%Cm^u_w_a#`NYU*_6%h#&na-MrEGg@7_0qm}K|=ZOl-HH}Bqe
z?z!il`a3Ku6#;R`jq_Hp2Jwpym<A5BxXU>zSK@QD{>Vvr)t&}%ZS@ZLlpL{rs@5TD
zc<uZVLzmPIPsqtdM}Qu}UCMao5o4zhqr6CYlFkTzvt5udK>I$+Yp*&PAW+zS2mHb9
zj<nOi#75E+Hbr);5AM~sv*UcQpKm4tW0Yne^RyQbt-sW{>U5%^&cj3NU?8~p5Qr;U
zfEh)D&lL2R(T;+<Q=nhi)v6L@U~*wpWLZI8Ky-qBgl_84@REXjQ%t;G_&BXP+Y}rX
zoSHeak$%gd8YEVTr=85~F&?Umh+c2+QKv={frB$a5-kQafDb9R(8YzkV=QRu_=yiP
z^e8L}9Om0I(|E%AV@{?kst&x1fd}LsI&o@brytS5L5&eT(6`JUG*c_<C_h@)A^~O8
zj0XYa=i}j`JY$#KD^U2zD`eQX(P6GptJZbLF-!bWO|}kw$>?gDuxm8#zP?U&bxM2W
z_{V+hd7Fkl*j%kLO4W%y0y_Q7`?_TG2`+Xt`D?xpiHi%ti+mZBm>AS0CPsPIrQ5_Q
z(QaWArbK=5RLvP`&t%O3F;)R*Ftv$P0F`!ryb<p=^FvU{Izp~Q;OEM+N!W&TKwxCB
zSRSsm{7SE7C)5@8mu`Rj3kT#id?s80YmnaG_8DXw8SoeQ6kytQdLO6VGwc&-B;lz~
z+=pyTRw{)MG82j^{lvY;n=$%(Km*vQJgW>L%c&eAWzso(&M{NNb0i9B4kws~8*h77
zcvh73S@HWV=tDp&#qX%72EXEWp7z0^Scx2T5Gzg>lLc_{@D|I=BjWk355K@Q9Q};2
zfL-lK(S7VFqAC#_9c55e<VN9~!bb_@h=zk~q7sQaL_U1fMm_+{*7q(!zIOKB0nXAr
zB+H*1GfwRH@H5^&%{(D0YW(Ex?H^ia$YN+p(479xG%q$|s6p}*P^?Ql0bIk7V9etK
z)I%N`br78u&vBXn2z^hD759#wo$P@UL~9=9e*^;*$}Ma7yZ;pkk&oH5sqFv8LX>Ap
z(KInr_|~nor#^2b^Lb<IfSPZCnhbkR#UZzs)5%d8nTo)NlSv3D{i~b-p!UWPf1TDh
z#3-FU%Q?_`1O8mPc|3?WEv+5hhU76Qo+ZYJwvEZWpGxNa<dM6l5P~o!MNVdDp`sut
zXyzm791ubzh}LykUpf5e?c2F;+Hdep&CT5D&6~N&&CM9gN_mVGYvUzRgL|XH%Ck!N
z%yDC!s&Hu0z!Iy>HQW-i+AIb-bJ73dXI7ewVe^e+_vnrJRpK5_G-k!y*{M|aoPq)b
z>U01#WcQ;Y0)Zsjw1mov=?TDYhRGcWFC_uyNL+xiH@PPT@~>I`?l)whJNZCz>Dyey
zg{<bLauI8`5@Pw((#$o}6=9wMHae_*{7zQ{*mZa!SSFwmd==uqnCC8lWtBJv65`?J
z&YMkIZGg_6@)wh?@>j}Zt^zbIustnEN6IGj%miz%6gOuBt8NS7m;RGD&B<K%)2X&|
z_t&OpZ~XCi%guqqU)j;N_g3}5o8oI{g?0D0jeBv|Q2z7J`4PLXkD790^8o&=^nx(*
z<eY`iju!dI_P51x7i#C87*1!c#H@kihgs9C7^0X0dGbAI=tJ#GWE-PWOYP$Z7n7Xb
z8p{-VS<V`0dMoxh&L0^(5#3+n=sXSL_vuYPo@qJr!|Jpn)i3XC+4J&X@x0_W`TE9k
zDTiFD*mP|o`BDm4cD$VMW7@ZqiermuYgVEt!sz$0A8Ea-gTjS3`+Ix)`JqdW*1CE)
zjb!UK%bM=y25}KU%lBzoGfQQMI}q<#$>n$GqX~IC7g^4e*_9hBc9U-Jd_cl?mT#yc
zvn=Nq@64O@7cptUKliQu>5ZzD%{{L_-uWu&dSIXQ;cL4dD{ka8udICY=hgfFS!<=#
z|CM`h;{ukU&+OCxU|CY%?@i@2$lwKdY$Yi*Q7bLp<%uRa2tK9N?25(m6|d4OB05ET
zsTV$rU9nWYBAZ?zgQdy#Ya5gFbQD?AmrAhxaE-z7iET>#4pZ1^u%6we3^UQ6^Gyts
zEyg>t-+|2+IS4xVbVJb-NNI-KU#-S`gTlihENI3e^*ZB!`VC(hnoK8bI5!)99D`(u
zV|W{^C<mG+O<6X<IaV~iF|+Z^j^>R^Z~yx1C-V-(+pGOumpQoUVuKxnwc4O=t_4G#
zb$)}E&Z>NFjpN%Ne){g)@2_IGaz+w5up*?)KXUEfzEW|oWR)-vIoSoHqWeeV<e`*m
zfyL_%xz;t)s8)6D8WyH-aWFgi1_S{2&qKlL?di<BvnVqJ1ooqB_;hZA0cMARO2Lzi
z2H9w(C?W_rGy9NhUisGS-J8!}n*HgnnFn)Q7ks>Gz`FAM-Q&-+4%$C;a@D@AdzF3z
zjxXML!b5Gm^<3kPF<nfSkCh4g-yGGLv1xJp+Ah)iH%(g8bItZ8bxW`q3JvCMhsdRy
z0zF3zTBRFeph^lc#!`vtSqU<lXwjh!j0O-if}J$UKf?X2SCp@mbNs$B+@w;g0=gK!
zKzZgzWtY$9rJcA`BBWRj$JI^?3YalJoMZk(c<oW0NpYLv5YclC)cXd<bXBq*LvX#y
zqF4?t!3p0{G2bcaTuw2eJ26r2EM)W0bB!xsF6rIx$k^dS66cMYcYN@IFSl>_yl(Q1
zg+<dd-aKD<Zce`qV<v9y*Q9jK>AEyLWnho^;<BWiP0!BV_tzN{UthoErIo=E!)Fz&
zUT?{F9eQk4^}7CL`=+lwO)1273HUOc$_qF5@NkYZgkX<o4YC82fd<Q~X=Je{IYCy2
zE~hhQfGVIM4J~v$RUCI`!-O@x3Rjd*J>Ij&$=ZK>+BB+q^28VB%xEj_k<(PYsP5<n
zu5M-c!0eu7A@Tkj{kxu9Id87F)_eZ&>cu%gweagw)_+Jb=4Y0s@%s_cWR=854-Zez
z5PRNB0a)p%PNz^V91iHeL!%iC4GMxEn*wqTiCuD1F9n3!TNryNAjK3kanjOLgN7aX
ztj@k_VYc*$yZ`p%<&h=3rjDyitsJ;BtJ|=_LH==J&TbQ*U9m;_^6m^&AFf(}4mV$1
z9x!8J4>y;LL6mY#dVq2ir^&&fq>ZFR2eY#l1^n_>MzW)I4^XauI&#OI2SC%o+9h+=
zBUop}Nh>?G=20KvXv50EfMK^GrSUA&IUiPr4wjM^)v(;1oCKpCG3#x(SXK=S+7-h9
zqYZqVNUW1{fRmGRAjb!AoRB~2?x}}AjQa5SqhBP$!JR709I?4&?-nh$Lc5(;w@W);
zAp6POb~5sLY2>3HNeqdR-j;5QLBQMm3Q1+?)v92!5POMwy&(Q<9&$XQT-I!5383qc
zf}-+n)t=rH;wo456MDBl7(2#6y;x^R-MEyugM^0+6_8JW6Y~K*F(3beozn+T7@_b*
zB-}u{2s*&Nm_;3gitJjmhGj>RP%Cf_O%;XV4RBycjwD$EhJ-R~DO%-fPd@4%SX2>|
zWONFPavxn=-j$5k`vkc;n6!FRs9SWeIOBeMA8%Ks%Bj1*^qY{puWE!^tQS>cuMOsQ
zyO3x%6<>?06#w2S<dvY(vI6g%?FE)SbncKSr~t>@XS35DUtpK_M)fo#j7q5hnxGBw
zi6KoETLGWY5i8Dx_QpDP&(JMYqh7Qr^I*}Hw$p%hY6zb{D`XMzC&jORBsEIMVYU#(
zRPg;C@O_#hIMW~szL2xgFlY@1tSJ*F^o&4>6qIYWI{_zyt;mE&BISJ(cwdI!0ET79
z&Xp@%I&GDy#moEUj!G<BUFuadBr1oyl05L}s?uE-T8=I}Q8i%i<ngsh1rfUglKf3I
zlb4;TBCX?gj&rkf?me|=#G-y~yvVOw99lHDq{duVx^Bq$$%$^RSp!oB?8=H5Iyl%b
zrkjh~m==2Svq&wXQA!%~#nX9U#c3aAil^piZ!q$Xj(}66NMTk)HJl_A^6&|sS^`sH
z0jY+^0>251ydxbPdqz!~CIub*YqQYnqr@3H)iSl?;zfX#$>A^c&1|%!<)`87I*1jk
zX4!v%7|j7STV@@ctDc@dKDM-EoVIcukemZ<#rczknk&MiPtGc#dd7#%19qosM4@fw
zN1NBYJ4*`OwIyv=#lg+%xnLmE#zX|K86>?Y1U&c4yd{>O-?}3mi;KVe-uv(2si`bG
zh?#^aTr#zuPQH4<Xob&1l>!qLPb8@ITzIlnP-mSIxkbf0y2mFi==tn{)E#TbFGwm3
z$KnJAO`0@dQ%%~kZ-v1D?u{;ff4@6#U5Ou-B6Z;2^zfmBL;PdAxfpV1omz04sOmry
zx*lg3*ZNc6nU907uf5Xj+96O_XDHdZOl5o!w0gkBA{Cw<NleP(ED(lF|GZ_(XY-nf
z-39W4^jrTC?bmv4m~nh}7jzzZ|4s6s`TK^2_n&#qGOMxZvt_f+kNe<o<^HwluYeLR
zkMHs8FuswF?!q}cBlkgx9+S*oVYzTwh~jnj13|0+pn_i~l})OO80zmcDRt=1A<{=^
zGrY#KaqcLcW`Vs+%Esl~qQXqvpXp?{zZ+~J8b{Fn4htAthus{H5(*!h5q&17o_eLU
zWz*i)0|9=mMjr=Ba#`{9CSar;KX?0whim>euXyXBQPPXj+mw2ei`WP2=z~)UI1sK5
zX0@AJpbH@S5TLhb(x0hu^b3|1-YZsJ2F-^GEef7PF-4imO+)ck!-VA26;=;BG`ek5
z?Wv*751aSz_`ZG?_hEMB<YS{!#t5Z@M*Vet^MyegZpwu#^*`^wAxX<MQYiUIGxxU_
zTZyytgvFL7&G?trFF9KcnffERzMs$^ycU@0q;qlcP<sRJ+RMT04^IYFUg6sA2Amem
zk$C}K-JDUD?`)N)Y#%_L0{o7*O5DW6lbI!HKFuWKlr-RmM|5ViXQY#BO4k8X`}l8{
zww@+;PWj{jY)o%V6Z$8OFO-&Z!z>EPDYLYz$S+pfWzH=p8!W^4UgT!~0ZQdk+8Z0O
zE*Ei?(n;Y5Iy$M<?!e=8Faz(J0JNCtOh7<oo0H*bume664%bd3WGe}?i61oo^zcCc
zL;n67E&KNG{&B^@k*#BtP7lXx$KKeu=KIF_pH{vhSr%%fVDcB`%zxkH{4F1EKVPO2
zw^4aC9hT-L@JlqJFb0#!AsV>F_I6#ns@1;GZb2-}f&nig)`1m$QYXl8H|1&~xrrj(
zAaV;1wpXxOxKJ@CEYY*#Xq|aYfX1(BYVGksUWs9cGt+A)<PPe#Cvs3m{<!4yETMPx
znTr$mJy<=gs%lunzgs3=JUw)s^yt8AZ}gg9L{g-e2h7bJ^6ZKOL|g|S)YsH9q16ns
zWr8ZHGmxzIXG1(?(?qsk*gjxaG228jA%I>J5nwe<SS3A^&D08F`8cqokV>jO6VNFe
zN49XN6(n0Yr9R9~vPHxo-x>XwCAAskgr`h#6|>Qvi2)sLo_*@;`jy#r@GQam|0lKJ
zSP3VrL>8=Pf4Z{}lUKOAxFA6b-F#FsCY78Q#e7PD^|oS>$Yv6Aa!_XkLmooNg?~G$
z#N979GPb(My!BFDn{<qSNlGGXU%Pw9MW@}Q)pi+MT|aNO#ho@ekg6}8TmQ<-cp5rW
z3yo!vVQi+eNE?e~=xk9!%oE-h;S1Q=CaRH%Fys_SpwPKI?ejvK5H+QJ;cR9|<DHr~
zF=d(0n)+;gi9PqOB~<LS^y;E9XUqFvoAHhG_WB{`i1t|BD`mNTj*1DHi=LaeY55yX
zeOc2VnmE)(j5jAmcij*iNl#an(}5fiCCwy}=l_)F3m%I9+wQh?mcd<U+?0b1`C5f0
z29O}puninTz0~GtCntpu!p*j&V8#JGIR`vhiKIky|4c#wJQH<702V_p06`+ydUBXd
zOHDn!+`9Ys$nR#*2ZnSta;=ST{%gWxh4h2;jI`d~16>vMUImNzWgD+OJLv4nS#El5
zlU6@sS4G}ifLRIOYuPa2;@lViA^H!xe&hL;oW>ht4>ztIIU^Qx#>%M%V$RNx&DhE4
zZsCI|Q*W5d6aN)-3$PFNGj)uyhCH1oYj`qIw5nNhtl`aHCSq<sNk=UU`N)k|o*i^%
z<xI4^*}zS<PJ}yc>9;|i0n1on{EHc6>NzJTJ<mG=j#A?&JL8@N60KY+n+7uH!tmtD
zmRs*0p0Qe*bwqjwo?of@;<J{2k$=yhVev%YKkMoWpE2&lj%QJ{&lq<)*|-xN;0o^i
zNi`1~`~tm(i&G@CYXS|{Tmf+KEolk!7ur$Hm3Ayrb5<yd+bsJ5_!G2ek=(IJBgLMO
z(vEOHv`I_ILU<6r5PdNY{$uq?%)c$uUziR0>u~bYec|Q??HC{zHdmx<slXkHr<WN-
z84%jR7`ON;OVO9_d_Vjr>1)e3FCXfEY&Fumnx!t|F3x}Tb1R8u{(j;`mw%^TbfuE+
zSIoj5Pu2&saKJ1)GwoUL7Zm9WDkZw3zE1Ob*aK$a+2|7@nKIFnOA-T=T5MOL`Rsvq
z^?|8<myXTSko(d>O^@NTvw<{(XSUoU3#BETYaPiTL&&iG+iImZq^r_hvvpmbc+Npz
z0nvkVn1ul+u(LwLJJ@4_2<{uyX0^z2nt|?(gGKfU;PAzC@D)ccW<*R}h2_OdT>L>U
z{*vWIuJ}dE<%5<>FLFO}FI&>M7uhS-;=p}n@uDw`SA;cBg}0RTCKY%uFHcW9Q#ao1
zY}ZLB$(B5<Wf_M?ppK&s;6vFDV+Ad<HBA+KE^I&h!eU9fI{U-Q9_u#ueEIe7-hcbG
zb(e>>u4p`8QIfLh?6@88P8No4KJKaVJiB4>jY+}XcKL?8ZEI{=+LSZDY<g{8@{F+D
zu0s&)CA8*LECf}ISQ))a?c^*d>|NAQ&?sYq9t=9J6zUm7XPn&Y3C28{GQGNoLmLt`
zANl+qK~$n0_ge_0w4aHdHff-{@G5-qISI3;4sw4KP1k~r!ubD`mH*#o{O`$zp&mIF
zdl5dvOtj!s9jDUr0<FyWL;DrV9&}xV&+b@;9XY}^-LTB%{*K*vo~=O&?gU9Ge26>w
zU?<t}-bg2=zG=GQW%oPnV}|IT?52~!vl6XhQuy$Q6r%S>PO4|&qH(5NPYA}0{BDjq
z2u2s)N%Wuk%l!|_AmW$|9KExo=bJ=BBKOK%|A$yZM`Q+ne=0s8Ur+Ztn6SonO3+?W
zkoWNY%hxl!7$vRw!|zXd=kb(Grm&}k&hF+Y`aqTdv`}6)nXlkYV+<v$KCGP%1$d_2
zdw!CFdeoh)PZ=57Wk`JC<gyUU?TchDnlq_XN(V<J0V2esk5|7?ZO|QdHb#vt7c$%5
za0u<{;?M;sB}sHX)@T6c57iLA|K9IT<=F+y53x=31jbS#dLggoZR~h@N{wdQU6%Ob
zg#(YyP<hsD`PL@T9)3nS6y~>Z1NUJP+@MEm9#KI%9$6Q(<LtnyGBsKD+|v`@5GUL?
zJoD|kH$FMCc*Fb~a}IOWVewba05<F0x$`5!IBNOO6N*YmHcLBXz?jtnAgC!7=_D~r
z$X$7g_^z7$p!f(k;0QPHm@IRt+@*JsmZ<G<7gSeg>h$zs9iDnx`A(gmm)=xuf8fE;
zBV3<jT;C&|9~<|?qjR_$n&{!KR_X1A2M12r@1?h#XK9n(Pfkl<E*>S)4>#|P{Y`ox
z{r0c($I1@Z-Gydl*)Z|>*)RUXD!&oe0S&~5j0Q$T&hZ3B<aD}0B)Zzm2L+V_Ov9t+
z^Ph}_cW)iJ_wv0l|CWA}9{+gmXld)B5BN_JDz%Qae)Zas(_<|CXsC;x2pCalvyKSv
zpyOdU>u4;y$Epihm6l*zFUWvfM~LgoKTMP)JkvYG>-_o3<BO!n9Rqco`x%hFt08@v
zKIrS?qjIAyA62|<d$1TNatv6zXBk3O7QS?^V298c3{UQkKAPLB{C)EY!XGKyDc$^L
z(W$cXQ=?YAwkn^uL~w6u`Yk&nCPex-bq$~RqV(&Y@1%p5eS9~$nfk1Ib4BxvXX|p<
z(;|QTOX#MkJcAbP<e=4xL5KvQU7)?XqeCLqqZy5@=r%!IC_4%b0f}-TsG~t0?G;H|
zBY#=E|EE1~N?&bOOWThefkSNzae3t(;<xEh>&QEM5575K_?-j$-x$SO)!mwSf@HjJ
z=?_A!dy$y-J}*7<+4Is5n<<FRMWWxZUhY>HiFL`ty6BlFNY6uGP;ibYG10L$U{*e`
z^#Y?7a}X3tpov;t(Q$FyG-=sQvaNq(IWeHJe*KZp=eAZ{xby`#(z1(N;xXi4-L1EQ
zW;c?%o;+uGBck_mCKzg`m9%~vyfF(aR{|8_K*UjjdmI@S<_aepa79e;LF&|MK?Q-s
zEI=AGSb)Z*>>sRVIAoF%gOc2sZ0{(gV{Q}HIof)XqCuE1H>>i}<~pKY;FGax)x4<k
z`FSdP-*M|I*Iphr|5Gg7q8x(0jD44HsM<8f&9~1|Zo@s&_myB%obv{an}?U)&3tQX
zctv+)+MoGle&sXm(u)4a8=rZpa6;IatJ^EFr>IXgRiJ)IPw*go`2z3n@9Jt#@c`WH
zsTZ|_nAFwOp#dmaM^IN+T6RzEro@gP1lKu3$8N5?x?So*-ko)B+{%rsrGF5gRqF%H
zOVCwIS-*-;7(3lXt)D%wdR>XoJ7JFH(C`XrT{+jQU!n985(ikOB;OmelJgtjH15ch
zgaU~ChTf9C6&{@STwKE`LZ#&b#jw{yJ3!u*qh6^cMx#oo6SayAB+`KHD4)jcu>v;5
z4YmdpH#k-U__ufMYyWLeMRjc^N484snw-h`oC@yeT+44{KHL%NB?LWbo>{g5uI(Sj
zfD@?Yi@IQNLT_*a)7ZqjjE4T1PDJadQvndx;6P(WyoQkwG?WX3Xt5jS0A<apxQS<^
zWb(sh$$y6wa2ejPq-V+19Ryx{%Qt}854XI_UU8h!@-62=Ul=b35z0FFk)r5&sQ^S3
z5TI~}=R<~F!C15uMLt=XT!Plt;dyvs`F0MVVOvlMLtdGGcEqHiIW<|MZtpByH8rf)
z3pHgcih4Cp*f@7h+mgAJtNN!_pcPC`-Qbb4Jk>}?E*`wG%;4|3B``j8KwegP*OmQ;
zmJ|mEE)NNjS5X)Ry0APu2c@GLzFIB99gL^s`7wR1qctZ1WeU+Zp5rQR??4+v%dyu%
zh$5GayeuQX@6iQrum7mwUhTt#-dF|7xuf7~4<T=15tLjU5`ux0K-+6jTp8>5G>XSG
zHBrl<XCJB$g{P_yvuv7koPm#g7JjkEH^5t9F3S&SYX|z{r*CmD-Q%D6uW&C{rmMm2
z=s-KF$ZSb<1gfiXh#7V0F+Dg~v;0?wr86$+Rf`9CMH_TJjuCy+ql5L_3jUI0k($1)
zQK}XSLf@@l6XxA~2IpHm#z4F#Q}3+Q@{Y9Aj0S>@2@-2CBMbb4@EKHFVrwh|EWr3?
zQBX>o)=0aQJiq0y05cm)QDM1P!>c0O7xRlEt70wa1<_u|*I6ku6eF=*5;U^V3Y1y3
z)}^t^cV@)N`vpLxBU@T5yFeEyp4@&!{k8_S3d{@C$wN<9h3-n4O#;Ko%qgumrQ1)w
znULFRxqv%8y1+lzo+q!R++PPfs+8$yxGTdpQc{cv%(p8%E8E#!(ea6hq7p@<GVNL3
z8I=h*2>I>OmV?qxej5LLdoKU{8mjGCyKCUi$Vi90n+nfi9^xZLWDtfRM&jb<>Piqz
z_t$8A?d{B31bJzg1gD&=SF!sW<n3egz9M2`_+5GkAAaEeip4)2-hbey6^rj5TXe9f
z|G|a379J=%uXK@m>et+FJ^0I7y%a<~wqNs0YwOQzbmRrgMY{>-7cF{rf<0f>eoQy%
z{DR9LV8)@KAUcg;##QXuPe8g+>B81ZBVY^RPj&3^J#89l7NxAL{ly7)_qWe(<#JoL
zq3y_gD#t($obQC<b_wCQ6Vp)9ozdRGL921b4XvcKc{gl<IVLWxx+=+>Hfh|E0WB?q
zPuCuP4s0-M?1;=H@-bN9o7A2sn@KYr0jsa9VRMDHWT!@(FO4X&PG2@HHLGKyXt7-L
zFuR3()k^+OnZY_!%$D6rs#no|D-P5j;$RO>(h)!x*D-ct&n@e!HkocyeU+1TwLUDg
z-L*Z((oW`fzB5Oy6ww8D)<e&MuK{^?b~-&A$Y|!$aoAC2McyJ!zh(zr0%2zy-2Q;U
zOW%04y7Jl%DNt(R6Qx&4a@~do5G1YFsxf1lOTc%QlTy>5F{5yjvGY}&h0*N6ah-Hl
z1Wj~IdQe;biO$+Frd5$N1rRL4iB=N6`rN<)&ux<aN({A|RxOt9@$*`qj9EW$?C2s%
zNvTLR6S@cUtz%*x43LZ1-cHu-ZQb1+LxFLK?GPswr2p!RL#i%qmYiF;f~Gp@2I(=U
znOi158we?3pfxOxorOJ0JBYB3fjabfFu1GW;j;x}n2y-V(@Hf}IV8YTS(&zE#E^#6
z9%~0q-B+c;Q5U9bJD9pAIWlEm$&PzVSN+Sy*L%H3P)X~8hU2XP#+9C?84q5$A|Y{y
zb(2&^V{})nCv;W4MkAQexew7OtfQATAoY~43dtN|Q&r_Kur)5l0#j5mR7OvKe{<s-
zvo+EuEiEKiKj-$Ub??n=zn@V*X<~gw=8B0E>od8KGmjPZbN+sa%0DT7>-*+<%js3u
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

literal 0
HcmV?d00001

diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index b332fb089..c478f6686 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -8,7 +8,24 @@
 
 {% block extra_style %}
     <style type="text/css">
-        #content table {
+
+        @font-face {
+            font-family: "Open Sans";
+            src: url('proposals/static/proposals/pdf_font/OpenSans-Regular.ttf');
+            font-weight: 400;
+        }
+
+        @font-face {
+            font-family: "Open Sans";
+            src: url('proposals/static/proposals/pdf_font/OpenSans-Bold.ttf');
+            font-weight: 700;
+        }
+
+        body {
+            font-family: "Open Sans";
+        }
+
+        #content section {
             border-top-width: .5px;
             border-top-style: solid;
             border-top-color: #cbcbcb;
@@ -23,19 +40,34 @@
             border-left-color: #cbcbcb;
         }
 
-        #content th, td {
-            width: 500px;
+        .question, .answer {
+            display: block;
+            width: 500px !important;
             font-weight: normal;
             text-align: left;
-            padding-top: 3px;
-            padding-right: 3px;
-            padding-bottom: 3px;
-            padding-left: 3px;
+        }
+
+        .question {
+            font-weight: 700;
+        }
+
+        .answer {
+            margin-bottom: 15px;
+            border-color: #ccc;
+            border-style: solid;
+            border-width: .5px;
+            padding: 3px;
+        }
+
+        h2 {
+            margin-top: 3rem;
+            font-size: 150%;
         }
 
         #content li {
             line-height: 10px;
         }
+        
     </style>
 {% endblock %}
 
@@ -71,14 +103,10 @@ <h1>
       </p>
 
       <h2>{% trans 'Indiener' %}</h2>
-      <table>
-        <tr>
-          <th>{% trans 'Naam' %}</th><td>{{ proposal.created_by.get_full_name }}</td>
-        </tr>
-        <tr>
-          <th>{% trans 'E-mail' %}</th><td>{{ proposal.created_by.email }}</td>
-        </tr>
-      </table>
+      <div class="table">
+          <div class="question">{% trans 'Naam' %}</div><div class="answer">{{ proposal.created_by.get_full_name }}</div>
+          <div class="question">{% trans 'E-mail' %}</div><div class="answer">{{ proposal.created_by.email }}</div>
+      </div>
 
         {% for section in sections %}
           {% include section %}
diff --git a/proposals/templates/proposals/table_and_text_with_header.html b/proposals/templates/proposals/table_and_text_with_header.html
deleted file mode 100644
index 4f7a01050..000000000
--- a/proposals/templates/proposals/table_and_text_with_header.html
+++ /dev/null
@@ -1,21 +0,0 @@
-{% load i18n %}
-
-{% if page_break %}
-    <h2 style="page-break-before: always"> {% trans section_title %} </h2>
-{% endif %}
-{% if section_title %}
-    <h2> {% trans section_title %} </h2>
-{% endif %}
-{% if sub_title %}
-    <h3> {{ sub_title }} </h3>
-{% endif %}
-<table>
-{% for row in rows %}
-<tr>
-<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
-</tr>
-{% endfor %}
-</table>
-{% for row in paragraph_rows %}
-<h3>{{ row.verbose_name }}</h3><p>{{ row.value }}</p>
-{% endfor%}
\ No newline at end of file
diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index 0c8c0949c..b3d9a37fc 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -1,17 +1,16 @@
 {% load i18n %}
 
 {% if page_break %}
-    <h2 style="page-break-before: always"> {% trans section_title %} </h2>
+  <h2 style="page-break-before: always"> {% trans section_title %} </h2>
 {% elif section_title %}
-    <h2> {% trans section_title %} </h2>
+  <h2> {% trans section_title %} </h2>
 {% endif %}
 {% if sub_title %}
-    <h3> {{ sub_title }} </h3>
+  <h3> {{ sub_title }} </h3>
 {% endif %}
-<table>
+<div class="table">
 {% for row in rows %}
-<tr>
-<th>{{ row.verbose_name }}</th><td>{{ row.value }}</td>
-</tr>
+  <div class="question">{{ row.verbose_name }}</div>
+  <div class="answer">{{ row.value }}</div>
 {% endfor %}
-</table>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 069750db4..185f57a2a 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -434,11 +434,7 @@ class GeneralSection(BaseSection):
     the general workflow for creating sections. All possible row fields are provided, and
     removed according to the logic in the get_row_fields method.
     This class receives a proposal object.
-
-    This is one of two Sections (the other being the CommentsSection) which overrides
-    the render method of the BaseSection class to allow for formatting certain values outside of
-    a <table> element and in a <p> element. The implementation of this is slightly clunkily
-    hardcoded as of now ... See the slicing in the render method."""
+    """
 
     section_title = _("Algemene informatie over de aanvraag")
     row_fields = [
@@ -487,21 +483,6 @@ def get_row_fields(self):
 
         return rows
 
-    def render(self, context):
-        """NOTE the special template for dealing with these cases."""
-
-        context = context.flatten()
-        template = get_template("proposals/table_and_text_with_header.html")
-        rows = self.make_rows()
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": rows[:-2],
-                "paragraph_rows": rows[-2:],
-            }
-        )
-        return template.render(context)
-
 
 class WMOSection(PageBreakMixin, BaseSection):
     """This class receives a proposal.wmo object."""
@@ -1056,26 +1037,13 @@ def get_row_fields(self):
 
 
 class CommentsSection(BaseSection):
-    """Gets passed a proposal object. Again has a pretty funky overwritten render method
-    to account for formatting in <p> elements, similar to the GeneralSection."""
+    """Gets passed a proposal object. 
+    """
 
     section_title = _("Ruimte voor eventuele opmerkingen")
 
     row_fields = ["comments"]
 
-    def render(self, context):
-        context = context.flatten()
-        template = get_template("proposals/table_and_text_with_header.html")
-        rows = self.make_rows()
-        context.update(
-            {
-                "section_title": self.section_title,
-                "rows": [],
-                "paragraph_rows": rows,
-            }
-        )
-        return template.render(context)
-
 
 def get_extra_documents(obj):
     """A function to retrieve all extra documents for a specific proposal."""

From 23a5d67afe768758dce86e518992c68e297b7fd8 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 24 Oct 2023 13:36:46 +0200
Subject: [PATCH 042/148] DIY solution for <ul>

---
 proposals/templates/proposals/proposal_pdf.html | 11 ++++-------
 proposals/utils/pdf_diff_logic.py               | 12 +++++++-----
 2 files changed, 11 insertions(+), 12 deletions(-)

diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index c478f6686..8d34efb65 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -49,6 +49,7 @@
 
         .question {
             font-weight: 700;
+            margin-bottom: 5px;
         }
 
         .answer {
@@ -60,14 +61,10 @@
         }
 
         h2 {
-            margin-top: 3rem;
+            margin-top: 2rem;
             font-size: 150%;
         }
 
-        #content li {
-            line-height: 10px;
-        }
-        
     </style>
 {% endblock %}
 
@@ -104,8 +101,8 @@ <h1>
 
       <h2>{% trans 'Indiener' %}</h2>
       <div class="table">
-          <div class="question">{% trans 'Naam' %}</div><div class="answer">{{ proposal.created_by.get_full_name }}</div>
-          <div class="question">{% trans 'E-mail' %}</div><div class="answer">{{ proposal.created_by.email }}</div>
+        <div class="question">{% trans 'Naam' %}</div><div class="answer">{{ proposal.created_by.get_full_name }}</div>
+        <div class="question">{% trans 'E-mail' %}</div><div class="answer">{{ proposal.created_by.email }}</div>
       </div>
 
         {% for section in sections %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 185f57a2a..325614cdb 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -283,13 +283,15 @@ def get_object_list(self, object):
         list_of_objects = [obj for obj in object.all()]
         return self.create_unordered_html_list(list_of_objects)
 
-    def create_unordered_html_list(self, list):
-        html_output = mark_safe('<ul class="p-0">')
+    def create_unordered_html_list(self, lst):
+        html_output = mark_safe('<p class="p-0">')
 
-        for item in list:
-            html_output += format_html("<li>{}</li>", item)
+        for index, item in enumerate(lst):
+            html_output += format_html("- {}", item)
+            if index != len(lst) - 1:
+                html_output += mark_safe('<br/>')
 
-        html_output += mark_safe("</ul>")
+        html_output += mark_safe("</p>")
 
         return html_output
 

From 347d8d7f1de49884c9c20e0cdaee9fd5f6e8fcdd Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 26 Oct 2023 16:41:29 +0200
Subject: [PATCH 043/148] ref num and title on diff page

---
 locale/en/LC_MESSAGES/django.mo               | Bin 147097 -> 147190 bytes
 locale/en/LC_MESSAGES/django.po               | 137 +++++++++---------
 .../templates/proposals/proposal_diff.html    |   5 +-
 3 files changed, 73 insertions(+), 69 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 49713851ec1ab892392595db1c86020855e968d8..4aa2855c41066fc6561baf81b064ca81780db0c4 100644
GIT binary patch
delta 16093
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

delta 16010
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
MZ;Q<8J6rny05&U*CIA2c

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 83a137f2a..c96ab3da7 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-09-21 10:45+0200\n"
+"POT-Creation-Date: 2023-10-26 16:38+0200\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -83,7 +83,7 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 #: main/templates/main/index.html:177
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
-#: proposals/utils/pdf_diff_logic.py:848
+#: proposals/utils/pdf_diff_logic.py:874
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -152,7 +152,7 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:100
+#: proposals/templates/proposals/proposal_diff.html:58
 #: proposals/templates/proposals/proposal_update_attachments.html:26
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
@@ -283,7 +283,7 @@ msgstr "How many times a week will the intervention session take place?"
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
-#: proposals/utils/pdf_diff_logic.py:506
+#: proposals/utils/pdf_diff_logic.py:601
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -344,11 +344,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:8 main/utils.py:13 proposals/utils/pdf_diff_logic.py:214
+#: main/models.py:8 main/utils.py:13 proposals/utils/pdf_diff_logic.py:256
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:9 main/utils.py:13 proposals/utils/pdf_diff_logic.py:214
+#: main/models.py:9 main/utils.py:13 proposals/utils/pdf_diff_logic.py:256
 msgid "nee"
 msgstr "no"
 
@@ -401,7 +401,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:79
+#: proposals/templates/proposals/proposal_pdf.html:105
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
 msgid "E-mail"
 msgstr "E-mail"
@@ -1238,7 +1238,7 @@ msgstr "How many hours of observation will take place on average per day?"
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
-#: proposals/utils/pdf_diff_logic.py:578
+#: proposals/utils/pdf_diff_logic.py:657
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1783,7 +1783,7 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:420 proposals/templates/proposals/proposal_diff.html:83
+#: proposals/models.py:420 proposals/utils/pdf_diff_logic.py:1045
 #: reviews/models.py:180
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
@@ -2209,7 +2209,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/utils/pdf_diff_logic.py:959
+#: proposals/utils/pdf_diff_logic.py:1019
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2339,11 +2339,14 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
-#: proposals/templates/proposals/proposal_diff.html:41
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:43
+#: proposals/templates/proposals/proposal_diff.html:38
+msgid "Overzicht van wijzigingen bij aanmelding "
+msgstr "Summary of changes of application "
+
+#: proposals/templates/proposals/proposal_diff.html:42
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2351,16 +2354,6 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
-#: proposals/templates/proposals/proposal_diff.html:87
-#: proposals/templates/proposals/table_with_header_diff.html:13
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/proposal_diff.html:88
-#: proposals/templates/proposals/table_with_header_diff.html:14
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
 #: proposals/templates/proposals/proposal_form.html:7
 #: proposals/templates/proposals/proposal_form.html:92
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
@@ -2368,7 +2361,7 @@ msgstr "Revision/amendment"
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/pdf_diff_logic.py:334 proposals/utils/proposal_utils.py:40
+#: proposals/utils/pdf_diff_logic.py:441 proposals/utils/proposal_utils.py:40
 #: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
@@ -2509,7 +2502,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:44
+#: proposals/templates/proposals/proposal_pdf.html:73
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
@@ -2518,26 +2511,26 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:50
+#: proposals/templates/proposals/proposal_pdf.html:79
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:66
+#: proposals/templates/proposals/proposal_pdf.html:95
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:70
+#: proposals/templates/proposals/proposal_pdf.html:99
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:73
+#: proposals/templates/proposals/proposal_pdf.html:102
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:76
+#: proposals/templates/proposals/proposal_pdf.html:104
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
@@ -2569,7 +2562,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
 #: proposals/templates/proposals/wmo_form.html:7
 #: proposals/templates/proposals/wmo_form.html:30
-#: proposals/utils/pdf_diff_logic.py:381
+#: proposals/utils/pdf_diff_logic.py:493
 msgid ""
 "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
 msgstr ""
@@ -2578,27 +2571,27 @@ msgstr ""
 #: proposals/templates/proposals/proposal_pdf_empty.html:120
 #: proposals/templates/proposals/wmo_application.html:7
 #: proposals/templates/proposals/wmo_application.html:27
-#: proposals/utils/pdf_diff_logic.py:404
+#: proposals/utils/pdf_diff_logic.py:518
 msgid "Aanmelding bij de METC"
 msgstr "Registration with the METC"
 
 #: proposals/templates/proposals/proposal_pdf_empty.html:134
 #: proposals/templates/proposals/study_start.html:7
 #: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/pdf_diff_logic.py:415
+#: proposals/utils/pdf_diff_logic.py:526
 #: proposals/utils/validate_proposal.py:87
 msgid "Eén of meerdere trajecten?"
 msgstr "One or more trajectories?"
 
 #: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: proposals/utils/pdf_diff_logic.py:432
+#: proposals/utils/pdf_diff_logic.py:544
 #: studies/templates/studies/study_form.html:7
 #: studies/templates/studies/study_form.html:82
 msgid "De deelnemers"
 msgstr "Participants"
 
 #: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: proposals/utils/pdf_diff_logic.py:676
+#: proposals/utils/pdf_diff_logic.py:748
 #: studies/templates/studies/session_start.html:7
 #: studies/templates/studies/session_start.html:17
 #: tasks/templates/tasks/task_form.html:7
@@ -2623,13 +2616,13 @@ msgid "Taak"
 msgstr "Task"
 
 #: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: proposals/utils/pdf_diff_logic.py:795 proposals/utils/pdf_diff_logic.py:805
-#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
+#: proposals/utils/pdf_diff_logic.py:330 tasks/templates/tasks/task_end.html:7
+#: tasks/templates/tasks/task_end.html:18
 msgid "Overzicht van het takenonderzoek"
 msgstr "Overview of task-based research"
 
 #: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: proposals/utils/pdf_diff_logic.py:813
+#: proposals/utils/pdf_diff_logic.py:836
 #: studies/templates/studies/study_end.html:7
 #: studies/templates/studies/study_end.html:28
 msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
@@ -2642,7 +2635,7 @@ msgstr "Informed consent forms for the study"
 #: proposals/templates/proposals/proposal_pdf_empty.html:389
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
 #: proposals/templates/proposals/proposal_submit.html:181
-#: proposals/utils/pdf_diff_logic.py:966
+#: proposals/utils/pdf_diff_logic.py:1027
 msgid "Aanmelding versturen"
 msgstr "Submit application"
 
@@ -2686,7 +2679,7 @@ msgstr "unknown"
 
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-#: proposals/utils/pdf_diff_logic.py:262 proposals/utils/pdf_diff_logic.py:272
+#: proposals/utils/pdf_diff_logic.py:303
 msgid "Download"
 msgstr "Download"
 
@@ -2795,7 +2788,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
-#: proposals/utils/pdf_diff_logic.py:90
+#: proposals/utils/pdf_diff_logic.py:350
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3248,6 +3241,14 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
+#: proposals/templates/proposals/table_with_header_diff.html:13
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/table_with_header_diff.html:14
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
 #: proposals/templates/proposals/translated_consent_forms.html:25
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
@@ -3351,32 +3352,7 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
-#: proposals/utils/pdf_diff_logic.py:82 proposals/utils/pdf_diff_logic.py:104
-#: proposals/utils/pdf_diff_logic.py:114 proposals/utils/pdf_diff_logic.py:135
-msgid "Traject "
-msgstr "Trajectory "
-
-#: proposals/utils/pdf_diff_logic.py:109 proposals/utils/pdf_diff_logic.py:140
-msgid "sessie "
-msgstr "session "
-
-#: proposals/utils/pdf_diff_logic.py:122 proposals/utils/pdf_diff_logic.py:147
-msgid "Sessie "
-msgstr "Session "
-
-#: proposals/utils/pdf_diff_logic.py:142 proposals/utils/pdf_diff_logic.py:149
-msgid ", taak "
-msgstr ", task "
-
-#: proposals/utils/pdf_diff_logic.py:212 reviews/models.py:122
-msgid "Onbekend"
-msgstr "Unknown"
-
-#: proposals/utils/pdf_diff_logic.py:266
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/utils/pdf_diff_logic.py:295
+#: proposals/utils/pdf_diff_logic.py:88
 msgid ""
 "Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
 "aanvraag."
@@ -3384,14 +3360,39 @@ msgstr ""
 "This section was added in the revision, and did not feature in the original "
 "application."
 
-#: proposals/utils/pdf_diff_logic.py:300
+#: proposals/utils/pdf_diff_logic.py:95
 msgid ""
 "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
 msgstr ""
 "This section was present in the original application, but was removed for "
 "the revision."
 
-#: proposals/utils/pdf_diff_logic.py:937 proposals/utils/pdf_diff_logic.py:953
+#: proposals/utils/pdf_diff_logic.py:260 reviews/models.py:122
+msgid "Onbekend"
+msgstr "Unknown"
+
+#: proposals/utils/pdf_diff_logic.py:306
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/utils/pdf_diff_logic.py:343 proposals/utils/pdf_diff_logic.py:370
+#: proposals/utils/pdf_diff_logic.py:379 proposals/utils/pdf_diff_logic.py:403
+msgid "Traject "
+msgstr "Trajectory "
+
+#: proposals/utils/pdf_diff_logic.py:373 proposals/utils/pdf_diff_logic.py:406
+msgid "sessie "
+msgstr "session "
+
+#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:414
+msgid "Sessie "
+msgstr "Session "
+
+#: proposals/utils/pdf_diff_logic.py:408 proposals/utils/pdf_diff_logic.py:416
+msgid ", taak "
+msgstr ", task "
+
+#: proposals/utils/pdf_diff_logic.py:995
 msgid "Extra formulieren "
 msgstr "Additional forms "
 
diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index 2102a23e8..d5cd970a1 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -34,7 +34,10 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>{% trans "Overzicht van wijzigingen" %}</h2>
+            <h2>
+                {% trans "Overzicht van wijzigingen bij aanmelding " %}
+                <em>{{proposal.title}}</em> - {{proposal.reference_number}}
+            </h2>
             <p>
                 {% trans "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten opzichte van de originele aanvraag." %}
             </p>

From 9332dc291eb83503925bc3702ccbd0ed406ceacf Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 31 Oct 2023 13:42:21 +0100
Subject: [PATCH 044/148] Check for wmo object, zip_equalize_list fix. check
 for compensation_details fix

---
 proposals/templatetags/diff_tags.py |  4 ++--
 proposals/utils/pdf_diff_logic.py   | 15 +++++++++++----
 2 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/proposals/templatetags/diff_tags.py b/proposals/templatetags/diff_tags.py
index 204fbf419..578ec2bac 100644
--- a/proposals/templatetags/diff_tags.py
+++ b/proposals/templatetags/diff_tags.py
@@ -11,8 +11,8 @@ def zip_equalize_lists(a, b):
     smallest list, but will append None's to the smaller list to fill the gap
     """
 
-    a = [None] if a is None else list(a)
-    b = [None] if b is None else list(b)
+    a = [] if a is None else list(a)
+    b = [] if b is None else list(b)
     
     a_len = len(a)
     b_len = len(b)
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 325614cdb..115c3b04d 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -587,7 +587,7 @@ def get_row_fields(self):
             rows.remove("necessity_reason")
         if not needs_details(obj.recruitment.all()):
             rows.remove("recruitment_details")
-        if not obj.compensation or obj.compensation.needs_details:
+        if not obj.compensation or not obj.compensation.needs_details:
             rows.remove("compensation_details")
         if not obj.hierarchy:
             rows.remove("hierarchy_details")
@@ -1065,7 +1065,9 @@ def create_context_pdf(context, model):
     sections = []
 
     sections.append(GeneralSection(model))
-    sections.append(WMOSection(model.wmo))
+
+    if model.wmo:
+        sections.append(WMOSection(model.wmo))
 
     if model.wmo.status != model.wmo.NO_WMO:
         sections.append(METCSection(model.wmo))
@@ -1140,8 +1142,13 @@ def create_context_diff(context, old_proposal, new_proposal):
     sections.append(
         DiffSection(GeneralSection(old_proposal), GeneralSection(new_proposal))
     )
-    sections.append(
-        DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
+
+    if (
+        new_proposal.wmo
+        or old_proposal.wmo
+    ):
+        sections.append(
+            DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
     )
 
     if (

From f8d21061eeab46dfb056c3f0c006cc867eaac84c Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 31 Oct 2023 17:05:57 +0100
Subject: [PATCH 045/148] Rewrote make_diff_rows radicaly

---
 .../proposals/table_with_header_diff.html     |   2 +-
 proposals/utils/pdf_diff_logic.py             | 191 ++++++------------
 2 files changed, 60 insertions(+), 133 deletions(-)

diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 0ff304716..611565505 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -44,7 +44,7 @@ <h3 class='mt-3'> {{ sub_title }} </h3>
 {% else %}
     {% for row in rows %}
         <tr>
-            <th>{{ row.verbose_name }}</th><td>{{ row.value.0 }}</td><td>{{ row.value.1 }}</td>
+            <th>{{ row.verbose_name }}</th><td>{{ row.old_value }}</td><td>{{ row.new_value }}</td>
         </tr>
     {% endfor %}
 {% endif %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 115c3b04d..d408adcae 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -40,9 +40,14 @@ def __init__(self, obj):
         self.sub_title = None
 
     def make_rows(self):
-        rows = [Row(self.obj, field) for field in self.get_row_fields()]
-
+        rows = [self.make_row_for_field(field) for field in self.get_row_fields()]
         return rows
+    
+    def make_row_for_field(self, field):
+        if field in self.get_row_fields():
+            return Row(self.obj, field)
+        else:
+            return None
 
     def get_row_fields(self):
         return self.row_fields
@@ -80,28 +85,28 @@ class DiffSection:
     Some parts of this were written with the idea of allowing more than two objects to be compared,
     however, I did not end up pursuing this idea until the end."""
 
-    def __init__(self, old_object, new_object):
-        self.old_object = old_object
-        self.new_object = new_object
-        if self.old_object is None:
+    def __init__(self, old_section, new_section):
+        self.old_section = old_section
+        self.new_section = new_section
+        if self.old_section is None:
             self.warning = _(
                 "Dit onderdeel is nieuw in de revisie en bestond niet in de originele aanvraag."
             )
             self.missing_object = "old"
-            self.sub_title = self.new_object.sub_title
-            self.section_title = self.new_object.section_title
-        elif self.new_object is None:
+            self.sub_title = self.new_section.sub_title
+            self.section_title = self.new_section.section_title
+        elif self.new_section is None:
             self.warning = _(
                 "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
             )
             self.missing_object = "new"
-            self.sub_title = self.old_object.sub_title
-            self.section_title = self.old_object.section_title
+            self.sub_title = self.old_section.sub_title
+            self.section_title = self.old_section.section_title
         else:
             self.warning = None
             self.missing_object = None
-            self.sub_title = self.old_object.sub_title
-            self.section_title = self.old_object.section_title
+            self.sub_title = self.old_section.sub_title
+            self.section_title = self.old_section.section_title
         self.rows = self.make_diff_rows()
 
     def make_diff_rows(self):
@@ -111,33 +116,38 @@ def make_diff_rows(self):
             # If there is a missing object, the template can just use the make_rows function
             # of the object that is not missing.
             if self.missing_object == "old":
-                rows = self.new_object.make_rows()
+                rows = self.new_section.make_rows()
             else:
-                rows = self.old_object.make_rows()
+                rows = self.old_section.make_rows()
             return rows
         else:
-            old_fields = self.old_object.get_row_fields()
-            new_fields = self.new_object.get_row_fields()
-            
-            irrelevant_fields = [field for field in old_fields if field not in new_fields]
-
-            # creating a list containing all fields in all objects
-            all_fields_set = set(old_fields)
-            all_fields_set.update(new_fields)
-
-            # reordering the fields according to the row_fields class variable
-            all_fields = [
-                field for field in self.old_object.row_fields if field in all_fields_set
-            ]
+            all_fields = self.old_section.row_fields
 
             rows = []
 
-            for field in all_fields:
-                if field in irrelevant_fields:
-                    rows.append(DiffRow(field, self.old_object.obj, None))
-                else:
-                    rows.append(DiffRow(field, self.old_object.obj, self.new_object.obj))
+            old_rows = self.old_section.make_rows()
+            new_rows = self.new_section.make_rows()
+
+            old_section_dict = {row.field: row for row in old_rows}
+            new_section_dict = {row.field: row for row in new_rows}
 
+            for field in all_fields:
+                if field in old_section_dict and field in new_section_dict:
+                    rows.append({'verbose_name':old_section_dict[field].verbose_name,
+                                 'old_value': old_section_dict[field].value, 
+                                 'new_value': new_section_dict[field].value}
+                    )
+                elif field in old_section_dict and not field in new_section_dict:
+                    rows.append({'verbose_name':old_section_dict[field].verbose_name,
+                                 'old_value': old_section_dict[field].value, 
+                                 'new_value': ''}
+                    )  
+                elif field in new_section_dict and not field in old_section_dict:
+                    rows.append({'verbose_name':new_section_dict[field].verbose_name,
+                                 'old_value': '', 
+                                 'new_value': new_section_dict[field].value}
+                    )
+                                    
             return rows
 
     def render(self, context):
@@ -165,16 +175,24 @@ def render(self, context):
         )
         return template.render(context)
 
+class Row:
+    """This class creates rows for one objects, and gets initated
+    in the make_rows method of Section classes. The classmethods of Rowclass
+    are called in the templates of the render method of the PDF class, as well as in
+    the make_diff_rows() method of the DiffSection"""
 
-class FieldVerboseNameMixin:
     verbose_name_diff_field_dict = {
         "get_metc_display": "metc",
         "get_is_medical_display": "is_medical",
     }
 
-    def _get_object(self):
-        return self.obj
+    def __init__(self, obj, field):
+        self.obj = obj
+        self.field = field
 
+    def value(self):
+        return RowValue(self.obj, self.field).get_field_value()
+    
     def verbose_name(self):
         if self.field in self.verbose_name_diff_field_dict:
             verbose_name_field = self.verbose_name_diff_field_dict[self.field]
@@ -185,53 +203,12 @@ def verbose_name(self):
 
     def get_verbose_name(self, field):
         if field != "tasks_duration":
-            return mark_safe(self._get_object()._meta.get_field(field).verbose_name)
+            return mark_safe(self.obj._meta.get_field(field).verbose_name)
         else:
             return mark_safe(
-                self._get_object()._meta.get_field(field).verbose_name
-                % self._get_object().net_duration()
-            )
-
-
-class Row(FieldVerboseNameMixin):
-    """This class creates rows for one objects, and gets initated
-    in the make_rows method of Section classes. The classmethods of Rowclass
-    are called in the templates of the render method of the PDF class, as well as in
-    the make_diff_rows() method of the DiffSection"""
-
-    def __init__(self, obj, field):
-        self.obj = obj
-        self.field = field
-
-    def value(self):
-        return RowValue(self.obj, self.field).get_field_value()
-
-
-class DiffRow(FieldVerboseNameMixin):
-    def __init__(self, field, old_object, new_object):
-        self.old_object = old_object
-        self.new_object = new_object
-        self.field = field
-
-    def _get_object(self):
-        if self.old_object:
-            return self.old_object
-
-        # Note: when both are not present this will fail.
-        # Should not happen
-        return self.new_object
-
-    def value(self):
-        old_value = ""
-        if self.old_object:
-            old_value = RowValue(self.old_object, self.field).get_field_value()
-
-        new_value = ""
-        if self.new_object:
-            new_value = RowValue(self.new_object, self.field).get_field_value()
-
-        return old_value, new_value
-
+                self.obj._meta.get_field(field).verbose_name
+                % self.obj.net_duration()
+            )    
 
 class RowValue:
     """The RowValue class manages the values of fields and correctly retrieves and/or formats
@@ -928,56 +905,6 @@ def get_row_fields(self):
 
         return rows
 
-
-class InformedConsentFormsSectionDiff(DiffSection):
-    """As the regular Informed Consent section, the diff version needed its own version of an
-    overwritten make_rows method ... :("""
-
-    def make_diff_rows(self):
-        if self.missing_object is not None:
-            # If there is a missing object, the template can just use the make_rows function
-            # of the object that is not missing.
-            if self.missing_object == "old":
-                rows = self.new_object.make_rows()
-            else:
-                rows = self.old_object.make_rows()
-            return rows
-        else:
-            # Note: This uses the 2 new variables replacing 'objects' I proposed earlier
-            old_fields = self.old_object.get_row_fields()
-            new_fields = self.new_object.get_row_fields()
-
-            proposal_list = ["translated_forms", "translated_forms_languages"]
-            study_list = ["passive_consent", "passive_consent_details"]
-
-            # creating a list containing all fields in all objects
-            all_fields = set(old_fields)
-            all_fields.update(new_fields)
-
-            rows = []
-
-            for field in all_fields:
-                if field in proposal_list:
-                    rows.append(
-                        DiffRow(
-                            field,
-                            self.old_object.obj.proposal,
-                            self.new_object.obj.proposal,
-                        )
-                    )
-                elif field in study_list:
-                    rows.append(
-                        DiffRow(
-                            field, self.old_object.obj.study, self.new_object.obj.study
-                        )
-                    )
-                else:
-                    rows.append(
-                        DiffRow(field, self.old_object.obj, self.new_object.obj)
-                    )
-            return rows
-
-
 class ExtraDocumentsSection(BaseSection):
     """This class receives an Documents object.
     Overrides the __init__ to create a formatted section title"""
@@ -1241,7 +1168,7 @@ def create_context_diff(context, old_proposal, new_proposal):
             both_documents = get_all_related(both_studies, "documents")
 
             sections.append(
-                InformedConsentFormsSectionDiff(
+                DiffSection(
                     *multi_sections(InformedConsentFormsSection, both_documents)
                 )
             )

From b76f07aa12bbe98c4bbd05054079c5391ec2b434 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 24 Oct 2023 16:27:01 +0200
Subject: [PATCH 046/148] added error as solution. Not ideal, because self is
 still selectable

remove supervisors from reviewers (issue 545)
---
 proposals/forms.py | 13 ++++++++++---
 reviews/views.py   |  7 +++++--
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/proposals/forms.py b/proposals/forms.py
index fee52a503..1bef24859 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -65,7 +65,6 @@ class Meta:
         }
 
     _soft_validation_fields = ['relation',
-                               'supervisor',
                                'other_applicants',
                                'other_stakeholders',
                                'stakeholders',
@@ -183,8 +182,17 @@ def clean(self):
         self.mark_soft_required(cleaned_data, 'date_start')
 
         relation = cleaned_data.get('relation')
+        supervisor = cleaned_data.get('supervisor')
+
+        if relation and relation.needs_supervisor and \
+            supervisor == self.user:
+            error = forms.ValidationError(
+                _('De eindverantwoordelijke onderzoeker moet iemand anders zijn dan jijzelf.')
+            )
+            self.add_error('supervisor', error)
+            
         if relation and relation.needs_supervisor and \
-           not cleaned_data.get('supervisor'):
+           not supervisor:
             error = forms.ValidationError(
                 _('Je dient een eindverantwoordelijke op te geven.'),
                 code='required')
@@ -196,7 +204,6 @@ def clean(self):
 
         other_applicants = cleaned_data.get('other_applicants')
         applicants = cleaned_data.get('applicants')
-        supervisor = cleaned_data.get('supervisor')
 
         # Always make sure the applicant is actually in the applicants list
         if self.user not in applicants and self.user != supervisor:
diff --git a/reviews/views.py b/reviews/views.py
index 9a08ce0c1..cc721731f 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -156,13 +156,16 @@ def get_review_counts_last_year(self):
 
         decisions = self.get_committee_decisions()
 
-        reviewers = get_user_model().objects.filter(decision__in=decisions)
+        reviewers = set([d.reviewer.id for d in decisions if not d.reviewer == d.review.proposal.supervisor])
+
+        reviewers_no_supervisor = get_user_model().objects.filter(id__in=reviewers)
+
         base_filter = Q(
             decision__review__date_start__gt=self.start_date,
             decision__review__date_start__lt=self.end_date,
             decision__review__stage__gt=Review.SUPERVISOR,
         )
-        return reviewers.annotate(
+        return reviewers_no_supervisor.annotate(
             total=Count("decision", filter=base_filter),
             num_short_route=Count(
                 "decision",

From cfdd749931cfd4cca4cbc3446320fa1cbe2d2b79 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 26 Oct 2023 11:44:20 +0200
Subject: [PATCH 047/148] Desiree's suggested rewording for supervisor

minor change

remove issue 545 from this branch
---
 proposals/forms.py                            | 15 ++++++-------
 .../0049_alter_proposal_supervisor.py         | 21 +++++++++++++++++++
 proposals/models.py                           | 20 ++++++++++--------
 .../vue_templates/proposal_archive_list.html  |  2 +-
 .../vue_templates/proposal_list.html          |  2 +-
 reviews/views.py                              |  6 ++----
 6 files changed, 44 insertions(+), 22 deletions(-)
 create mode 100644 proposals/migrations/0049_alter_proposal_supervisor.py

diff --git a/proposals/forms.py b/proposals/forms.py
index 1bef24859..cc011526e 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -165,6 +165,7 @@ def clean(self):
         """
         Check for conditional requirements:
         - If relation needs supervisor, make sure supervisor is set
+        - If relation needs supervisor, make sure supervisor is a different person
         - If other_applicants is checked, make sure applicants are set
         - If other_stakeholders is checked, make sure stakeholders is not empty
         - Maximum number of words for summary
@@ -183,13 +184,6 @@ def clean(self):
 
         relation = cleaned_data.get('relation')
         supervisor = cleaned_data.get('supervisor')
-
-        if relation and relation.needs_supervisor and \
-            supervisor == self.user:
-            error = forms.ValidationError(
-                _('De eindverantwoordelijke onderzoeker moet iemand anders zijn dan jijzelf.')
-            )
-            self.add_error('supervisor', error)
             
         if relation and relation.needs_supervisor and \
            not supervisor:
@@ -198,6 +192,13 @@ def clean(self):
                 code='required')
             self.add_error('supervisor', error)
 
+        if relation and relation.needs_supervisor and \
+            supervisor == self.user:
+            error = forms.ValidationError(
+                _('Je kunt niet jezelf als eindverantwoordelijke opgeven.')
+            )
+            self.add_error('supervisor', error)
+
         if relation.check_in_course:
             self.mark_soft_required(cleaned_data, 'student_context')
             self.mark_soft_required(cleaned_data, 'student_justification')
diff --git a/proposals/migrations/0049_alter_proposal_supervisor.py b/proposals/migrations/0049_alter_proposal_supervisor.py
new file mode 100644
index 000000000..3ea070c38
--- /dev/null
+++ b/proposals/migrations/0049_alter_proposal_supervisor.py
@@ -0,0 +1,21 @@
+# Generated by Django 3.2.20 on 2023-10-26 09:38
+
+from django.conf import settings
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('proposals', '0048_auto_20231016_1202'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proposal',
+            name='supervisor',
+            field=models.ForeignKey(blank=True, help_text='Je aanvraag moet, als je alles hebt ingevuld, via de portal \n                    naar je promotor of begeleider gestuurd worden. Deze persoon \n                    is de eindverantwoordelijk onderzoeker, en zal de aanvraag \n                    vervolgens waar nodig kunnen aanpassen en indienen bij de FETC-GW.\n                    <br><br><strong>Belangrijk</strong>: als je je promotor of \n                    begeleider niet kunt vinden met dit veld, dan moeten zij \n                    waarschijnlijk eerst één keer inloggen in deze portal. \n                    Je kunt nog wel verder met de aanvraag, maar vergeet dit veld \n                    niet in te vullen voor je de aanvraag indient. Je aanvraag \n                    zal dan namelijk niet in behandeling kunnen worden genomen.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Promotor/Begeleider'),
+        ),
+    ]
diff --git a/proposals/models.py b/proposals/models.py
index 864266d5e..df5d9492f 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -514,17 +514,19 @@ class Proposal(models.Model):
 
     supervisor = models.ForeignKey(
         settings.AUTH_USER_MODEL,
-        verbose_name=_('Eindverantwoordelijke onderzoeker'),
+        verbose_name=_('Promotor/Begeleider'),
         blank=True,
         null=True,
-        help_text=_('''Aan het einde van de procedure kan je deze aanvraag ter
-        verificatie naar je eindverantwoordelijke sturen. De
-        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen en
-        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je
-        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij
-        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog wel
-        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor je de
-        aanvraag indient.'''),
+        help_text=_('''Je aanvraag moet, als je alles hebt ingevuld, via de portal 
+                    naar je promotor of begeleider gestuurd worden. Deze persoon 
+                    is de eindverantwoordelijk onderzoeker, en zal de aanvraag 
+                    vervolgens waar nodig kunnen aanpassen en indienen bij de FETC-GW.
+                    <br><br><strong>Belangrijk</strong>: als je je promotor of 
+                    begeleider niet kunt vinden met dit veld, dan moeten zij 
+                    waarschijnlijk eerst één keer inloggen in deze portal. 
+                    Je kunt nog wel verder met de aanvraag, maar vergeet dit veld 
+                    niet in te vullen voor je de aanvraag indient. Je aanvraag 
+                    zal dan namelijk niet in behandeling kunnen worden genomen.'''),
         on_delete=models.CASCADE,
     )
 
diff --git a/proposals/templates/proposals/vue_templates/proposal_archive_list.html b/proposals/templates/proposals/vue_templates/proposal_archive_list.html
index d5e8473ef..a2bb72f80 100644
--- a/proposals/templates/proposals/vue_templates/proposal_archive_list.html
+++ b/proposals/templates/proposals/vue_templates/proposal_archive_list.html
@@ -112,7 +112,7 @@ <h4>
                             </tr>
                             <tr v-if="proposal.supervisor">
                                 <td>
-                                    {% trans "Eindverantwoordelijke onderzoeker" %}:
+                                    {% trans "Promotor/Begeleider" %}:
                                 </td>
                                 <td v-html="proposal.supervisor.fullname">
 
diff --git a/proposals/templates/proposals/vue_templates/proposal_list.html b/proposals/templates/proposals/vue_templates/proposal_list.html
index bd774a319..53edb90be 100644
--- a/proposals/templates/proposals/vue_templates/proposal_list.html
+++ b/proposals/templates/proposals/vue_templates/proposal_list.html
@@ -163,7 +163,7 @@ <h4>
                             </tr>
                             <tr v-if="proposal.supervisor">
                                 <td>
-                                    {% trans "Eindverantwoordelijke onderzoeker" %}:
+                                    {% trans "Promotor/Begeleider" %}:
                                 </td>
                                 <td v-html="proposal.supervisor.fullname">
 
diff --git a/reviews/views.py b/reviews/views.py
index cc721731f..bb1bb383c 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -156,16 +156,14 @@ def get_review_counts_last_year(self):
 
         decisions = self.get_committee_decisions()
 
-        reviewers = set([d.reviewer.id for d in decisions if not d.reviewer == d.review.proposal.supervisor])
-
-        reviewers_no_supervisor = get_user_model().objects.filter(id__in=reviewers)
+        reviewers = get_user_model().objects.filter(decision__in=decisions)
 
         base_filter = Q(
             decision__review__date_start__gt=self.start_date,
             decision__review__date_start__lt=self.end_date,
             decision__review__stage__gt=Review.SUPERVISOR,
         )
-        return reviewers_no_supervisor.annotate(
+        return reviewers.annotate(
             total=Count("decision", filter=base_filter),
             num_short_route=Count(
                 "decision",

From 5b70cb0d6d53b5fb5ef0d6c9ec1a8d4f78e74e38 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 1 Nov 2023 13:51:42 +0100
Subject: [PATCH 048/148] Ensured user cannot select themself as supervisor

---
 proposals/forms.py                            |  3 ++-
 .../templates/proposals/proposal_form.html    | 20 ++-----------------
 2 files changed, 4 insertions(+), 19 deletions(-)

diff --git a/proposals/forms.py b/proposals/forms.py
index cc011526e..86787b78d 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -56,7 +56,7 @@ class Meta:
             }),
             'funding':            forms.CheckboxSelectMultiple(),
             'applicants':         SelectMultipleUser(),
-            'supervisor':         SelectUser(),
+            'supervisor':         forms.Select(),
         }
         error_messages = {
             'title': {
@@ -131,6 +131,7 @@ def __init__(self, *args, **kwargs):
 
         self.fields['supervisor'].choices = [(None, _(
             'Selecteer...'))] + get_users_as_list(supervisors)
+        
         self.fields['applicants'].choices = get_users_as_list(applicants)
 
         if in_course:
diff --git a/proposals/templates/proposals/proposal_form.html b/proposals/templates/proposals/proposal_form.html
index d37706bdc..24f7cd99d 100644
--- a/proposals/templates/proposals/proposal_form.html
+++ b/proposals/templates/proposals/proposal_form.html
@@ -11,7 +11,7 @@
   <script type="text/javascript" charset="utf8" src="{% static 'proposals/js/word_counter.js' %}"></script>
     <script>
         $(function () {
-            check_field_required('relation', 'needs_supervisor', 'supervisor', 'proposals');
+          check_field_required('relation', 'needs_supervisor', 'supervisor', 'proposals');
             check_field_required('relation', 'check_in_course', 'student_program', 'proposals');
             check_field_required('relation', 'check_in_course', 'student_context', 'proposals');
             check_field_required('relation', 'check_in_course', 'student_justification', 'proposals');
@@ -49,23 +49,7 @@
     });
 
     // AJAX supervisors
-    $('select#id_supervisor').select2({
-      ajax: {
-        url: '{% url 'main:user_search' %}',
-        dataType: 'json',
-        data: function (params) {
-          return {
-            q: params.term || '*',
-            page: params.page || 1
-          }
-        },
-        delay: 1500,
-        error: function (err) {
-          console.log(err)
-        },
-        cache: true
-      }
-    });
+    $('select#id_supervisor').select2();
   });
   $(function() {
     // adds running wordcounter for the summary and self_assessment text fields

From c01f21d37488b0bdb34b39fc7062a31a8a62bb6c Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 1 Nov 2023 14:15:26 +0100
Subject: [PATCH 049/148] Added translations

---
 locale/en/LC_MESSAGES/django.mo | Bin 149364 -> 150795 bytes
 locale/en/LC_MESSAGES/django.po | 355 ++++++++++----------------------
 2 files changed, 109 insertions(+), 246 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 937898bd69d492524b36395e9ee8ba36eeb96f74..b1703c3d292392465a0bd9e10e48497a8a3f75cf 100644
GIT binary patch
delta 20280
zcmajm2Yij^<M;9V96LtD-cCpmLhQXl?7jEMI0%uDVRP)QN)V-5Ej3!SM$Oi&Q7u)q
zYgO$U9olM@KA-P>-TD1I&+~u1{`aew_qFbE&HJ3Ap1qN6-imC#>v=LRwK#@mu&iPj
zSJbjnGg{VXHI-{wSzB4wHq3^jT;$_<($(5n)+#soZ7u5#>Gka`s~axpU|HwzM;w5=
zJ6cv(EY!)eTH<i*i93-ZpXJ}#vc{7!5Fg`J{2WhqArEJBHrKWuAosRva~C-ktMfo#
z;~dhi9+u_Bd5*u}bkaSzTX(#Qv#?q(&c%JWpZi-4dt25RGG5{q9M#9Nc42T|%lZJX
zA<tw@>t|UT@B;GWmao5MjiU$7;3j&nO{8T}WId0uta3b9cb;aG>J752l^8nMvQqE_
zCSt=OlyiS;E0M3Tf2?ICVfmq^h3{Y^()Td}%MG)va2$?x@ncl}L!_}*Se#`o#aXD9
z79Va|MeqZxiU*O=wSL1e^pEG^>Je!~q#ce&b>Wv-8p9Ik1?++)a4a^&<yZzUqAvUj
zb7GYdmQ@%VVJYl|6L12K#=me4Ju`BoWgQ}&KZ*X|Ll<78*?RItqb!T0RhHTXusl}6
zaP-3wPX2f-NqRBn!)=boQT48(T7D06pqug4gZZOBhG15#Glu?G#U^Cr#ePo3kxqIZ
z>IUzkPTYa&nJ=93`%d{k7)E};Sj!5+aK}NY^XH)+WHm-JS2km2)%Q)btn5Szp`JX*
zNr$1jupVZ^{-_5Xg6f%R7=SArH=$azA9LYx)Pr2WiueMnV8|phclw})(zlFAVIt>I
z7k-K%n3<l@36-%HMxn-f1s=dt7>NreTh>f`iWL~!QBy2yA?f$0T2>lXoo4Ev#7{`i
zoo-f1y&0DEHutyQBC>^onp}lC)*W1pu}tCf=r`N4xTbXzqcLiZ>8WF=A^R5d;2qQ?
ze2&>L^IX#-xluh_7_(rolV1^wYW>$FQip=hsGgXQ8k==k8#iNpyo(yc((}xXE2EZE
z1Qx`Bs397IWiS<+<6hJxcFm`Uurf}dr}|<!?r&XQU}m%X4fEus(2x93)TFD0daxF#
zmPTTBOvY9?8B1}&lUNHM)BpL&4_;&*u%2TNtU-Pf4#17*`+!Kc#b$5*7}cWZSOW8<
zGBL3l>Vev#y0!=Efg({|Iv&g7G%SW6IiA2ur0<{}Jl_&izbrBzt*|BZzlX?XGIHT*
zJjMoa4fBy+%M2=xdr;*UQ8&Kpq^;$a6-e421F#CJ$C_dYcEMnrh$*-RGtxta-!iMB
zgl4nGw(SbDT;^aq(p%6)#ec9b=~pYwOQ_G=W|Dn~MabWcjd<Yiusi9z?^>3J^ib5!
zI`2KRUmVA4q<=!5-TLx<y?p3F-x||W&sx)x8rYM99@qmv!OobKaq5bFu#57sJ!V|T
zLtq!&g*n!nm(CZMjRuU|U|F5WAHUI*pF+)*86TP<^=<fwHB5!=sId><WX7l;YRtS?
z5Xa!Z_$GcKH=A|bZ428p>FucVuj3K?8@F?#{U0-bNGEPJ54H{iNq5=itp5}uL1g6F
z&eFhI7=}ZzHZI3j_^nf3bcY$sw#fU$I*g^U+NUfh?BO^WV@PjAZEU%A^5(=~Y=)`W
zS?m8Y5ic2`^xt}(crj)sU3ZV^qHt`?n6|~d<S*D~^54S-q&GP}#H^&teP&ic6)a4;
zJ?eTxumC3D-#8QV`nchg&$$5^OPLXx?H6z$KEqJ#cEG&Pr=lLf@1U^+<|kbhb%U0u
zq3D3^aU3?nFR?CWJ7jt^0;`gqh`#DXJ|Qw6?_e2BJZx6MTd3u94|U@|QOhhl1FZd^
zI2Ofnm;oa&Beq2C3+*rpyP>YL8*}0bCw<|Fv;Oarp|Q`x%&LdAu^J|0L)?JDcn>RL
z&ZB01*F#;{i?uKXtKeqLh&NC}avO``W7MSfJ7z3?jPcJ#MrAV8vbvb+VysbH?9Jn*
ziyxuZyZZz?Bjv^M5$XD0@`)HjPBM4!F6P2FzA`)ND%1nsMGfU2SRYG&Z5lk#N2Deh
zi*P8Oz^+*Bl$rIju{`OsSQcNRS`vKPyo{PSc0e_xFZ$siR7*!<5>7`=zUNp7{l75{
z^pzuWj*RLUjoHqa_xf;D7k-0!uyd#r8+~hrq9<x!n1n&N3^m#I;b44$DHwg0YvX0S
zin+eyGXVaCCH4Lv#oaw*EJMxyU8okH$6(ZlfT~aigX#KSsIm54FfG`H)kz=0QurKo
zUeSxDi^H)r=|pUg%P<`8U~{eivX{&S;;|eBYcL0Xjp~8R*bJ|u9x&*#+1Z+4Ea^Y4
znEZj?n~iG{Rw923s{S?X<)%k)4(V>!&3$fQHSTX^y<wJJeXK(|8ud|X6@Eba%bR8v
zC;VW>cnlUIe=2Hnt;7oW5f;FUs2+KOxv}&uGiR!!dZrVG;b`>bBeI@|mdR(RNpuvI
z{|)Mbx1ID0%uG7>k7oH5#9pMsQA4&8TjMd*@(s9cUS7>mvwk@)!t*!_2j8Lp)g@2w
zn2luYU2dF#oe<Tc4<DFGbpczEF7VK_WFQVBJrPUe15}H0{$wU&18hw?3TxtKRFB+7
zJy_vKJS4Vz<TGQH@3FZ+Q`BTj!UnhwJGnR!2a&G%)VxktVLj4MQ9V%MXLI2hxR3N6
z{0LKiF%J;<tJ!*cBD=b^2(=}5^!;X8ZxNY?wJ`XZS?B%m9nv#!H3t38S93gyIkD;=
zyd!w9#yE`hdw-gZD(7>v@s!4n<i}xu{2W!U*k9(YIUBo?_Wea<6_E~qn+lH|d%Z9f
zj$$^-i~eJlTQGJYT?O4Z1vBDw48%DYfFEIY{M_+N%tHD+=E7^3qV@lXNC+8GFWEM6
zK7NKpU(t<t2{j29|I4zW#T#)i>9dy0ey|06PRm0&4Kw41sQOz`H#~v<cn0;LH<3}Z
z?qGGT|MPB_J=y#+xa_UBCTji8!#21V+hJxtIjZZsqFNAz+Al_8QCxxAH+DMZM=(F>
zvsf7KV_tM;a@p^a0{D&I|5b>LrNEVi3Z%y)|5*#Ox~$9Or}07VEROVZ*>Asy?4~7&
zs2h$(J<xPiOH-Zn8pmyphaAs1-awyDeBxxhbj*>%bZJr4zEBA@2Wp`ohGQpei&OC(
z)W#B+({z0c%uTvK>iP*-3MXMEd=H!B`kXF){~_{(jDq+Idt-rIE~^iY#0WfvTK{?c
zUH03rFE%DU7K3oFlYav>7ydy#fPZc?2Rx|!a;QmL4>c4GbJPDCqs~so5LAmNU|pPn
zqwpYJ!CC<f6+@FJkEu7G@zQKxiY$3+JubrK`CQf{ET7+HFYAq{$@c@Qr|zO2JcqA<
z%l=?c1$E>8SQZCk4P1zY@F-s7#@F#Q?kr?lIHQP}e9KTR+=gtR)=|`ueTmvvzC#aY
zFKVtIirNu<U5RLR&cQOc2J_)bRLgE)5&Q*9Vvb^FEJIN(>42)Ag6h(_s3Cm^wfwfA
z=FCpi^$wwi<~!tkpLLsvp4_jvIk7kvCtVSBLK{>M^h2FE3e{7yP%V5Db)yxi2YDa$
z0J~7vJ&xKBuAnC0FQ|RuPYl%he?=sm3=bddbV3wrJ*QwxT!dO?R~+x5F7OQXfG<$z
z<t%9)$b)*I@~9oKs*`SrF{GQLR>enHgZo>1oeDprPI!)LNk)%J7e?JM80$0kp{U6i
z8)zONqLk^e?x;zYjM}Kiq8@w}sz;WfdT=f3`k$gtEj>v@V|*9&WUkU?F62h7j#`fG
zP-7hJq(`HMW&vsrtwSy2gHHY>C;u1JeX<9cAt;NwPsJeCzn-){8EScJR9ALKO}1E!
zz&ThCPh$!63pOnYL0zaWs)t&khO#4S2o|HRw*oZ@H=`P~8#Q-M2m8!&xkN?-GOnV!
zrbrpH(S)Hc+!i&~T~H@_aU~{TQ_No0JYWY*AUzLz;tOnoU3qh*U>fQHbB37Z*TF}m
z2N~1xAYMhy?p5W@j<*igf}c^#EkgyD{fQ?8)xvh@!EUGrABAe^Jk(e(Lv{Un)Po;!
zJcVUQ`z{hu*S|vTNPeL%^V<x@lirNwu~<cOLJQPfiAQ^AP&Yb_z3>J$$2yhF#x@yS
zk=~4T@K4l(Rtd9v!e=!nqA{I~=Wso)#tD^O_Gh@_Rm?IRf@;B5)U4izm+=I)!S}10
z9rFnmBOO%D)DK79unlT*4n+0P81yp#tZ77kBI5yno3I1V*Kk<_SY~r;x~$(wKjb&H
z?s&bn%l<*4Mje+GOL;t&BmYue)5WfOrlrNPHu-~bAg;z+=wj_^mE6YJ_zLrB{m*LP
zvcF)wjTK4XLUn2GhGx<QqW17=7>&bF^}a#PftRQqGgBk8)0IX|*1EWl2W^W{q_c**
z>~Gn_P(A)O`l=GyM?^21C&(6H1vTMB(k+_0?2lv_BFu@4QC)omW6-~unViX}F`tDR
z<I|`I%i7#@eQpdV9gLd9gHij)g68!9G;a7F83i%8rJ0NkTA49yg<(`2gpF|-YBpa)
z?P$MYC}wEwvVSM2jOw`rY=o21jR#Q=bObZwS5EqDYoFN=u8^UP;b#oN%x%mAR7Sl#
z+M#BB3~Dm@P_Nk~s2eUvZA2SU^>(9{@pq`9x{4XmudO-XAN4>%J|Y@|P@ISZP#3(0
znx#*$CN=*;jeX^=bTvJ-1lN)NzMIQBL=&fWciDeA717Hy;4x~F73|IVxEkx@MJ$W?
z`k0N$SD%QU(1%@dGk%NizApRkZq8v_(w+L5o$ej9Cn;7TKX-qZ{mW((97NhPz?loE
zb$=SiW1)d&k}tvjq^}?wpU<ij>9V$yu?V$AHj8rEe;=?9H<2D1ZMM{cF=or0g}Tva
zsGckBWx3J=-Eju)9PF}xvaLVVEZ?_qDfJc%GpnF<oO!^R*i-NSQ$&)fP-eKxT7xUG
zA2y0N>v$DvGF?FJcm)#7YUqR78RuhT+=adHIlhUVM;L!ZP1@v<F8j;po2cdY1y<Gi
z|B*;TERbkER(Hc#((ADd1|*rcVQthp?}@5E3O)EKYA7zCRz=oivy~S@l{Y{QL4O>D
zS8yA1s8b5-{|p%!N1LuYk8hFgGtMlV-%(rUbJQ}-J>D$O#;94|7S*!BsF&0<)GAtr
zn%$ewgF8^G<2-6>zKxpXt_iGvy?pXaFa;%0%dH-&<(*L%9*f#K=c6``b*Ndq*Gb<(
z)%ycA+p|qHle95bCLNFZpz<#29kLt0VXhpW$okilE}m=(RyeLjEx#?O7VSZ;=WkFw
zatZYyKRafeVp>!Pb-fVOP*g$fC*i1#Y8bY_<=7N&`kaiQsisTgP)|Aw)xy;nh$pZm
zKE!fZjcs!+_QlTVn(ngZVORVeZ{ifZFvDg4!qRi5%l<Zf3s;f<_AIjse068LtQBNT
z!6jI1j?4br@U3{6bose1>nLWN=dvc_N$iVl=9?bdfa-~DsGd588r!Rw86Ts1@)@e@
z|3&pswgt96D}ab5Q(<g?)lp-eh}tseV+~w{b?`W<Yh7=cPq_i89xI8uac$HPwZf_x
ziR!r}sOwxqy@c{EbXkM-{;xwsUHaaeW|^HtJ^4e-ioc*P{5NWHW?y7(TnclLu8i%m
z0rGLrnvZ&!?O1HSDSe%49`GsZwVZW{**A*d5Uu}aL_WkV*cy8+H7Be^^~~p}^?eET
zKz_?iSLQ|aRB_CNwNP`V0jfs^pqA$tRL?HKoOl*B1UJz)hRA&)+L0pD%sQQnpRha@
zqTY6mSC|`hLv?)u>cT$M1y`baW}}lnh+6NbQA2SJOX2T077ML(*?$AFcqRR>^}66~
zm;JX|Utmd9SY^Kd*Tyn*<r3^q{=Rq2ORC7brt1?>8_ERC!vnvCJxOnRk4a2A)B9%Y
zp0w6Hz<#_y`46}ZcYokBAG<rOGqX7Ndh_u*2(<;b#2DO$QCM(;xxqN>LHaxFgcUZL
zm)JzyM!L#}W>wwBhopTUnaMkJllf$|7Wt554fJg`Em^n4W&b3)9W@m7J~m_28`ZT@
zsIeZ4cQF;UY{z|K)_?x3X2%<XT87K;0B*wL+$fF>Uqe=Xhs*x?y(0#Z_I*!eArb3S
zGb`W3CM5TvJ}|t(2&}i$ET73(iS$k!k9TkgM(#4dqMby2KKKJmW6*B%R&0ry3-6=e
zwtJCD>9fN2n4M@is>^pE=UOH9npu8fpYbNvXG|ZWCRf@0X7bg<mZT%F8ZJPsl0#S=
zPon13eblnfdcZ70f6T4*A4nt%H>`Tlw6yLav+R7>ffH7s_U?x`5eptR53m%qFRVp%
z<)^4+bp^FtZ=sfRz9Z(PGys*q49nmNEX)0^r$qFUDENiT{;QU7)ZV`db%ApjfF+Nb
zw_Fv}jU&(xyP@XBK+J&SFe6SvwRjp1z`3ZNd+7KV+Q0v0J!ZP7Al9KmEmX@#Vl6y`
z+B*M2wKR+wrF2(R7tcjqcmt}1yRZU2Ky6I<PnaPoidwEgsC^^+1pTi_2Qu_>=!a_Q
zU~I>bj744G_?KptoI>r0S1^q7-|+$I;ICZPVf6pncosDWmYy;X^bRV0#z|ks7NoPE
zX8mh6cR6h)&s2;dy%RfP(QnLezi}8ydM|1+T}ADT|DYNWaK_xABx(+nLk&@7$8bDF
zx-)8ddcHM7S<^>EC$z%r*a@|<R6gsnB5^iqEFWSbKE*s3^_|(#Qc$no<*4Ph2|M8#
zR6|OgGhgFpVO`RHU?zI5%6aqsz*p;nxzIt!A5ksLe9^4qGN{Se6*U(opmww!sIh+c
zk{P;hu@UL-QT2;nHj}a`RwvyL^?-{}J-ZVdYW-)qV#cC5hEwncmd7)wm(2@Q4`lz|
zoR}Luq$6=TEt!guq>ElNlXD{K!QMwL+jFS5q3b#?HR>0^VWhvhq1V2T*?!Z^fq|%(
z(L%>#n2Qr$;wtiU+%hfw5Vh=fpyt2<)R3G*t)6>W3Il&Mb1DKg7sjBr@;Rtgvl@fA
zzqOx;X7!J#_4*3+sW{VZvl;?WHz<wTLTjRWq&=3yE;t$|U{`#G-LTaiGlcJ=y8INX
zfhF#mEw~%{#*%T8$OMeIXS(nZmSn5FiyG6+56!!vIkqA_4FmBM4#KCXA?yB=`HnXQ
zwf>J|cl-@?oz{=c9GZ(NKm3UG|22^(WN57RJvLk8eJn}Z|B0EkVOWl#7>WbQPkm~B
zh<JwKq#OTi9&9RVvVDzv(DjRXE$_n?q!WHM53&m{k^b{n)_-jxXMS^88!_86bAj!s
zJ^DUwLI2-f)@Iy~YEj%DW)2*|VLaGrY(swC=jQc26PuC#0NdkF*h}Sqnb-9a)CZM&
zJ|a4?@!#ez4(4M&(j{J)mQFyGUqg*~$UkOoRKmWb>mnm%rJ?rz6{wzj2eadT)MP#B
zc;3ms>F9ezWFQruqh6oAUYed*fOkmOdgZdtVDW#=Y=44<X>kT_yIuJ%x4nUVi`s}T
zqbBiVER4^b@?37Wy_^f68d3(YY5i9qqFI?OgWLY#&=@<Djz<l_A&kcRs4i@q(QUtM
z)}i)?Pf@GqDC&kcQ7!)))$+`l-1e3mfGRJG+7H4ppVohGBFkw}0>)C1HH+K+{GNzm
z<j>9OwhofNH=En~6vz9y?H#U4cGHqxsP)|+wYMi=0i5Ba-*(*Qc*60z<o?z(C&Mp?
zxq!#9Cgz~LE$a2!3)SKwsJG%6RL@PqIru4R<7t%Bv@{BJ{sdHy%t7_kQq)}e1buob
z>>#2GKSgaY|6*G#n9CT04M=arI;w{r4Dol{TWxDBO?rakYSe4|3(STWP;=rYs)z2O
zChbdqx6kf6E4Miz0M&J+QSa-zsFzMt)X<E_%XkMjF*FAP%;by9YbIYZzM_0K&cs>y
z-1g7$x$?X1UrZ*UCg10%o;sZ0XP*2H8QPPx6);^@7L~4sjj$8ylglDJ!;QD#QS=ou
z^_vxO+aIqxq239@QC&P0)sUH385g3K=RvH1H+@9v5y?^1ZSV0dQC-;wHRe9l7{1};
zuXH?s_B#XBl2@p%4J>AQq894>HmJ`Ry-`CEg_^8!j=qURg2{LTwSIS?KGB>&4_-jM
zeEvi&AHU*et^}c4RvmTW22Q#Ks(we*jiQ}&GU@?mp(gJtWKQ_3HAM8y<U>?X97CPx
zE@9SbUJNH4in>uesz=74S~deUc^9Bsyb87MH#z0IP_zF4>c(H;DEt=lYW=t5Ro9)2
zzNiY@QL}dsswH2cE_mH3e}GLG`=|Jr{HlSbzNeI#GgVQOtRw1yyP+On0P4YqIq5NI
zum9;pG=?jbfuEy>;yWyl_fTD*r?lyjP}C%AhRW}adf;T#cgL9+gdd<jik)=Ie?`^L
z7-Sk+0`1TLK}0l`)le<1k9v?6=)rzi2PdJH<8Ca6Kcj}KaIl#(<xxFY8~bBJ)b&=O
z>TN*Htv#qM_;@huUtMyO3@w+(s2%MW)L51)V`h0RR2OzewV*$0?8o3HoQx4zv8>yE
z?IvO}>D?Hm{BmylgUg$!{41zs-66#1w%`8?L)`Xj_XPe#L7DPq$I4T|OuoXX8~4Gg
zn1brs4XCj`gX)p<sG)d;YFO@2Glz;}2<ghGov=5mL6JTp!9<2T1*xcwX9emb*>2Q(
zzD7m2{RwF?YJWI@ngc&#D}0W+VUtR3Yan*Ow)hEF!<VQYsuE@zJPI|(d><2OOymga
z#u+QSt(#a1-^L78-1bMO)!3BuebihDt!lRF8hDd*ThubGSk3H|36Aqot6(E)Yu}EV
zTPKn0_^g{ml37j<@Bsz=Ynaz;%bIR0j{H~H2#3{n+y7(XM|Irx4-<LoBKaLrt7Jhv
zGy8XAbJ7>F0hXw5day5Mq5d9JLk~4@^J6#b{{|6t#n^_Xg$qz)^(|`szi`ae$ZdZe
z55%tI$Ds!gp~mtSY8gL4&GLZ8W@t-dDmQM1`pkDZ+-!7Jn^2$oTk%9H<07nrhgHA{
z&rq|sV1(QLIzA4Ykv@qUirmf2C!?;Y2JFUm_%()Mk>+M{wnojB4yd^hgJp0z+W-IG
z0U~X=;W^Z2yTF!ajO(>BEsQ{&=tZ^QE!4~BS5yz>Y;C&UgPLTGQ0sj<>Oq%c2E2?~
zw%1Ur;7)7SzcL<?p(lKXYDu;>=ABR+b)!0{$<x(I4?``-ndrvVsM)^;wfsIoO|rwN
z>tDi>coVf;t+wXDGqv@Z*;$B;K=MoByBLAG;ce8*<pt6)|2Yy!u%hfE#PI^DTuwZ_
zVqTg(i@NHK1C*5@UYR_7UE`AcD;oaDNpO={0(E>&P%Ac*9?J=Dqq<ASJmPmv)Y?z{
zGlGr|)cb?@Ag=R`lUIa19W6+Q6VFQMNO>WgOx{$=d=1IaG0-`wFCHU3f=d3BT_oLy
zFo5(|SeP)15JNisSV(+2d1nck34;kbx;WQXd>TQ^d5DvzO|5?h)?X}<t%Sv#w3Z4V
z;Rw>{#~$(qkqC8896`AsLF35RJbN=bNSd#B_OS!sB(38H@tN2HHNkb1B4~N)sHorn
z##3;GL}`MH6E#uzb;REF^tPKs_<xTIl>biV62dCNNX~nKpCF&;?0<@JgY<PmM$$70
z4LPR=jcA8DCh8CFZ{>DcrnHX!PKEBowFOTn{TDXJZq%LOl#^w#>sl;#>of8ek?uiU
z2b-o<jk>k)7~v6l%}B3z${Ul;!8yL2WK<zBhQv9ikfimIbCc%I!)2o^Q3V{4gv^xt
zIb~lE@8rZi*uyz@74l8n{-mt)0-WoAfUI;KjK30`6huXSmeW@O`!Aq=#yQkDiO*0U
z7=}<@gu47lX8*Grvh0H&Ozh(Te^zngevY#_f37LE_7T_75#Oc!n#TVciO)%Fp<o_v
zNUvm9Wj;7*Cut2KU6F@)fsd#kLp=ScK%^b%Z}1l<GYEg6UMA`fpe&wvZGwGh{B?v-
zaEA)fgtDY};}b$D^214YCcH~XKRzHbjPgdfIz96>J={P)Oz5~sh~_#4sDGchzU)R2
z^byUze>{;CGI|r55h{_^5y=U!2s-j0+r8D9@}gX<CqYMbJWT#x;&FBklN7r+aegqd
zKUobW{XO9eC*NP!;r(Ov;sRxy%==uZi4%XFt0b0CmVSK5$$=!clXrypRDzC{PMuuN
z!^M!thhF>L(wDsbq_bjruh-D{>)5~r0w~bS;!EcuZOCgvUKi49h<|9;WWG4QBwz1+
ze)_SJiGNMJF7*RQryoyWi<hDfA0_O6qNnn5)U}^vu2X5SbC#D%o1DDzj{i_L^tFq%
za_X+7u8sxx09WF7_?)^Sg!i3u8gsMus>sotaLSHx|I?h1#kt5*Cv!6=>3_q2-${$l
z2(1YdsH->QK<C2sNq2JM%N);9&PNIBC&E+0ZPLrpgC__Ji7%k;TN?i`=Ops&<1BxE
z?Bt!ru7sHcHz$2hXsd4HI6&S{1p9FEvXS0Ls7mHd)T`S?*(1&iA-<EmvDkpT?&SS<
zCJ^05#vxsRcwItGDviYX<mppJJ^9+f4`Y^_ppWmLQr^-jyG(os@%OM6*T_z2KswPm
ze+cm#l;tCx%}1erP|z{oVE-lZ0OFOY)Qz$>)X~AOvG$jhp5&J&<RY&+d6NkziR+*6
zzkbA$|N2p!bY9NuKuAA)7f4(u)N@Y0^;)4SUFM`S$ft9Q-zKep@hj4uRQTHQ+iU0b
z=30}eTZ8h=P91-zJb`p3!eo>0vwoo<gHu?BlQvNhW(w^;50dvM<zG5^IY~Dq==hef
z$2nJNzMELx2p<!QlfLiN+en(fudt6|JY06-UF`<5{-Y?=@h_QUh&RAU3d<0`MEoD8
zd=&91#H&&^i~7IWXYt!F`L_tgD2s6FHl=JU@#loyl<A8~5_z3D_YnT*)Vq_u6X{w$
zD(TQia2<aW@^HepRNg~8icrcaJ4*Z|Ap_;}Ft3wO)Zz<~wT_TVe3>#hJ|w*opAz&f
z=mMbv=lU8`aG1<s=K@_x7bQLw&l9c^k9NwaX8lUuUc&nX4?#ybULjN<tRcNtd0agG
zc+B~kNjGw?6XcxtHGltL<tNicn4Ml5Cpr}$;z1{W3nxVoFNos^a|va+=ys>PHt`b9
zO?z^lpOY`%BX}vRLb%6y1+kZ1PX9k9@{G&`f{vG*9OztVG4YOs)&w0v<Ts(-NYbH%
zzX)eYe@-|~SWVbZ-aDo`zkc%?CO(n;G~($;N#f;66xRB`Nu&<0pi(^HiBoF>4s_z8
z9$^tDE~QTTF_w5s&K>vK#S@+KJmigYDrTfkMdGE&n}R<Q`ccm}fsBC^>c~SVNLoih
z!aCyB@hxnJMF@Wqju6t16_gd{LW2nHiSs*z)g1@m72Hk5cW@|a9g7L8N!K7<Li=x4
zBDD#12)8MyhrLioeZp2Ju5?@d!SUQ+wV|$#KCjhLddX|)W5j1rFM>wCN&GM8oXW%_
z_5MFjq#QxVCpaGS5;hX5lHSA#e-k<p{&eb5WdHlF6XZQ0uck6M-X(pBpyMaPP6B^t
zWhD_Bkbj6!ng_{;-w_u1_+u4eI3fLLO8lSKZWQYb&n+r=$-hc@Gvc|OI`82_(uE1<
zoV-xteTi4%+?qIxbE2?2Y5f@Sm~>f!FNQzn5OlmrSVp`Ml`>Ij8u3A>qo3nltU-BB
zf{y%-Db6)Uk+;Gw;WuUKz96)7%GQ(L(z#9?dB5xZzmUu*E|QUg<HXlvnsb5ePGu#7
zsk6~Zw{p~v5mSioB{ZdcJQsaPXh?o9=cYRM9pZNhgQ=5^^d0JdjBoJ!gEgAO8Vb{1
zJ3%L9chVg=DHnCB5e5^=kbeF6fV{7%TbWERq5Ny*|B@a~d2h-Co$D<ny^C;}vIiRf
zR6>73G#TGh(C@Vi1d?7reg@n^c$?6KaF{TS@F`_EsDGV!0W3!PDAx)l=*W-7DC<r9
z2Rny3LAnj`J_Op&?4;6fWCr8Uq}yW;OeUm1OETqsNMuUSpv*qV|J8|p!Fj`pt5Msq
zGk!(6j^dnm+C;6}<kulThsOUBnMIuf(UtH66~Z{75n%%9l~i7ib@5ZeJ>ne*I;Ioe
zvSUnK&ijUP9VvtpPJ9>nI(Fc9<jo<pw;N)&pNT+W7CXcKsAr9);yUt9Iu{5dJ)8J^
z{Dk~hgl(kDk-kZ&Lt005;xq6(p#|4FLb{p?IPw!(k@p8qBEKAdS(J-(Av7lBAfqG|
z>Jti(PIYxFkh;39|Mtx-3su^Fe$2Z8rH6Vwqr8d36TC6Wo|s5NY_cadJ~|;W(Hl)H
zDby36>N-;}?dL4+rrQ(dUiPb$Fv!D6vGFn9#F)s)7?0N*?}?0zAC(vxIoLBgHcscq
z#Cqe&j*1<c#y?`HkYQA0d}{dd0^92^-BP&9h=j!C$T+U;iSouIc;jL`qY@GlJ;S{*
z-qGH~Vcx_fPdQFbN=}LK#wUB@L()1lb`?x*aXk0-+gs8Cwy!$avrJ{4I62f48JDDo
ziHwW$CV7T<qjc}V-cc!WF`=GOv5}q_ugAGt>Xh#J>&8b$CaV63#Dw7q$=s8+M0p2$
z<Giu7#xvN<JyQ~6Jfjm5xpgH^gm)a3d7y-}Dg9lAGV#bU-qfx0^9Ono)c$b^ULH5p
z!_$tVMcnN_9ijV$)3c)z;s$%;lRTq!>-dD2*ukD*De>wYs*Z?EN+QO8uXmZQ)4W;N
zrWITCNDb^*pjQ2;#D;cAN={6OAKb8sH!d=MaANGxVfDkDth(tv@mk~3It_Fc_WN)1
zQtyxU_{T)Xd(?G$;@F`cJ!NXqF?FPWYp)(HnWtnNy>Y3-#)R4BE5;Nn`QL__Crz&8
zq5A*T+WK}EaQ*nm;odl&&J!Q&)qv2&Ln7&}IL0Qu@ur9A@%V({^t6@Qp;O>?zk36+
z`stjZ^n2W()RA8l$?QoO!GLb>`?Oa1JkF?vHTlnw?OIgWbtk}Qx;P=8(HczID7(X%
zN^}o%h>@jRn2U6*)!iA7|Glz3uQkeE&!EWYl(=LsOM?lcxt)|;i7PRInhxQi((Z@2
z3#C1-;3~drdj;2(HoKOMb$y<@#@K`uPf|+K2rZ=KA<P~9m%g+@JtN}0kx5=pbV7V`
zBsG#!Mrf+0J<8&4wX5S?*DAlDj!ums-soYT(L=n+LuiVws>SDJnnuPar}00Q1XgQq
zKj2tTGwu_e<Oye5B_+|Z$)2VO!-vNvCwsk~Ta!~gEmMX^#>XbddXp;cdbGr~w{X~h
z7h|l}S`3#RM7zAhN5mzJ^|GqUF?8u`F)1XiT?Kc^UGHsiB?j!OebAL7IBmgbS74TS
zJx+2$+SbvoBK3K~#MhQsqMF7+h)v?Ux;CpKc2I0|WO8f*Ys~H$dyTOQlG6GGxI;2}
zxMy0WF|K&O|E|=u6=PhfuF$lKV_mUn`+K-Tca6B?ipW|ZK0$pKMI+TUiAhWxPo%ky
ztJ1Dbk6lwk{xfm9{O3V-g%)&g&*KY^W~YnMyi88;=&@ttdBWlLqlMaC%|tcRXsn0b
tkrA-|zjN3&Bmbw$kvy74%*>v#9-5w{eu(x~vYL}<I%L<K5ck63{|8<11u*~s

delta 19238
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
AF8}}l

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index f6fae7c6b..4e88483c4 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 13:58+0200\n"
+"POT-Creation-Date: 2023-11-01 14:10+0100\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -153,7 +153,6 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
 #: proposals/templates/proposals/proposal_diff.html:294
-#: proposals/templates/proposals/proposal_diff.html:294
 #: proposals/templates/proposals/proposal_update_attachments.html:26
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
@@ -202,11 +201,11 @@ msgstr ""
 msgid "Feedback verstuurd"
 msgstr "Feedback sent"
 
-#: fetc/settings.py:132
+#: fetc/settings.py:133
 msgid "Nederlands"
 msgstr "Dutch"
 
-#: fetc/settings.py:133
+#: fetc/settings.py:134
 msgid "Engels"
 msgstr "English"
 
@@ -327,32 +326,30 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:560 proposals/forms.py:624 proposals/forms.py:639
+#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
 
 #: main/menus.py:6 main/templates/base/menu.html:7
-#: main/templates/main/index.html:7 main/templates/main/index.html:24
+#: main/templates/main/index.html:7 main/templates/main/index.html:56
 #: main/templates/main/landing.html:34
 msgid "Startpagina"
 msgstr "Start page"
 
-#: main/menus.py:11
 #: main/menus.py:11
 msgid "Log in"
 msgstr "Log in"
 
-#: main/menus.py:16 main/templates/base/login_header.html:7
 #: main/menus.py:16 main/templates/base/login_header.html:7
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:13
+#: main/models.py:10 main/utils.py:15
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:13
+#: main/models.py:11 main/utils.py:15
 msgid "nee"
 msgstr "no"
 
@@ -364,7 +361,7 @@ msgstr "uncertain"
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:68 observations/models.py:129 proposals/models.py:255
+#: main/models.py:70 observations/models.py:129 proposals/models.py:255
 #: studies/models.py:208 studies/models.py:244 tasks/models.py:157
 #: tasks/models.py:169
 msgid "Namelijk"
@@ -463,7 +460,6 @@ msgstr "My decision"
 
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
-#: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
 #: reviews/templates/reviews/vue_templates/review_list.html:131
 msgid "Afhandeling"
@@ -474,7 +470,6 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:135
 #: main/templates/auth/user_detail.html:75 reviews/models.py:135
 msgid ", met revisie"
 msgstr ", with revision"
@@ -587,31 +582,26 @@ msgstr "Create an amendment to an already approved application"
 
 #: main/templates/base/menu.html:32 proposals/menus.py:56
 #: proposals/views/proposal_views.py:76
-#: proposals/views/proposal_views.py:76
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
 #: main/templates/base/menu.html:35 proposals/menus.py:60
 #: proposals/views/proposal_views.py:126
-#: proposals/views/proposal_views.py:126
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
 #: main/templates/base/menu.html:38 proposals/menus.py:64
 #: proposals/views/proposal_views.py:88
-#: proposals/views/proposal_views.py:88
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
 #: main/templates/base/menu.html:41 proposals/menus.py:68
 #: proposals/views/proposal_views.py:100
-#: proposals/views/proposal_views.py:100
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
 #: main/templates/base/menu.html:44 proposals/menus.py:72
 #: proposals/views/proposal_views.py:112
-#: proposals/views/proposal_views.py:112
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
@@ -619,8 +609,8 @@ msgstr "My supervised applications"
 msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
-#: main/templates/base/menu.html:52 proposals/menus.py:108
-#: proposals/views/proposal_views.py:149
+#: main/templates/base/menu.html:52 proposals/menus.py:110
+#: proposals/views/proposal_views.py:153
 msgid "Archief"
 msgstr "Archive"
 
@@ -663,12 +653,12 @@ msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
 #: main/templates/base/menu.html:85 main/templates/base/menu.html:112
-#: reviews/menus.py:32 reviews/views.py:229
+#: reviews/menus.py:32 reviews/views.py:230
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
 #: main/templates/base/menu.html:88 main/templates/base/menu.html:115
-#: reviews/menus.py:47 reviews/views.py:275
+#: reviews/menus.py:47 reviews/views.py:276
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
@@ -697,8 +687,6 @@ msgstr "FEtC-H website"
 #: main/templates/base/menu.html:152 main/templates/main/landing.html:77
 #: main/templates/registration/login.html:15
 #: main/templates/registration/login.html:32
-#: main/templates/registration/login.html:15
-#: main/templates/registration/login.html:32
 msgid "Inloggen"
 msgstr "Log in"
 
@@ -1106,7 +1094,6 @@ msgstr ""
 "You need a Solis-ID to log in. If you do not have a Solis ID, please contact "
 "the secretary of the FEtC-H."
 
-#: main/templates/main/landing.html:86 main/templates/main/landing.html:93
 #: main/templates/main/landing.html:86 main/templates/main/landing.html:93
 msgid "Log in met je Solis-ID"
 msgstr "Log in with your Solis-ID"
@@ -1122,23 +1109,19 @@ msgid ""
 msgstr ""
 "Click <a href=\"%(landing_url)s\">here</a> to return to the start page."
 
-#: main/templates/registration/login.html:23
 #: main/templates/registration/login.html:23
 msgid ""
 "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw."
 msgstr "Username or password incorrect. Please try again."
 
-#: main/templates/registration/login.html:27
 #: main/templates/registration/login.html:27
 msgid "Je kan hier inloggen met je Solis-ID en wachtwoord."
 msgstr "You can log in here with your Solis-ID and password."
 
-#: main/templates/registration/login.html:30
 #: main/templates/registration/login.html:30
 msgid "Gebruikersnaam"
 msgstr "Username"
 
-#: main/templates/registration/login.html:31
 #: main/templates/registration/login.html:31
 msgid "Wachtwoord"
 msgstr "Password"
@@ -1215,8 +1198,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
-#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1370,7 +1352,6 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:42 proposals/models.py:221
 #: proposals/forms.py:42 proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
@@ -1380,11 +1361,11 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:63 proposals/forms.py:270 proposals/validators.py:25
+#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:134
+#: proposals/forms.py:133
 msgid "Selecteer..."
 msgstr "Select..."
 
@@ -1403,19 +1384,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:189
+#: proposals/forms.py:192
 msgid "Je dient een eindverantwoordelijke op te geven."
 msgstr "You are required to specify the researcher with final responsibility."
 
-#: proposals/forms.py:204
+#: proposals/forms.py:199
+msgid "Je kunt niet jezelf als eindverantwoordelijke opgeven."
+msgstr "You cannot submit yourself as the researcher with final responsibility."
+
+#: proposals/forms.py:213
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:209
+#: proposals/forms.py:218
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:219
+#: proposals/forms.py:228
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1423,7 +1408,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:229
+#: proposals/forms.py:238
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1436,25 +1421,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:256
+#: proposals/forms.py:265
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:276 proposals/models.py:536
-#: proposals/forms.py:276 proposals/models.py:536
+#: proposals/forms.py:285 proposals/models.py:538
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:278 proposals/models.py:538
-#: proposals/forms.py:278 proposals/models.py:538
+#: proposals/forms.py:287 proposals/models.py:540
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:318 proposals/forms.py:353
+#: proposals/forms.py:327 proposals/forms.py:362
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:320 proposals/forms.py:355
+#: proposals/forms.py:329 proposals/forms.py:364
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1464,11 +1447,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:327
+#: proposals/forms.py:336
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:328
+#: proposals/forms.py:337
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1476,69 +1459,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:362
+#: proposals/forms.py:371
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:363
+#: proposals/forms.py:372
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:672
+#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:426
+#: proposals/forms.py:435
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:484
+#: proposals/forms.py:493
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:492
+#: proposals/forms.py:501
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:494
+#: proposals/forms.py:503
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:496
+#: proposals/forms.py:505
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:498
+#: proposals/forms.py:507
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:500
+#: proposals/forms.py:509
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:502
+#: proposals/forms.py:511
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:504
+#: proposals/forms.py:513
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:506
+#: proposals/forms.py:515
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:508
+#: proposals/forms.py:517
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:510
+#: proposals/forms.py:519
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:554
+#: proposals/forms.py:563
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1546,15 +1529,15 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:631
+#: proposals/forms.py:640
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:635
+#: proposals/forms.py:644
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:647
+#: proposals/forms.py:656
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1562,7 +1545,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:678
+#: proposals/forms.py:687
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1598,54 +1581,44 @@ msgstr "View all approved applications of the General Chamber"
 msgid "Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"
 msgstr "View all approved applications of the Linguistics Chamber"
 
-#: proposals/mixins.py:20
 #: proposals/mixins.py:20
 #, python-format
 msgid "Aanvraag %(title)s bewerkt"
 msgstr "Application %(title)s edited"
 
-#: proposals/models.py:143
 #: proposals/models.py:143
 msgid "Concept"
 msgstr "Draft"
 
-#: proposals/models.py:146
 #: proposals/models.py:146
 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke"
 msgstr "Sent for assessment by the researcher with final responsibility"
 
-#: proposals/models.py:147
 #: proposals/models.py:147
 msgid "Opgestuurd ter beoordeling door FETC-GW"
 msgstr "Sent for assessment by FEtC-H"
 
-#: proposals/models.py:149 proposals/models.py:150
 #: proposals/models.py:149 proposals/models.py:150
 msgid "Aanvraag is beoordeeld door FETC-GW"
 msgstr "Application has been assessed by FEtC-H"
 
-#: proposals/models.py:156
 #: proposals/models.py:156
 msgid "in het kader van een cursus"
 msgstr "in the context of a course"
 
-#: proposals/models.py:157
 #: proposals/models.py:157
 msgid "om de portal te exploreren"
 msgstr "to explore the portal"
 
 # Not actually used in the interface
 #: proposals/models.py:169
-#: proposals/models.py:169
 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?"
 msgstr "Which chamber should be reviewing this application?"
 
-#: proposals/models.py:178
 #: proposals/models.py:178
 msgid "Aan welk onderzoeksinstituut ben je verbonden?"
 msgstr "To which research institute are you affiliated?"
 
-#: proposals/models.py:184
 #: proposals/models.py:184
 msgid ""
 "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt "
@@ -1654,7 +1627,6 @@ msgstr ""
 "What is the desired starting date of the actual research for which this "
 "application is being submitted?"
 
-#: proposals/models.py:185
 #: proposals/models.py:185
 msgid ""
 "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW "
@@ -1665,7 +1637,6 @@ msgstr ""
 "has approved it cannot receive formal approval; in such cases, the FEtC-H "
 "only provides a post-hoc advice."
 
-#: proposals/models.py:194
 #: proposals/models.py:194
 msgid ""
 "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle "
@@ -1674,7 +1645,6 @@ msgstr ""
 "What is the title of your application? This title will be used in all formal "
 "correspondence."
 
-#: proposals/models.py:199
 #: proposals/models.py:199
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
@@ -1687,7 +1657,6 @@ msgstr ""
 "portal. The title cannot be identical to that of a study you have previously "
 "submitted."
 
-#: proposals/models.py:207
 #: proposals/models.py:207
 msgid ""
 "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. "
@@ -1696,7 +1665,6 @@ msgstr ""
 "Give a clear, concise description of the research question or questions. Use "
 "a maximum of 200 words."
 
-#: proposals/models.py:215
 #: proposals/models.py:215
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd "
@@ -1705,12 +1673,10 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:229
 #: proposals/models.py:229
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:234
 #: proposals/models.py:234
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
@@ -1719,35 +1685,29 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:241
 #: proposals/models.py:241
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:250
 #: proposals/models.py:250
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:261
 #: proposals/models.py:261
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:265
 #: proposals/models.py:265
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:271
 #: proposals/models.py:271
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:277
 #: proposals/models.py:277
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
@@ -1771,7 +1731,6 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:297
 #: proposals/models.py:297
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
@@ -1784,18 +1743,15 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:308
 #: proposals/models.py:308
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:318
 #: proposals/models.py:318
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:326
 #: proposals/models.py:326
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
@@ -1804,12 +1760,10 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:334
 #: proposals/models.py:334
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:342
 #: proposals/models.py:342
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
@@ -1818,17 +1772,14 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:350
 #: proposals/models.py:350
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:355
 #: proposals/models.py:355
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:367
 #: proposals/models.py:367
 msgid ""
 "Kan voor alle deelnemersgroepen dezelfde informatiebrief en         "
@@ -1836,7 +1787,6 @@ msgid ""
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:369
 #: proposals/models.py:369
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
@@ -1861,12 +1811,10 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:385
 #: proposals/models.py:385
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:403
 #: proposals/models.py:403
 msgid ""
 "Ik heb kennis genomen van het bovenstaande en begrijp mijn "
@@ -1875,7 +1823,6 @@ msgstr ""
 "I have read the information above and have considered my responsibilities "
 "with regard to the AVG."
 
-#: proposals/models.py:410
 #: proposals/models.py:410
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
@@ -1886,12 +1833,10 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 reviews/models.py:184
 #: proposals/models.py:422 reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:434
 #: proposals/models.py:434
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
@@ -1900,12 +1845,10 @@ msgstr "Date confirmation sent"
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:444
 #: proposals/models.py:444
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:450
 #: proposals/models.py:450
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
@@ -1915,27 +1858,22 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:464
 #: proposals/models.py:464
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:472
 #: proposals/models.py:472
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:479
 #: proposals/models.py:479
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:486
 #: proposals/models.py:486
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:493
 #: proposals/models.py:493
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
@@ -1950,7 +1888,6 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:510
 #: proposals/models.py:510
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
@@ -1960,94 +1897,88 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:517
 #: proposals/models.py:517
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
+msgid "Promotor/Begeleider"
+msgstr "Promotor/Supervisor"
 
-#: proposals/models.py:520
 #: proposals/models.py:520
 msgid ""
-"Aan het einde van de procedure kan je deze aanvraag ter\n"
-"        verificatie naar je eindverantwoordelijke sturen. De\n"
-"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-"en\n"
-"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
-"wel\n"
-"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
-"je de\n"
-"        aanvraag indient."
-msgstr ""
-"At the end of the procedure, you can send this application to the researcher "
-"with final responsibility for verification. The researcher with final "
-"responsibility can then make adjustments and submit the study to the FEtC-H. "
-"<strong>Note</strong>: if you cannot find your supervisor using this field, "
+"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
+"                    naar je promotor of begeleider gestuurd worden. Deze "
+"persoon \n"
+"                    is de eindverantwoordelijk onderzoeker, en zal de "
+"aanvraag \n"
+"                    vervolgens waar nodig kunnen aanpassen en indienen bij "
+"de FETC-GW.\n"
+"                    <br><br><strong>Belangrijk</strong>: als je je promotor "
+"of \n"
+"                    begeleider niet kunt vinden met dit veld, dan moeten "
+"zij \n"
+"                    waarschijnlijk eerst één keer inloggen in deze portal. \n"
+"                    Je kunt nog wel verder met de aanvraag, maar vergeet dit "
+"veld \n"
+"                    niet in te vullen voor je de aanvraag indient. Je "
+"aanvraag \n"
+"                    zal dan namelijk niet in behandeling kunnen worden "
+"genomen."
+msgstr ""
+"At the end of the procedure, you need to send this application to your promotor or "
+"supervisor for verification. this person is the researcher with final "
+"responsibility and can then make adjustments and submit the study to the FEtC-H. "
+"<strong>Note</strong>: if you cannot find your promotor or supervisor using this field, "
 "they may have to log into this portal at least once with their Solis-ID. You "
-"can continue filling in the application while you wait for them to do this, "
+"can continue filling in the application, while you wait for them to do this, "
 "but remember to come back and fill in this field before submitting."
 
-#: proposals/models.py:545
-#: proposals/models.py:545
+#: proposals/models.py:547
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:617
-#: proposals/models.py:617
+#: proposals/models.py:619
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
-#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:623
-#: proposals/models.py:623
+#: proposals/models.py:625
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:628
-#: proposals/models.py:628
+#: proposals/models.py:630
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:630
-#: proposals/models.py:630
+#: proposals/models.py:632
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:632
-#: proposals/models.py:632
+#: proposals/models.py:634
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:730
-#: proposals/models.py:730
+#: proposals/models.py:732
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:731
-#: proposals/models.py:731
+#: proposals/models.py:733
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:732
-#: proposals/models.py:732
+#: proposals/models.py:734
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:736
-#: proposals/models.py:736
+#: proposals/models.py:738
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -2055,13 +1986,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:750
-#: proposals/models.py:750
+#: proposals/models.py:752
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:756
-#: proposals/models.py:756
+#: proposals/models.py:758
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -2069,8 +1998,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:758
-#: proposals/models.py:758
+#: proposals/models.py:760
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -2091,8 +2019,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:774
-#: proposals/models.py:774
+#: proposals/models.py:776
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -2101,18 +2028,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:781
-#: proposals/models.py:781
+#: proposals/models.py:783
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:786
-#: proposals/models.py:786
+#: proposals/models.py:788
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:824
-#: proposals/models.py:824
+#: proposals/models.py:826
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2218,10 +2142,6 @@ msgstr ""
 #: proposals/templates/proposals/proposal_diff.html:211
 #: proposals/templates/proposals/proposal_diff.html:244
 #: proposals/templates/proposals/proposal_diff.html:268
-#: proposals/templates/proposals/proposal_diff.html:178
-#: proposals/templates/proposals/proposal_diff.html:211
-#: proposals/templates/proposals/proposal_diff.html:244
-#: proposals/templates/proposals/proposal_diff.html:268
 msgid "Originele aanvraag"
 msgstr "Original application"
 
@@ -2241,10 +2161,6 @@ msgstr "Original application"
 #: proposals/templates/proposals/proposal_diff.html:212
 #: proposals/templates/proposals/proposal_diff.html:245
 #: proposals/templates/proposals/proposal_diff.html:269
-#: proposals/templates/proposals/proposal_diff.html:179
-#: proposals/templates/proposals/proposal_diff.html:212
-#: proposals/templates/proposals/proposal_diff.html:245
-#: proposals/templates/proposals/proposal_diff.html:269
 msgid "Revisie/amendement"
 msgstr "Revision/amendment"
 
@@ -2341,16 +2257,6 @@ msgstr "yes,no,"
 #: proposals/templates/proposals/proposal_diff.html:250
 #: proposals/templates/proposals/proposal_diff.html:273
 #: proposals/templates/proposals/proposal_diff.html:274
-#: proposals/templates/proposals/proposal_diff.html:121
-#: proposals/templates/proposals/proposal_diff.html:122
-#: proposals/templates/proposals/proposal_diff.html:216
-#: proposals/templates/proposals/proposal_diff.html:217
-#: proposals/templates/proposals/proposal_diff.html:221
-#: proposals/templates/proposals/proposal_diff.html:222
-#: proposals/templates/proposals/proposal_diff.html:249
-#: proposals/templates/proposals/proposal_diff.html:250
-#: proposals/templates/proposals/proposal_diff.html:273
-#: proposals/templates/proposals/proposal_diff.html:274
 #: proposals/templates/proposals/proposal_pdf.html:109
 #: proposals/templates/proposals/proposal_pdf.html:125
 #: proposals/templates/proposals/proposal_pdf.html:182
@@ -2408,8 +2314,6 @@ msgstr ""
 #: proposals/templates/proposals/pdf/observation_v1.html:53
 #: proposals/templates/proposals/proposal_diff.html:228
 #: proposals/templates/proposals/proposal_diff.html:232
-#: proposals/templates/proposals/proposal_diff.html:228
-#: proposals/templates/proposals/proposal_diff.html:232
 #: proposals/templates/proposals/proposal_pdf.html:189
 #: proposals/templates/proposals/proposal_pdf.html:444
 #: proposals/templates/proposals/proposal_pdf.html:447
@@ -2797,7 +2701,7 @@ msgstr ""
 
 #: proposals/templates/proposals/proposal_diff.html:49
 #: proposals/templates/proposals/proposal_form.html:7
-#: proposals/templates/proposals/proposal_form.html:92
+#: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
 #: proposals/templates/proposals/proposal_pdf.html:82
@@ -2812,8 +2716,6 @@ msgstr ""
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_diff.html:133
-#: proposals/templates/proposals/proposal_diff.html:134
 #: proposals/templates/proposals/proposal_diff.html:133
 #: proposals/templates/proposals/proposal_diff.html:134
 #: proposals/templates/proposals/proposal_pdf.html:133
@@ -2823,7 +2725,6 @@ msgstr "General information about the application"
 msgid "onbekend"
 msgstr "unknown"
 
-#: proposals/templates/proposals/proposal_diff.html:174
 #: proposals/templates/proposals/proposal_diff.html:174
 #: proposals/templates/proposals/proposal_pdf.html:159
 #: proposals/templates/proposals/proposal_pdf_empty.html:104
@@ -2835,7 +2736,6 @@ msgid ""
 msgstr ""
 "Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
 
-#: proposals/templates/proposals/proposal_diff.html:207
 #: proposals/templates/proposals/proposal_diff.html:207
 #: proposals/templates/proposals/proposal_pdf.html:179
 #: proposals/templates/proposals/proposal_pdf_empty.html:120
@@ -2844,7 +2744,6 @@ msgstr ""
 msgid "Aanmelding bij de METC"
 msgstr "Registration with the METC"
 
-#: proposals/templates/proposals/proposal_diff.html:240
 #: proposals/templates/proposals/proposal_diff.html:240
 #: proposals/templates/proposals/proposal_pdf.html:201
 #: proposals/templates/proposals/proposal_pdf_empty.html:134
@@ -2854,19 +2753,18 @@ msgstr "Registration with the METC"
 msgid "Eén of meerdere trajecten?"
 msgstr "One or more trajectories?"
 
-#: proposals/templates/proposals/proposal_diff.html:264
 #: proposals/templates/proposals/proposal_diff.html:264
 #: proposals/templates/proposals/proposal_submit.html:179
 msgid "Concept-aanmelding versturen"
 msgstr "Submit draft application"
 
-#: proposals/templates/proposals/proposal_form.html:72
+#: proposals/templates/proposals/proposal_form.html:56
 #: proposals/templates/proposals/proposal_form_pre_approved.html:72
 #: proposals/templates/proposals/proposal_submit.html:33
 msgid "Aantal woorden:"
 msgstr "Number of words:"
 
-#: proposals/templates/proposals/proposal_form.html:89
+#: proposals/templates/proposals/proposal_form.html:73
 #: proposals/templates/proposals/proposal_submit.html:168
 msgid ""
 "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling "
@@ -2875,7 +2773,7 @@ msgstr ""
 "You are currently editing a practice application. These can not be submitted "
 "to the FETC-H for review."
 
-#: proposals/templates/proposals/proposal_form.html:94
+#: proposals/templates/proposals/proposal_form.html:78
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2885,7 +2783,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form.html:121
+#: proposals/templates/proposals/proposal_form.html:105
 msgid ""
 "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag "
 "ligt, kan de FETC geen officiële goedkeuring meer geven."
@@ -3789,12 +3687,10 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:416
 #: proposals/utils/proposal_utils.py:416
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:418
 #: proposals/utils/proposal_utils.py:418
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
@@ -3844,48 +3740,39 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:43
 #: proposals/views/proposal_views.py:43
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:44
 #: proposals/views/proposal_views.py:44
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:63
 #: proposals/views/proposal_views.py:63
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:64
 #: proposals/views/proposal_views.py:64
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:77
 #: proposals/views/proposal_views.py:77
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:89
 #: proposals/views/proposal_views.py:89
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:101
 #: proposals/views/proposal_views.py:101
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:114
 #: proposals/views/proposal_views.py:114
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:127
 #: proposals/views/proposal_views.py:127
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
@@ -3894,15 +3781,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:242
+#: proposals/views/proposal_views.py:246
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:380
+#: proposals/views/proposal_views.py:384
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:481
+#: proposals/views/proposal_views.py:485
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3991,11 +3878,11 @@ msgstr "Start date period:"
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
-#: reviews/menus.py:37 reviews/views.py:241
+#: reviews/menus.py:37 reviews/views.py:242
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:42 reviews/views.py:253
+#: reviews/menus.py:42 reviews/views.py:254
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
@@ -4055,33 +3942,27 @@ msgstr "Post hoc negative advice by FETC-H"
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:178
 #: reviews/models.py:51 reviews/models.py:178
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:126
 #: reviews/models.py:126
 msgid "Onbekend"
 msgstr "Unknown"
 
-#: reviews/models.py:143
 #: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:172
 #: reviews/models.py:172
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:173
 #: reviews/models.py:173
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:174
 #: reviews/models.py:174
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
@@ -4770,73 +4651,60 @@ msgstr "Change date of confirmation letter"
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_utils.py:54
 #: reviews/utils/review_utils.py:54
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:74
 #: reviews/utils/review_utils.py:74
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:124
 #: reviews/utils/review_utils.py:124
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:218
 #: reviews/utils/review_utils.py:218
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:232
 #: reviews/utils/review_utils.py:232
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:281
 #: reviews/utils/review_utils.py:281
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:296
 #: reviews/utils/review_utils.py:296
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:312
 #: reviews/utils/review_utils.py:312
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:338
 #: reviews/utils/review_utils.py:338
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:341
 #: reviews/utils/review_utils.py:341
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:344
 #: reviews/utils/review_utils.py:344
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:347
 #: reviews/utils/review_utils.py:347
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:350
 #: reviews/utils/review_utils.py:350
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
@@ -4845,7 +4713,6 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:356
 #: reviews/utils/review_utils.py:356
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
@@ -4856,7 +4723,6 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:360
 #: reviews/utils/review_utils.py:360
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
@@ -4867,7 +4733,6 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:367
 #: reviews/utils/review_utils.py:367
 #, python-brace-format
 msgid ""
@@ -4879,7 +4744,6 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:384
 #: reviews/utils/review_utils.py:384
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
@@ -4887,7 +4751,6 @@ msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:388
 #: reviews/utils/review_utils.py:388
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
@@ -4896,7 +4759,6 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:390
 #: reviews/utils/review_utils.py:390
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
@@ -4907,12 +4769,10 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:395
 #: reviews/utils/review_utils.py:395
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:416
 #: reviews/utils/review_utils.py:416
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
@@ -4928,7 +4788,7 @@ msgstr "My results"
 msgid "Openstaande besluiten commissieleden"
 msgstr "Pending decisions committee members"
 
-#: reviews/views.py:200
+#: reviews/views.py:201
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
@@ -6091,3 +5951,6 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:50
 msgid "Taak verwijderd"
 msgstr "Task deleted"
+
+#~ msgid "Eindverantwoordelijke onderzoeker"
+#~ msgstr "Researcher with final responsibility"

From 483ae362866a023a51f1cca33a702b24bef4ef7d Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 1 Nov 2023 14:43:02 +0100
Subject: [PATCH 050/148] Minor code formatting fixes

---
 proposals/templates/proposals/proposal_form.html | 2 +-
 reviews/views.py                                 | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/proposals/templates/proposals/proposal_form.html b/proposals/templates/proposals/proposal_form.html
index 24f7cd99d..7a67cfd7e 100644
--- a/proposals/templates/proposals/proposal_form.html
+++ b/proposals/templates/proposals/proposal_form.html
@@ -11,7 +11,7 @@
   <script type="text/javascript" charset="utf8" src="{% static 'proposals/js/word_counter.js' %}"></script>
     <script>
         $(function () {
-          check_field_required('relation', 'needs_supervisor', 'supervisor', 'proposals');
+            check_field_required('relation', 'needs_supervisor', 'supervisor', 'proposals');
             check_field_required('relation', 'check_in_course', 'student_program', 'proposals');
             check_field_required('relation', 'check_in_course', 'student_context', 'proposals');
             check_field_required('relation', 'check_in_course', 'student_justification', 'proposals');
diff --git a/reviews/views.py b/reviews/views.py
index bb1bb383c..9a08ce0c1 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -157,7 +157,6 @@ def get_review_counts_last_year(self):
         decisions = self.get_committee_decisions()
 
         reviewers = get_user_model().objects.filter(decision__in=decisions)
-
         base_filter = Q(
             decision__review__date_start__gt=self.start_date,
             decision__review__date_start__lt=self.end_date,

From f74b36c40a04c0a7a056fc572667a03004924236 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Fri, 3 Nov 2023 11:38:43 +0100
Subject: [PATCH 051/148] Ensured correct working with pre_approved proposals

---
 proposals/utils/pdf_diff_logic.py | 249 +++++++++++++++---------------
 1 file changed, 127 insertions(+), 122 deletions(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index d408adcae..82a0a81f0 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -132,6 +132,7 @@ def make_diff_rows(self):
             new_section_dict = {row.field: row for row in new_rows}
 
             for field in all_fields:
+                #If a field does not appear in either section, no row will be created.
                 if field in old_section_dict and field in new_section_dict:
                     rows.append({'verbose_name':old_section_dict[field].verbose_name,
                                  'old_value': old_section_dict[field].value, 
@@ -417,6 +418,7 @@ class GeneralSection(BaseSection):
 
     section_title = _("Algemene informatie over de aanvraag")
     row_fields = [
+        "is_pre_approved",
         "relation",
         "supervisor",
         "student_program",
@@ -432,6 +434,8 @@ class GeneralSection(BaseSection):
         "funding",
         "funding_details",
         "funding_name",
+        "pre_approval_institute",
+        "pre_approval_pdf",
         "self_assessment",
         "summary",
     ]
@@ -440,6 +444,10 @@ def get_row_fields(self):
         rows = copy(self.row_fields)
         obj = self.obj
 
+        if not obj.is_pre_approved:
+            rows.remove("is_pre_approved")
+            rows.remove("pre_approval_institute")
+            rows.remove("pre_approval_pdf")
         if not obj.relation.needs_supervisor:
             rows.remove("supervisor")
         if not obj.relation.check_in_course:
@@ -514,7 +522,7 @@ def get_row_fields(self):
         return rows
 
 
-class StudySection(BaseSection):
+class StudySection(PageBreakMixin, BaseSection):
     """This class receives a proposal.study object
     Note the overwritten __init__ method for adding a sub_title."""
 
@@ -939,7 +947,7 @@ def get_row_fields(self):
         return rows
 
 
-class DMPFileSection(BaseSection):
+class DMPFileSection(PageBreakMixin, BaseSection):
     """This class receives a proposal object
     Also unnecessary I suppose. But I though why not ..."""
 
@@ -993,41 +1001,41 @@ def create_context_pdf(context, model):
 
     sections.append(GeneralSection(model))
 
-    if model.wmo:
+    if hasattr(model, 'wmo'):
         sections.append(WMOSection(model.wmo))
 
-    if model.wmo.status != model.wmo.NO_WMO:
-        sections.append(METCSection(model.wmo))
+        if model.wmo.status != model.wmo.NO_WMO:
+            sections.append(METCSection(model.wmo))
 
-    sections.append(TrajectoriesSection(model))
+        sections.append(TrajectoriesSection(model))
 
-    if model.wmo.status == model.wmo.NO_WMO:
-        for study in model.study_set.all():
-            sections.append(StudySection(study))
-            if study.has_intervention:
-                sections.append(InterventionSection(study.intervention))
-            if study.has_observation:
-                sections.append(ObservationSection(study.observation))
-            if study.has_sessions:
-                sections.append(SessionsOverviewSection(study))
-                for session in study.session_set.all():
-                    sections.append(SessionSection(session))
-                    for task in session.task_set.all():
-                        sections.append(TaskSection(task))
-                sections.append(TasksOverviewSection(session))
-            sections.append(StudyOverviewSection(study))
-            sections.append(InformedConsentFormsSection(study.documents))
+        if model.wmo.status == model.wmo.NO_WMO:
+            for study in model.study_set.all():
+                sections.append(StudySection(study))
+                if study.has_intervention:
+                    sections.append(InterventionSection(study.intervention))
+                if study.has_observation:
+                    sections.append(ObservationSection(study.observation))
+                if study.has_sessions:
+                    sections.append(SessionsOverviewSection(study))
+                    for session in study.session_set.all():
+                        sections.append(SessionSection(session))
+                        for task in session.task_set.all():
+                            sections.append(TaskSection(task))
+                    sections.append(TasksOverviewSection(session))
+                sections.append(StudyOverviewSection(study))
+                sections.append(InformedConsentFormsSection(study.documents))
 
-        extra_documents = get_extra_documents(model)
+            extra_documents = get_extra_documents(model)
 
-        for num, document in enumerate(extra_documents):
-            sections.append(ExtraDocumentsSection(document, num))
+            for num, document in enumerate(extra_documents):
+                sections.append(ExtraDocumentsSection(document, num))
 
-        if model.dmp_file:
-            sections.append(DMPFileSection(model))
+            if model.dmp_file:
+                sections.append(DMPFileSection(model))
 
-        sections.append(EmbargoSection(model))
-        sections.append(CommentsSection(model))
+    sections.append(EmbargoSection(model))
+    sections.append(CommentsSection(model))
 
     context["sections"] = sections
 
@@ -1070,135 +1078,132 @@ def create_context_diff(context, old_proposal, new_proposal):
         DiffSection(GeneralSection(old_proposal), GeneralSection(new_proposal))
     )
 
-    if (
-        new_proposal.wmo
-        or old_proposal.wmo
-    ):
+    if hasattr(new_proposal, 'wmo'):
         sections.append(
             DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
-    )
-
-    if (
-        new_proposal.wmo.status != new_proposal.wmo.NO_WMO
-        or old_proposal.wmo.status != old_proposal.wmo.NO_WMO
-    ):
-        sections.append(
-            DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
-        )
-
-    sections.append(
-        DiffSection(
-            TrajectoriesSection(old_proposal), TrajectoriesSection(new_proposal)
         )
-    )
 
-    if (
-        new_proposal.wmo.status == new_proposal.wmo.NO_WMO
-        or new_proposal.wmo.status == new_proposal.wmo.JUDGED
-    ):
-        for old_study, new_study in zip_equalize_lists(
-            old_proposal.study_set.all(), new_proposal.study_set.all()
+        if (
+            new_proposal.wmo.status != new_proposal.wmo.NO_WMO
+            or old_proposal.wmo.status != old_proposal.wmo.NO_WMO
         ):
-            both_studies = [old_study, new_study]
+            sections.append(
+                DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
+            )
 
-            sections.append(DiffSection(*multi_sections(StudySection, both_studies)))
+        sections.append(
+            DiffSection(
+                TrajectoriesSection(old_proposal), TrajectoriesSection(new_proposal)
+            )
+        )
 
-            if (
-                old_study is not None
-                and old_study.has_intervention
-                or new_study is not None
-                and new_study.has_intervention
+        if (
+            new_proposal.wmo.status == new_proposal.wmo.NO_WMO
+            or new_proposal.wmo.status == new_proposal.wmo.JUDGED
+        ):
+            for old_study, new_study in zip_equalize_lists(
+                old_proposal.study_set.all(), new_proposal.study_set.all()
             ):
-                interventions = get_all_related(both_studies, "intervention")
+                both_studies = [old_study, new_study]
 
-                sections.append(
-                    DiffSection(*multi_sections(InterventionSection, interventions))
-                )
+                sections.append(DiffSection(*multi_sections(StudySection, both_studies)))
 
-            if (
-                old_study is not None
-                and old_study.has_observation
-                or new_study is not None
-                and new_study.has_observation
-            ):
-                observations = get_all_related(both_studies, "observation")
+                if (
+                    old_study is not None
+                    and old_study.has_intervention
+                    or new_study is not None
+                    and new_study.has_intervention
+                ):
+                    interventions = get_all_related(both_studies, "intervention")
 
-                sections.append(
-                    DiffSection(*multi_sections(ObservationSection, observations))
-                )
+                    sections.append(
+                        DiffSection(*multi_sections(InterventionSection, interventions))
+                    )
 
-            if (
-                old_study is not None
-                and old_study.has_sessions
-                or new_study is not None
-                and new_study.has_sessions
-            ):
-                sections.append(
-                    DiffSection(*multi_sections(SessionsOverviewSection, both_studies))
-                )
+                if (
+                    old_study is not None
+                    and old_study.has_observation
+                    or new_study is not None
+                    and new_study.has_observation
+                ):
+                    observations = get_all_related(both_studies, "observation")
 
-                old_sessions_set, new_sessions_set = get_all_related_set(
-                    both_studies, "session_set"
-                )
+                    sections.append(
+                        DiffSection(*multi_sections(ObservationSection, observations))
+                    )
 
-                for both_sessions in zip_equalize_lists(
-                    old_sessions_set, new_sessions_set
+                if (
+                    old_study is not None
+                    and old_study.has_sessions
+                    or new_study is not None
+                    and new_study.has_sessions
                 ):
                     sections.append(
-                        DiffSection(*multi_sections(SessionSection, both_sessions))
+                        DiffSection(*multi_sections(SessionsOverviewSection, both_studies))
                     )
 
-                    old_tasks_set, new_tasks_set = get_all_related_set(
-                        both_sessions, "task_set"
+                    old_sessions_set, new_sessions_set = get_all_related_set(
+                        both_studies, "session_set"
                     )
 
-                    for both_tasks in zip_equalize_lists(old_tasks_set, new_tasks_set):
+                    for both_sessions in zip_equalize_lists(
+                        old_sessions_set, new_sessions_set
+                    ):
                         sections.append(
-                            DiffSection(*multi_sections(TaskSection, both_tasks))
+                            DiffSection(*multi_sections(SessionSection, both_sessions))
                         )
 
-                sections.append(
-                    DiffSection(*multi_sections(TasksOverviewSection, both_sessions))
-                )
+                        old_tasks_set, new_tasks_set = get_all_related_set(
+                            both_sessions, "task_set"
+                        )
 
-            sections.append(
-                DiffSection(*multi_sections(StudyOverviewSection, both_studies))
-            )
+                        for both_tasks in zip_equalize_lists(old_tasks_set, new_tasks_set):
+                            sections.append(
+                                DiffSection(*multi_sections(TaskSection, both_tasks))
+                            )
 
-            both_documents = get_all_related(both_studies, "documents")
+                    sections.append(
+                        DiffSection(*multi_sections(TasksOverviewSection, both_sessions))
+                    )
 
-            sections.append(
-                DiffSection(
-                    *multi_sections(InformedConsentFormsSection, both_documents)
+                sections.append(
+                    DiffSection(*multi_sections(StudyOverviewSection, both_studies))
                 )
-            )
 
-        old_extra_docs = get_extra_documents(old_proposal)
-        new_extra_docs = get_extra_documents(new_proposal)
+                both_documents = get_all_related(both_studies, "documents")
 
-        if old_extra_docs or new_extra_docs:
-            for num, zipped_extra_docs in enumerate(
-                zip_equalize_lists(old_extra_docs, new_extra_docs)
-            ):
                 sections.append(
                     DiffSection(
-                        *multi_sections(ExtraDocumentsSection, zipped_extra_docs, num)
+                        *multi_sections(InformedConsentFormsSection, both_documents)
                     )
                 )
 
-        if old_proposal.dmp_file or new_proposal.dmp_file:
-            sections.append(
-                DiffSection(
-                    *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+            old_extra_docs = get_extra_documents(old_proposal)
+            new_extra_docs = get_extra_documents(new_proposal)
+
+            if old_extra_docs or new_extra_docs:
+                for num, zipped_extra_docs in enumerate(
+                    zip_equalize_lists(old_extra_docs, new_extra_docs)
+                ):
+                    sections.append(
+                        DiffSection(
+                            *multi_sections(ExtraDocumentsSection, zipped_extra_docs, num)
+                        )
+                    )
+
+            if old_proposal.dmp_file or new_proposal.dmp_file:
+                sections.append(
+                    DiffSection(
+                        *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+                    )
                 )
-            )
 
-        sections.append(
-            DiffSection(EmbargoSection(old_proposal), EmbargoSection(new_proposal))
-        )
-        sections.append(
-            DiffSection(CommentsSection(old_proposal), CommentsSection(new_proposal))
-        )
+    sections.append(
+        DiffSection(EmbargoSection(old_proposal), EmbargoSection(new_proposal))
+    )
+    sections.append(
+        DiffSection(CommentsSection(old_proposal), CommentsSection(new_proposal))
+    )
 
     context["sections"] = sections
 

From eb3478f19e409ada571c437c4b4c93a524339810 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Fri, 3 Nov 2023 11:50:20 +0100
Subject: [PATCH 052/148] added http:// to href attributes ... :)

---
 proposals/utils/pdf_diff_logic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 82a0a81f0..08b877c6f 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -276,7 +276,7 @@ def create_unordered_html_list(self, lst):
     def handle_field_file(self, field_file):
         if field_file:
             output = format_html(
-                "<a href={}>{}</a>",
+                "<a href=http://{}>{}</a>",
                 f"{settings.BASE_URL}{field_file.url}",
                 _("Download"),
             )

From 7773cb5536ded4297373a9903a041b91e27bc80f Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 3 Nov 2023 12:35:21 +0100
Subject: [PATCH 053/148] fix: add missing italic fonts

---
 .../proposals/pdf_font/OpenSans-BoldItalic.ttf | Bin 0 -> 135108 bytes
 .../proposals/pdf_font/OpenSans-Italic.ttf     | Bin 0 -> 135380 bytes
 .../templates/proposals/proposal_pdf.html      |  14 ++++++++++++++
 3 files changed, 14 insertions(+)
 create mode 100644 proposals/static/proposals/pdf_font/OpenSans-BoldItalic.ttf
 create mode 100644 proposals/static/proposals/pdf_font/OpenSans-Italic.ttf

diff --git a/proposals/static/proposals/pdf_font/OpenSans-BoldItalic.ttf b/proposals/static/proposals/pdf_font/OpenSans-BoldItalic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..eba75d7421fde52ede6f7c4a937e9e84f0733e74
GIT binary patch
literal 135108
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
X<Vb!OL$QVQr~_R0c-{aXl}r3T15J2c

literal 0
HcmV?d00001

diff --git a/proposals/static/proposals/pdf_font/OpenSans-Italic.ttf b/proposals/static/proposals/pdf_font/OpenSans-Italic.ttf
new file mode 100644
index 0000000000000000000000000000000000000000..b0884744c5be3e7f5ecbf9299474a00772a283e9
GIT binary patch
literal 135380
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
V&iw!+Ouj+|JytsJ9LQ=-@_*WA1`7ZH

literal 0
HcmV?d00001

diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 8d34efb65..ec5b1216f 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -21,6 +21,20 @@
             font-weight: 700;
         }
 
+        @font-face {
+            font-family: "Open Sans";
+            src: url('proposals/static/proposals/pdf_font/OpenSans-Italic.ttf');
+            font-weight: 400;
+            font-style: italic;
+        }
+
+        @font-face {
+            font-family: "Open Sans";
+            src: url('proposals/static/proposals/pdf_font/OpenSans-BoldItalic.ttf');
+            font-weight: 700;
+            font-style: italic;
+        }
+
         body {
             font-family: "Open Sans";
         }

From c066bf5a05d49302122bf8bf0b62e3f16a8a7dbd Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 3 Nov 2023 15:15:32 +0100
Subject: [PATCH 054/148] fix: use https over http

---
 proposals/utils/pdf_diff_logic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 08b877c6f..8999c631b 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -276,7 +276,7 @@ def create_unordered_html_list(self, lst):
     def handle_field_file(self, field_file):
         if field_file:
             output = format_html(
-                "<a href=http://{}>{}</a>",
+                "<a href=https://{}>{}</a>",
                 f"{settings.BASE_URL}{field_file.url}",
                 _("Download"),
             )

From 7c30445f15a17ea04612cbf8fc613191ee12a1cc Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Fri, 3 Nov 2023 15:40:15 +0100
Subject: [PATCH 055/148] Rough draft of adding date to review list vue
 template

---
 reviews/templates/reviews/vue_templates/review_list.html | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/reviews/templates/reviews/vue_templates/review_list.html b/reviews/templates/reviews/vue_templates/review_list.html
index f56929f52..87654c0f7 100644
--- a/reviews/templates/reviews/vue_templates/review_list.html
+++ b/reviews/templates/reviews/vue_templates/review_list.html
@@ -118,6 +118,14 @@ <h4>
                 {{ review.get_stage_display }}
                 {% endverbatim %}
             </div>
+            {# For some reason context.review.REVISION and other class variables of continuation are None?#}
+            {# Only context.review.GO returns 1 for me, as it should #}
+            {# Which is why I've hardcoded the 1 here ... #}
+            <div class="ufl-undertitle-line" v-if="review.stage === context.review.CLOSED && review.continuation === 1">
+                {% verbatim %}
+                {{review.decision.date_decision}}
+                {% endverbatim %}
+            </div>
         </template>
 
 

From 5b429d82b83584e5e7f59ed0c4d5713dd3183f43 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Fri, 3 Nov 2023 15:46:51 +0100
Subject: [PATCH 056/148] more rewording to promotor/supervisor

---
 locale/en/LC_MESSAGES/django.mo | Bin 150795 -> 150755 bytes
 locale/en/LC_MESSAGES/django.po |  40 ++++++++++++++++++--------------
 proposals/forms.py              |   4 ++--
 3 files changed, 25 insertions(+), 19 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index b1703c3d292392465a0bd9e10e48497a8a3f75cf..4642b40ec4979acac0528fcb32a4c68d7861d0fb 100644
GIT binary patch
delta 10566
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

delta 10514
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
W*0g(0N`~Yfx1F%9)1NwR+y5V;3iIIr

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 4e88483c4..6d1e1613b 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-01 14:10+0100\n"
+"POT-Creation-Date: 2023-11-03 15:43+0100\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -653,12 +653,12 @@ msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
 #: main/templates/base/menu.html:85 main/templates/base/menu.html:112
-#: reviews/menus.py:32 reviews/views.py:230
+#: reviews/menus.py:32 reviews/views.py:229
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
 #: main/templates/base/menu.html:88 main/templates/base/menu.html:115
-#: reviews/menus.py:47 reviews/views.py:276
+#: reviews/menus.py:47 reviews/views.py:275
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
@@ -1385,12 +1385,13 @@ msgstr ""
 "H."
 
 #: proposals/forms.py:192
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
+msgid "Je dient een promotor/begeleider op te geven."
+msgstr "You are required to specify a promotor/supervisor."
 
 #: proposals/forms.py:199
-msgid "Je kunt niet jezelf als eindverantwoordelijke opgeven."
-msgstr "You cannot submit yourself as the researcher with final responsibility."
+msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
+msgstr ""
+"You cannot submit yourself as the promotor/supervisor."
 
 #: proposals/forms.py:213
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
@@ -1924,13 +1925,14 @@ msgid ""
 "                    zal dan namelijk niet in behandeling kunnen worden "
 "genomen."
 msgstr ""
-"At the end of the procedure, you need to send this application to your promotor or "
-"supervisor for verification. this person is the researcher with final "
-"responsibility and can then make adjustments and submit the study to the FEtC-H. "
-"<strong>Note</strong>: if you cannot find your promotor or supervisor using this field, "
-"they may have to log into this portal at least once with their Solis-ID. You "
-"can continue filling in the application, while you wait for them to do this, "
-"but remember to come back and fill in this field before submitting."
+"At the end of the procedure, you need to send this application to your "
+"promotor or supervisor for verification. this person is the researcher with "
+"final responsibility and can then make adjustments and submit the study to "
+"the FEtC-H. <strong>Note</strong>: if you cannot find your promotor or "
+"supervisor using this field, they may have to log into this portal at least "
+"once with their Solis-ID. You can continue filling in the application, while "
+"you wait for them to do this, but remember to come back and fill in this "
+"field before submitting."
 
 #: proposals/models.py:547
 msgid ""
@@ -3878,11 +3880,11 @@ msgstr "Start date period:"
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
-#: reviews/menus.py:37 reviews/views.py:242
+#: reviews/menus.py:37 reviews/views.py:241
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:42 reviews/views.py:254
+#: reviews/menus.py:42 reviews/views.py:253
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
@@ -4788,7 +4790,7 @@ msgstr "My results"
 msgid "Openstaande besluiten commissieleden"
 msgstr "Pending decisions committee members"
 
-#: reviews/views.py:201
+#: reviews/views.py:200
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
@@ -5952,5 +5954,9 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
+#~ msgid "Je dient een eindverantwoordelijke op te geven."
+#~ msgstr ""
+#~ "You are required to specify the researcher with final responsibility."
+
 #~ msgid "Eindverantwoordelijke onderzoeker"
 #~ msgstr "Researcher with final responsibility"
diff --git a/proposals/forms.py b/proposals/forms.py
index 86787b78d..382492b49 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -189,14 +189,14 @@ def clean(self):
         if relation and relation.needs_supervisor and \
            not supervisor:
             error = forms.ValidationError(
-                _('Je dient een eindverantwoordelijke op te geven.'),
+                _('Je dient een promotor/begeleider op te geven.'),
                 code='required')
             self.add_error('supervisor', error)
 
         if relation and relation.needs_supervisor and \
             supervisor == self.user:
             error = forms.ValidationError(
-                _('Je kunt niet jezelf als eindverantwoordelijke opgeven.')
+                _('Je kunt niet jezelf als promotor/begeleider opgeven.')
             )
             self.add_error('supervisor', error)
 

From 0c9ce531690a13006084909d306192564c2dadeb Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 6 Nov 2023 10:54:54 +0100
Subject: [PATCH 057/148] review.date_end is now display on list of reviews in
 revision

---
 locale/en/LC_MESSAGES/django.mo               | Bin 149364 -> 150464 bytes
 locale/en/LC_MESSAGES/django.po               | 191 ++----------------
 .../reviews/vue_templates/review_list.html    |   5 +-
 3 files changed, 25 insertions(+), 171 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 937898bd69d492524b36395e9ee8ba36eeb96f74..83bb30771cfcb8bf016f493d9f314729d9991ec3 100644
GIT binary patch
delta 19597
zcma*ucX$+4{O|Fzq4(a~0s#_Q=p906QlxjJg=B#MNg$2xf=U;Vjsl7xO^~WorAiU$
z(gl>>Q3Mnza^Ighli%e&_x^F`@$fp|GiS<aGrNmCotAF*ymbC6*;CFjYy(mlQxFFg
zFlJUtW4^DZQe)CKGiD>E!z2&oc!s!g3u6`qQ2wqlH;GrYGNvO=ZEehHypFwaYa3%a
zVBWUIG{tD_f}4?Dev_r0F(WDHjSuk>{(y(uQ-%{cnsb}G$hA!kt|C9cD%{W!oJ8#D
zY>W@5xIV^@h&yw&PIw6?VCAkHi#u>9*EjXL88eK6*SHpw-ZN$kmgsKGGQ5o3llicR
zF)Q&ba_7e1)0h$TzzJMK@3jawhF#`)q%lF<SSRjgjq3F^W&xJ%XG|g<!Z@tgpZ#3l
zY#{S9_KY$n9!n3fE&LoqiSJ+|3>s)m7)E0)T!$*ZhcwoN3^Ha8PC&J^P_!}maT!*^
z-N@*gCm4cRVz{~5WJ1Zb#F3~j{0WO=NG!d8?XfTp$9gy)OX4}yiT}e)SaGm1`7jiV
zVOJc5qi`txi%aR5Aw!JWL!2v~{@+Fyo}<~i^BGCT5Smid&W)up3k6|Vp1AFBW76Xo
z)cz@01eah=-0OM{Rqp|+2mZl~n0<u3!6KN2xaJ7@KP{PN6sTf5%z@FE568Ok0@MZ8
zp$_~J)kCM<{m<R~8AsZ#EsBBcZ|j<bI(`A_M%H5lbLIy>nbZ^%<wi1K5bDmWxN#_|
zD_dYXjKTak4Ald(FdKgD`aP;a$1pRVL*2+NEQcA!FicnzYoUK28I9?3REuw-PW%Rg
zG51(|Kz*!E9ETe7uW=V%#&BHpfidIp4VLkc|InD}#2Y^{W*#;eXX{_Y^~9f1nbqPq
zEtskcDOiPTvB^Z18a~6tIGn|O2J=s5IPg!5z_=;4r_Q2=>?&r*XQ;`T_G8;)xlujh
z#S9pXX|SqOPPf!0Q-FddSQGo8dSW4JXf|UF`~mCW-<T0APqi1Wk2<~s=E1?JA)1IK
zaVa*z!>CD|Z5lm<^>LJ+t{Oxph=RNHR}swqiM{hmsJT!Fv*0_Z8|#c}=@3+lKEh`B
z2^Qmg7qL3Np1~5Myy`4_gDqV9VO7dMM1L<b+sG`#e6#H{dKaoiX<3t6_koxf8=`Kg
zJ8ClaL*392RF_V{QaB3>;ttpIsFpuN-FV<!Tfh2T#(y*gp%i%W2h5CD@IV0X1Jttl
z_EVl__!DaXZPbPTcH^v{v4V(;pjJZ|s>j-+CUFFoz^Rysn=mCk6uf}(FGoRnW}wEl
zJ8HRniY;*`dZ?Ij5&MWUe{Nq!12GfvcFd25Fq9j<j-7~$e@TOgM__H@1xxMo;v8Nk
zeu-KY7yMu8Ekqa6|7vN4<+de_kr$Tfhn;aZw!^$D?CW$OwpTf}!kjC4)nWv0!Gf#o
z%jYzvqXA>T=3zwnl+||sWz<~p&sk%~bn7>C4;A*I#=h-ZJ4Vr{F-t_v?uqyY7vqm|
zoqg;1*7LX~-iJE=5$?nE8|ZE>bPOvKf3V5k*k&xM^&j!AUH{`yU0>`wdI8_T5FCbD
zek-vVUUm1E*=)zMI}WD&6c)#ZG+(Q!pX(<WNxThnV_~`}8mnSsu5Xr-QP<u@AJ*B%
zry1^e38p4)zQguVTddERcE=o)FZ#ijZ@{|5-@CrRw8S+S*Mb;^nyfuh=NpE)5kJ1*
z`erVf99(e5E-pa4Y`2~5x3ITirtaax1Nv|R&P3fn{=L@nn2Wdp7R4^83ynYx$yjWK
zYcLdFVlAxA`1os(Ng`7T*I^aBhCJj<9tOB1euXXZXVkLFx8Ghk7`5E$qMi$_QDff?
zQ(zLN#1WVV{n!U5pw4q|KmDJH%nP?5?E(87$cvf-HL*4hz{<EB>)}N#f%y*F<r|7x
z=h3JW&%^4t0xRNgs2j<4$PP_z)X)?;ME`4c*P%eR#&p;R)v`f2%VW&@s7Gz~!?vpn
zqt<;DEX@Aa_<%U(XXXLEcZ7>$-lO(`wHuofA4lC_-eY!1gZyObP|y+8;+a?t_u&A1
zfgR9y+|K^(SeiKH3HzuGLA9haX2b;7v8aYj!}K^G)xf0~kDJk%gr!f~XL}f`h28Kp
z_QeRSeagPyzd&`N=NEfpsWC6{5Y$ji#yq$l1Mv`QvOUCpSdNn>;vB4k8P4#LT<gC+
znaLCsI&0s4E741Q2n*p|REyJ`vlps_m5942rt7C*b>a=@Z3FJ2F7OPCVd)F@xRzLf
zI3A1RSJ+DH{}7ol3i4dE@9D0n6D-CcJcH`m|4==U;a5F4jLC|+!A__rTmnWB2VJ)1
zGckmCJ(kDc-SR9~_+%VFkKiP(ZzlY1FO==7o#nN#B;_$!6X&2lQXR)-#4oSeS^VX7
zJH}t5hT>b)<T{FF@G|DcbT@2+yqJ}^BWlj{MZd=GLo&M4RhSbmU|M{HnneG&<(`}N
zgt<}m%3*43fWg=dyJ9?Q$c|!je2$f|;Vt{59g3Rthi}pUGsvX5ZJ%tP;w0jtckF{?
zHL4{CQIqKjHp9wyZ3{-@K;qA^IHta58&VnriMye0z>n4NFluN$_w5Z;yHEcgpkM$6
z8l#FVV)aCC)Fk@^>*79a%Mf@T(rv`;AKBOGcC1aD@ekYbrl^)K!5w%OSL4h-?MtlQ
zWBa-vinS=O=KqTi8)Sx{W^slmc3n5b&xr@(Vod*(hY_yEOqll>H^~i^MD@UgzwLwR
z2{t88_mBOO+75dXFGbZ0cy8a8G1!sV{~MV_WUBsaEBxXb`odONjp^9$d1;qd25e27
z2bsjCAEv|sSQKM18_vKCxYTtWrXk*enQ<Q`YW<%g6HGzVS3IpS4!=jwYu?$o6E%y6
z{l_Yy#nW*+@zyu?#^Q~~d9sbh)RcdMsy`2P!L^tLH=}O!05U3k<MuEY82=r7z$-(+
zpV$El26&vgFa%o=FUFSm0M+%iQh1yeG{qp|&R77)U`AZ%?q7wuh__-sJcc>&4(7*K
zcwC?V^YBr0I0d&;QGqx-HFu7Q{BeQu(P=&A6n5r=TsbVA-nOI*>ViE`T{-~O(&27A
z$#uT#3fIl9`_ZohPrC)zUH`)DlzTFGoaaDJ)Ep>;>9G{H#Y*@AeuO13O-9@G<xmfr
zMyT_5#9|nUsc-@|!KoQN{Qg7cGzEF^26n?&_#Sr7<Z*uC*o4i9pJPF6klADEV=vS?
zUyLf>kGk<|s2g~Onggk`*z(M%Nm~>(6oFaje~nQMx1bfKCGLZ@a3Ch(a=eIzvNBW*
z&2v<}xa=NhwvR-XxS5JG@O{SdeaxEE<1FjxsL6K_)l)}MH~yEOOj$B{a@i9$!cxR7
zu_`8_p6#pg92fo(kKw{RwuJ-p*~vEw)$;k6LiJHYwhpV~HuU0S)cLdL*X(Eg)gq(W
z8H*)x66VD9sCB#_HCxYN5&R1^me~u~mQ+R6e-Aa3gHc^R1~peEqRul5H6+VWJ+K+M
zVZXUVMhE_Zh42mPfI<ar%R^8HHbr%LS5(XTxcdj8E;tT#BU4f5TY~D5ji~3re$?c<
zgnCX~!=hUMcgciNkfD%0pe1TO_r|6;3boAkyPiUw;5XEb-a=jIIqJqT@PSY_lneC)
zEab+)7)e|awJPRfRjzNAxfOmz9dI4hl0V!yWf6P9tXPM!&x4wb9lZ7iLW<g+3qwt^
zUZ@9EB<jZFP(9*D_2hKa`4^*KE&Yy+#`q-a&K{uV!b{ZZC|1l}C8%Z7%8mP=Cg(8J
z9GZbz#;e`(eQx<B)OG$w4MFze_Bwfsv;K9br6^F#tD?Fx3^mz0U?WVx+PDo1<1<uC
zat7KHl|T(i71U7HMh(Ge)cMAtCgXfmgO;L(YFi-dU(0151$FTts%uj5$x;uL{HPOG
zM~!to)PZeq0d~WN_&4eXYnAkvSWLn$cncd~Xep2L>GuQF4L-*zSj*2VtuvWe+>HlO
zvwUK(ed5hPwcuCOvU!C1q?5C>ZD9@c64yuFcsQ!1NvIwgi|YEBs2gAFx)n9V{=H<>
z^><NEq-Qu9^Oy0M7@Uu#F-=)}Kqb^%>59(Kpf0oxyW(MNf`R4igKZ!-Bc6{n@fzwz
z3zm0!!fz^)(U`{LX`G3Rv0sSC`Rtaqf?bB~Q7u@An$^qk0&c<<IJKgEVqQQEU6x9=
zep%E7tDz=m3set9ppW@yV#wU5;B;k=`4)Fq@t9sLv&5<%!>2EErkcn3P3I?mQ>#Jj
zt>H0I?C**}#QSR6E`ES&Y1&%0UOVhfJO!`e1Jo)xUfW|P;$6(C^&iKgZj2L9@Aspq
zE`5obbQ$Z~XLw<ZAnt^!w;eUh@1UNXf1;jrnd{l(O5hG|v^w^o{7I<C`3BUfzU}b|
z=&!_%<z)1-xqvKDlO>D;i7PemI3LL#VFlvR4Q*Gi#Yo~8sL9!@ksb3m)EI9=-PjXU
z*T2Lt%-Yya;&!O#$gsxr|A$=gV+weonXK>F$r#ksj$suHp<-LCk7H4@c`xdTb_MnJ
ze1!F|Kr`EO-7u7RAO_%S)D5jgE$7W{{6jO=za9wtDUiQnFg`|2q5{orm)1bd`qrox
z4ZsxWM-A17s3+%aRK2CBWxNwLR0lC7K0_V<0(C=K{4G4r7mYlqW!D^a!b7N8dI76Z
z^9E|{3$&-J=_x-hCqB@@WA@O*=#C!eFQ-Df*an<OO|pQl9FJ454(`QL_y!xGzf?DS
zhXb$!1@rMFKEzSD>phQo7wdGlPr6CyOj4{!`AfWv<$8FWZ$=q<x^n@w8n)p`Ou>@U
zB==)a+>bo?{3fus$84ft6eePYaF6r%0LyU=amPOPks1(TADMC3m+}>;$(uQn<w_5P
z;W+%VugCeRwp5f|z8~Qn>J1xUS3%~1_6CPw7rp<tl1ZRKwm}}V6vtx^EFEpv@kG>Q
z+Jk!Hd1CBpXo7k&4#oPo1iRvO`~>U9T92V7ZLh%|=eyxZ)B|rFR?_-EMn<#OGsJ$Z
zu8&c~GqEJT!Xj8a&aU%@sQTgP#l@(h*n?UXPcRTu#M}Krs3B;E`Y^j6H!_FnB(VNZ
zQ1C~h?YiCk1@EWCO@`ZL^E>L1c^%WzwJ%Z2G36+`Osk+~dwo<3-$OkQhN4!}WYjEQ
zj9y%cS|vZBR@eDatbfh+XB6lqlzOz?ksb9U3qkcj6V!>LQIF6us0YYrsM);MjnAU$
z-9yd#*Qm)_<$XJ3eNZ1*W??#9^FHhUI4#>uf$nttSi57I>wMHQT!L!RH>h>J57jeA
zP&abJ^*O3R89%V+D})-75~$}&Rn!Bk7ruiZ`^hvUbJ{J)%i~a8+8cGJBT+4!jYaW$
zY>HPf2upqBF<)UDY=_Tq3N{_*G0*Tcj>W^{J<cyH?@sVI->T2zBFg=rOtj0P{3MV0
zjDkd*jaesqoWB)ch8KtnPw|-j_#DUJ&X4Uf3!Un|mQg*i9Mx0XQ9W@2Q{z=sPu@Xw
z{S&0e{pPjJm{ikj%QInJDg>d%x-X{0F<2GHVNKkD>e^?R2~$nCJ(dG?;j*Y9s*9Dd
zBdX^nqRw*?OKAP4`NU)Tu^h^wx^&JAyWDo7?)(a-#ha)TKSE8;H>eBeo@qaj1Y#@V
zidc&CjX}NCR?f2Dn0C*$H+UWOT7QM5wf-~D@tFQt6TikK*c@BVwFk^c&4~@Db$$eO
zL;s<=GR-{OQ`s;TaTzR%6;X4jJ!*LlLiOxK)QulNzh?buGQ;o^>dDk`zFnsYxSrMV
zA?mGFWr4j=GgQ|{piUf*I^lFw&n$A|Z&B-gFKQ@GVlljn!!hGR*8dAK;}_cXI(CuA
z`CF~6s3%^=&+YF3Wsy(PW+L{aeBBrJWtDlc?fMAR17$E~=Z2?Z7vjZBXc+Oo7)l(s
z%-+C8JWG6L8S8&8nKjGp$M1$K>?}^X(tga&i&5;agORu#`(TDu_5v~3nfM^K#UfwZ
zm)Q{9NL*sIT~+7t9&!8{J9&G4V?SZd_mgQ%%Q~#JE%|Jn$N4*+6{w*IS#KXCtx#Rt
z3AHMs@fJ=%E!&t4cKxT@XrFl9QOj^L?!v`*kn8l`WQQ#1JCF0LyT1{cKq?%^>G%{&
z<42qA2ZVK~4-S7}BMjMMmrnwgC;l4sa=Cz-#2vTVU(<GCIpTX*9P@6oZ^t^QxiA-b
z>-x=FGMbgex7!C%II7E6BIh*Oci35e_<QSVtizaIK~1g#yX@pEjZKMbU}YSOS|#6M
zA>4_YQ<qT7`W0r=`cJW&b<KrxVHzyC$F{WmUc2n#u{8%wLp{5%;AqUS&)&c!)N^4z
zswY>u9z(6JC#Yrn61A+${b(oqFs#V+%{nqA@ha+BpLV}}SyaFQ#NANk`%x!&h<bq3
zIAGs)%~3bd1Jh#+YK{!Y6gUf0;yhH#7h*45iq7wUDVQ1R%IvO1QC(F5^{8!w>Ve5v
z9WSCDq1g}F7B@x3(WtIoiaOsORLf6b84UQzKA_5@hNj9-tbeWBx)kUE(#^F$>dBUb
zYUvnk$<WM1J>h;oY*))I)RXZEhOj^L&mMD^xZV+u*^5C(t@lwETzkyk&=ypD_n6-n
z{6)b#6a*f(vw9F}5-q?;JdSO!$_e{h@Hi|={0pk5o}r$QxlX#15p{tYs5uaZ8lq;d
z-S8;!KtCC+)0(I3ShhwT&<C&J0MrAf*)JXwj$fk2GR0|+^FNWLMSbEKiN$al>NUIp
zwe0p|TfB>ENbNKBYyD!ZMeNUVmM*31n&U(Y+MKf|y5RZ>)xsj@?RpMHO~z={T$qFR
z@F;4mw_dPAcMn5}pQ7qlxo9V4cdSC3gxsLttR|zbJ&yIz`>P#_UKmEa0!!mv)JrGl
zCEEjmsN;gsiz9G84OxKU#8s}?$vGEwV>?jG_aW-7nEy9kZp=SZnan^6Zv1ZF|81_?
zIWQcnQNGgkH_Xfha$mC_ol0D{E!~G&c1KZj;5=$b9->x{xnX;>7HUrQK+T02n49aH
zC1kX0wqYQiL(S?}sP&rXru}qW7_}Noqb^Vf^(bwPniKsn2nXR%oP!-O(=CtlcRhVj
zkL0bWp1Xy9wXpha`wb`thZA4NQP|^-y`hV!v3!Gi7lhum-|a?WQQ`yG7w@2ks`Wkl
zU2g<x-S5Uu_yBdDhWG8<`S3pduL?UTID)rPWAyC<_lbx_h|@l_vo#2V7=j4wP5H-<
z><<zTF^st8ANIyZq9)mX+=ef36Mp-ry@CFZJ?1>|%Ezq#8f3=)<uR*pJL<s5C-w$D
z#kIt{@f(bNYFkq1nH}>49LNp%u?73@|7~B})&H?Q&<R^nz7V@=Keofh&+X@j`F=7w
z@G;K7y8qfQpU1H`ak&?E|1{JXU&IXf8+OP0$ji_)eQBTdEl@qy8dWbAH91GRj(5vv
zxcV27=}m=IsM(qRmF<aoc$4@Jp1@<T?d<;IKh`lV{ub4x$KKcn)(6~14&uqEN&7kG
z!)2%k+Ah@cJ&0<^IlQd(e~FAH;dW1eGdmxnx~ND%fb&+2!wBL}QC;{N^>XQ)!k(}%
zYPBSxE;s|#^3|x8Z$Uj__qzMfqt^dlm{afn3@HPg2ZtB+!DCyh0Oxai@zep%OQm+2
z0JEF&fqVu24$GzsaGq$_P%TNHKEPSeSx^`9Vs5PF#w}eVT!*_(mt5a0a|?F3o^-v9
z8QK3D)#CISY>V@u-h#oXo(sWA*cbH<_!HF=IWpSg%b|Lt7OJP3U<wRJzg_}9G8&u3
zs0Ye=d>0S7=E@Y{d_?PmHB}G2coFqzeTl`fTxM%q)PpJ!)8PcvoS1>?q4}suyEb!x
z{r<m!0v)gy)pe&)uh09am&{Yt(3ItW2EKrEkx$ZQa8^6H3h|*|ldlB+hc$6L*2ody
z{2adv^==8tX@@KZ)l=~~{q~OMQlLlhc2rlLcjFrvN*s_Y!1<uk0D0A$Ubr7C<gxYt
z&Kux-6AH+uNyWEiR2Nr9HKaOL!1}1=IRwk#3_qFLWPU(B)Bi<vWybt=%qyVgKq#vG
zUDv^=v7C)+$vRZmo<hx)JE&#%4{8YBpk6xZ3Rv@F31WX4GU~dvsE=Si^kO{fhGwHC
z(+boa*@J4)Nz{oiqUOvExBM0AxKsu0h4P}}VAKuPK~3Iv$ei$-E@bp2vKOi+MxyR?
z3u>Jn!Z5swx?u4_?yN?&uomjZ8lYO<4z=#X-Ti}5Lz;lP@EA<O@t8yF|23IT6l5!G
zEA&TA#u(I{k3pSqmb?FRY{1xmg%2seUBuQu<F#|>HtM;Ms;Ir;^r#!ii5g0;8<#_8
z{nsR;F>I{@j6)5{L@bR9QA2PL)gxC?lkA0Co~4+*fnY35d2I~DZm5r5es}*0)Oog{
zdg2#!KL1}JqcOdMYUyLtjl4oHW-o5nePz^gjK&~bh8n74sJZhS>ckJRCq6-)uU(+6
z*8^2A2Gx*JfvkUZ$s7u_T$Z4oXv<M!c^Ng!AE3H0O$pnA9H_A`hikAZHo|Mz7)zB5
zaDLK_#y%>?X4trtEuW5B)+vKn|24=o3JP$3^Bs-%iGM{su?_~?$#)FZby-UXI6o$p
zMs;lu)L4&0^~hw@+}VU`*nZR;I)%Y_6LsD!Wo(0T`^l7`pcraLQ`Cc~HR>Z+H0nKn
z56j{^W$kky0W}BaqgwV2>Vp4ZZ%kRvKEi!inRp|rhi;)7T&BF8WBy1o^(h#J&WBL^
zo%kFs#H}F#&Nriu6#|?eDi@*V%2m{(`X2s{o{F}ou3<sqz)IFI)Uxe~s^1?qxBSR?
z{ALcB1eVk1c$XbHs@T`;YaB%RrmBn;daDOG|07}V8UfCS&_j~)R5k4?X;90~{%CB%
zc|OLv_zS8Bv(;wKP(KFM(4;y6{MgO<pG`)~t$bbE!Um|Z8jl*g^{)G{Iq_NSfJN)s
z)scjnobyo2cqwX@A3zQ5X`ID{UtkyFY4z=c?lu<V`lfi8eK|D2io`>)7zeCE&E6vo
z0-UekAr0;9_G3fJ_hSU6Yh)V`jV+1CVhA2bP0lx{xstN6oeTM}BymghYexc^ce&ss
z)MvZ1P3#!|`HpSjzo<!+zo~6OE7Y=Ff$E{Xs0Ys()FgX~dM?y#W^c4PYI#pXE!&x>
z$^Kb0*1rnAq(C>a3N;ivQSXFPs0%$pO`dekZR|xY$J!Wx9Z|Et3u^iKP?KyZ>iko&
z2+l$E$akn4-`<?{ui1H&f}(g1zrcS{7yPt^eYvbhI_7`2Ap|TCXA5>cN0iykCs)it
zvnNqky|IgZMaWm6Y#8yo#7DWl$wUgEu&sO4PE;$tp?o9<EJSsew#npg+pO71{(F+P
zw$%HZd|%F^ztGTDfHG~2o@q!v9jOibHN;~m`;dM9dK75uO~J>c?xcgnaa78}zH`Ly
zk-~|8Mn0dIBvN1E<ZTA|4=FoEN=@oV($?NRxAGs6VyM^OE$cztGX?8!0GW-XnH;p7
z3afDlaq_l<vVH_*-#S@(>S!GKI_Er$b`$fJ&e`~#(o84T_B;6r*bG~_`->54d1@=K
z@BjQAk@=ONILX6-nkf7j;ym^Awxi1bwUuT6-;~ZFeNGy}aj$Sa<|l0>|2ye7QcB`+
zr1~7wnMSlmZSU(3ojmJXEmK)<w?b#~i%8>%Utm-0NZkqUeu@kaO~a}+J1Lt<+?l+#
zYFL@NJT&dUq@k=a@d|f;ed0_U<KIj{MS>9or`?@|<{S4SP28JH$G&*&VCzHDqcpv{
z?*RF>Zr+Ps-DAH%zEC?qJnOh@?)jG?3rw5eL@D5)5>z}!%1S((J%8e4JdDpUFKGb#
z^HcW}hEkrq@k5ET?dH!)Za#zS1nNz(yUh;wm^Sz&`>$yHFB9w{SVyI)xH7qtdr%QK
zc0<#jxEwd}5+6`Ml6>-3hD=N16Zn@~7>L)Xmx}tm*f*GbEt0b(Pp)8g+@wMTsT6y*
z;v-Tq%EO4;lNOVbx8-C8vOg5ROfG!OqFf-_y~ugWBREfP>gx^r8Rbn#y~sP)k0mpd
zg6^buNacyOg>%4vByHJ|r?Bb3{sNq=3rSlQ+)Mcm^3hI-{TEPrLu%uP5$ChuK=PMJ
z`&G!6Rp;UTW4dwzy^XZp;Y1B=_W$_vGSO`IC2wmuxG2FU%JentBa$}WJI<Eby*VFI
zamw^==}y@$Op9YsTXl`Uwy!xsHg=>T|C4)?mXtN1tUd8E@~fSiOd8kMlxHB%Pd+Ar
z{893?sGprUdE<Ad|JjOBhmQcJrdt+7U8ny)b_@EuRee-i>z0*qea*f>ZeG=zxplvy
zuC~^A4;SER<mV()n)H=>OnolaN)_3fkd8Syu78XJ(zqv?>lUu#pqw1A)Q!atBz^iB
zMP0oa`?x2rL)_lY&v!k;em+8&`=mceH;Lz?7k?s6BR`$Gb@lwO;2uP|v;D%K8{D#A
zuoGz_DS(51CB3U|W7|U+KNs4~ElW@Q1E~_FS5e;!J?wkHalz!bQZ~XKVLDOf&VO67
zk%E0x_@1y9sTv2y;WWw&`|8TKHhuszDM%$K`;Prh-F+9xe@FgHtj;+ykm?faL$0<c
z(r@g`MV!vh&Xewrsm^Zuf4TQ2Ux7-U+1G+P+HRAtfn6vsP0}}{YLtCI`kB1`3IE%h
zewciFD@@D}A*SkE<^Ho2Tp`tV557kJ?d>9!Pf}2s@)zXa;1S|>Z&xD!<gMenajr4c
ztxEY?w_X-^|6t-&q_MW#ZyvKFg}bv92Ytg1eR@sa_EPo_`wzPXnTZ>dw4EYtbB|Tb
zcMsE%w2oAWnBS|NZ58o(H(!vO%SgV1(_q$rA9iYcL*X#;p%~6izB8H&<X^e_hmjvk
zz7qQ;Qva!Q6d$)J=cj)D-2mSs-MS6gw}Jd~(suUMBPCGQj$`-Yb+_Iv_xa<TYAlts
z<#&BaK061T)Je!kkczwe4v_zkl!E;qV@|i6tl<lfSx%Zwex3^0z9wFXf0EKt_Z+DV
z$NKBDV;_Yj-4k>mF6idZkiSgc=f+ese^Iubw1ng(X$!-Pq%x$hh?l91lP7NvIX*RU
zn0uZ;_qf4&{^zDJfHWz&Hu~L)_i&F}zLtX;k<Wu8NRvpVIO(_U{u<;9yBF=oap~Q1
zv4rGfUq#Ywj?07Hoc;9wBQj4Zj3sG%&A~<86U`>yj`S``TOj2Ps25LMj`T0-1o01~
zgQUfz-IRS{tDC3f2az95`KRQQH!u0p1o^c7uac>WpHV4>^oLt(6^6TcQJbVMl5?n&
zybUMclw(Ixp1j4m`*Tn>(k)C$opR&@Df<9#ka|$h|2_r1*{Ll%DX)8?JmgoBuYwD(
zCFUnRC;doD-WIa25GU$OYD1pi7fcuIg}>r9DlWzW#M)+&mJnAZF0AKoS~4|AHAy$w
zQ5)YwZFNYS+`Qs<^#|L(7Sn>d+IqZINAcXZ;zQ&=qFy5!Ig|Xq?lBd~N9g_k6PaL=
zwv9LnbCA9!RVH4;0WU~xN&NNA|7>f>9ir?mW!1<RCjSNLJW1OF(iYMq_9v3+Qoe^&
zoEyoBzmR75`C}0&nv}dXB>(EI3q`rZbDawPD8I!1#^kfPb(Z3NVtpe%<Cc{r-;;cK
zj;(>?IVKW25zoPg#HC37NdA~e(l&!Mmwa9-rKZvc<olzxUap@~R+askNZN9_Cc5Vs
zO4$Nu5C0U4V_uS4y8BjA-rPOUAj+O;{eMDXA5M~r9f!!T!ujqAzH=)pEJ2;sZrsAP
zE9D=O|DM#4{UbT)JyJc&ySf+Ev7eK_Me0YLbi}u)zaFRZ`-AiEd6u$s-dhLgpbT!@
znuD@%KowFHsU-2++X~8#P`3hweMzO?-p{^RQaAP&b<a1CcpK>=b?<8YXOVi6A}P4U
zjvnp_KB24_@ifX);(F5Oq(-D4N#jVH*_V;}zmd<41&Q}_Tv?K~Tv&*G?~%Xel<;;X
zZb7~~iT3j}qtX)!OW<STR@em-Ny&{#(n$zXB^R(yn}_lzHfw(5xES(k)Fy0)N7=8f
z5XT+2S#yK(+LUM1_+Ox~fV)F<BweLK2nU3cMiVch@~2n_w~+3TZ%xuRj`W$6W8!k$
z3HEDCA{}<~TPWA|EuN-q3aORT5U2fo8f9l1r@;BBXNFR71!YIv6NC^?)`7Tz@;5pe
zaS-wEq?*Lqs*oR#XG!mHzJ0`%wSz4esTpPe;QN#Z;m-v)Nk>uxQbr1jP@xVf5AiHd
z$K10Pznf*#H%$+Q6(8X9Ci&u`V||ec-pFuLRDw4uCL%U2&KE&0zN|N9mghvCd4Hw}
zXt*hM@`d!}WBYnJC@Ln>7Z({G9_jV@V!YwuF-dXZ;r+ZrqXy~t$S7Y7#eJd%%=6Ut
zlu3~k9y2TKVD3$I=B&+Ead2#0Liixg?d{`>jP(tQ^d`l|#(ATCk-nk6xPiX7cyAB~
z$0sC4`eG7%F~Rd%*Z1U^_0GYpn{KRKJ20njXk08;=jeT_b*X-lwY*!V=J(vq>L1k4
z7ZdM|jTzzd_Ve}gB`MN5L!6WO;&kWSlsD36I>r9~R(2Yw=K8#S!y^(0CHUwgdO?kh
zPbklsxci3v<6@)d-3boJJMUo`PoXWF%6Jy{tU5e4(Hox_KUjU4(4Q9TzvSL6>m5AE
z7as5PM#RP>gi|9vaj^Pk-h(s&&9=0e>{*mPu#H=zzb|5-cW8fKLVp^ev#S4nk=~)<
zF$wcFJ@pi=+{C%H;oinvCnDY(79a16kB_DUy$xfdqoWcMd_M2BF|)i)6Qjdpq7tHf
z@#VKXnC;n~FXVrZN0hodlGFC3MZW04gJOsKe2hkTOl0zK#0Sr7Stg*!mM_<OK90)a
z8yXeU&l?w;NCoFeMj|M0z?N+Oun6W*r1mDndSesgxM5Bj9i9*s8&lS4!O&QDT!wp@
vcQnlWU&k;Z!~b8E!((Edj<CZq+{@j@`{I(KB7Egd6K62C+zbwwUg&=T23;5Q

delta 18815
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
R>+_uc?HLja7xOR3^?#ak53B$H

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index f6fae7c6b..a3563555d 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-23 13:58+0200\n"
+"POT-Creation-Date: 2023-11-06 10:52+0100\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -153,7 +153,6 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
 #: proposals/templates/proposals/proposal_diff.html:294
-#: proposals/templates/proposals/proposal_diff.html:294
 #: proposals/templates/proposals/proposal_update_attachments.html:26
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
@@ -202,11 +201,11 @@ msgstr ""
 msgid "Feedback verstuurd"
 msgstr "Feedback sent"
 
-#: fetc/settings.py:132
+#: fetc/settings.py:133
 msgid "Nederlands"
 msgstr "Dutch"
 
-#: fetc/settings.py:133
+#: fetc/settings.py:134
 msgid "Engels"
 msgstr "English"
 
@@ -333,26 +332,24 @@ msgid "Dit veld is verplicht."
 msgstr "This field is required."
 
 #: main/menus.py:6 main/templates/base/menu.html:7
-#: main/templates/main/index.html:7 main/templates/main/index.html:24
+#: main/templates/main/index.html:7 main/templates/main/index.html:56
 #: main/templates/main/landing.html:34
 msgid "Startpagina"
 msgstr "Start page"
 
-#: main/menus.py:11
 #: main/menus.py:11
 msgid "Log in"
 msgstr "Log in"
 
-#: main/menus.py:16 main/templates/base/login_header.html:7
 #: main/menus.py:16 main/templates/base/login_header.html:7
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:13
+#: main/models.py:10 main/utils.py:15
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:13
+#: main/models.py:11 main/utils.py:15
 msgid "nee"
 msgstr "no"
 
@@ -364,7 +361,7 @@ msgstr "uncertain"
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:68 observations/models.py:129 proposals/models.py:255
+#: main/models.py:70 observations/models.py:129 proposals/models.py:255
 #: studies/models.py:208 studies/models.py:244 tasks/models.py:157
 #: tasks/models.py:169
 msgid "Namelijk"
@@ -444,7 +441,7 @@ msgstr "Phase"
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
-#: reviews/templates/reviews/vue_templates/review_list.html:151
+#: reviews/templates/reviews/vue_templates/review_list.html:160
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
@@ -452,7 +449,7 @@ msgstr "Date submitted"
 #: reviews/templates/reviews/committee_members_workload.html:27
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
-#: reviews/templates/reviews/vue_templates/review_list.html:161
+#: reviews/templates/reviews/vue_templates/review_list.html:170
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
@@ -463,9 +460,8 @@ msgstr "My decision"
 
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
-#: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
-#: reviews/templates/reviews/vue_templates/review_list.html:131
+#: reviews/templates/reviews/vue_templates/review_list.html:140
 msgid "Afhandeling"
 msgstr "Conclusion"
 
@@ -474,7 +470,6 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:135
 #: main/templates/auth/user_detail.html:75 reviews/models.py:135
 msgid ", met revisie"
 msgstr ", with revision"
@@ -587,31 +582,26 @@ msgstr "Create an amendment to an already approved application"
 
 #: main/templates/base/menu.html:32 proposals/menus.py:56
 #: proposals/views/proposal_views.py:76
-#: proposals/views/proposal_views.py:76
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
 #: main/templates/base/menu.html:35 proposals/menus.py:60
 #: proposals/views/proposal_views.py:126
-#: proposals/views/proposal_views.py:126
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
 #: main/templates/base/menu.html:38 proposals/menus.py:64
 #: proposals/views/proposal_views.py:88
-#: proposals/views/proposal_views.py:88
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
 #: main/templates/base/menu.html:41 proposals/menus.py:68
 #: proposals/views/proposal_views.py:100
-#: proposals/views/proposal_views.py:100
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
 #: main/templates/base/menu.html:44 proposals/menus.py:72
 #: proposals/views/proposal_views.py:112
-#: proposals/views/proposal_views.py:112
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
@@ -619,8 +609,8 @@ msgstr "My supervised applications"
 msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
-#: main/templates/base/menu.html:52 proposals/menus.py:108
-#: proposals/views/proposal_views.py:149
+#: main/templates/base/menu.html:52 proposals/menus.py:110
+#: proposals/views/proposal_views.py:153
 msgid "Archief"
 msgstr "Archive"
 
@@ -697,8 +687,6 @@ msgstr "FEtC-H website"
 #: main/templates/base/menu.html:152 main/templates/main/landing.html:77
 #: main/templates/registration/login.html:15
 #: main/templates/registration/login.html:32
-#: main/templates/registration/login.html:15
-#: main/templates/registration/login.html:32
 msgid "Inloggen"
 msgstr "Log in"
 
@@ -1106,7 +1094,6 @@ msgstr ""
 "You need a Solis-ID to log in. If you do not have a Solis ID, please contact "
 "the secretary of the FEtC-H."
 
-#: main/templates/main/landing.html:86 main/templates/main/landing.html:93
 #: main/templates/main/landing.html:86 main/templates/main/landing.html:93
 msgid "Log in met je Solis-ID"
 msgstr "Log in with your Solis-ID"
@@ -1122,23 +1109,19 @@ msgid ""
 msgstr ""
 "Click <a href=\"%(landing_url)s\">here</a> to return to the start page."
 
-#: main/templates/registration/login.html:23
 #: main/templates/registration/login.html:23
 msgid ""
 "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw."
 msgstr "Username or password incorrect. Please try again."
 
-#: main/templates/registration/login.html:27
 #: main/templates/registration/login.html:27
 msgid "Je kan hier inloggen met je Solis-ID en wachtwoord."
 msgstr "You can log in here with your Solis-ID and password."
 
-#: main/templates/registration/login.html:30
 #: main/templates/registration/login.html:30
 msgid "Gebruikersnaam"
 msgstr "Username"
 
-#: main/templates/registration/login.html:31
 #: main/templates/registration/login.html:31
 msgid "Wachtwoord"
 msgstr "Password"
@@ -1216,7 +1199,6 @@ msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
 #: observations/models.py:88 proposals/models.py:745 studies/models.py:172
-#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1370,7 +1352,6 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:42 proposals/models.py:221
 #: proposals/forms.py:42 proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
@@ -1440,12 +1421,10 @@ msgstr ""
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:276 proposals/models.py:536
 #: proposals/forms.py:276 proposals/models.py:536
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:278 proposals/models.py:538
 #: proposals/forms.py:278 proposals/models.py:538
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
@@ -1598,54 +1577,44 @@ msgstr "View all approved applications of the General Chamber"
 msgid "Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"
 msgstr "View all approved applications of the Linguistics Chamber"
 
-#: proposals/mixins.py:20
 #: proposals/mixins.py:20
 #, python-format
 msgid "Aanvraag %(title)s bewerkt"
 msgstr "Application %(title)s edited"
 
-#: proposals/models.py:143
 #: proposals/models.py:143
 msgid "Concept"
 msgstr "Draft"
 
-#: proposals/models.py:146
 #: proposals/models.py:146
 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke"
 msgstr "Sent for assessment by the researcher with final responsibility"
 
-#: proposals/models.py:147
 #: proposals/models.py:147
 msgid "Opgestuurd ter beoordeling door FETC-GW"
 msgstr "Sent for assessment by FEtC-H"
 
-#: proposals/models.py:149 proposals/models.py:150
 #: proposals/models.py:149 proposals/models.py:150
 msgid "Aanvraag is beoordeeld door FETC-GW"
 msgstr "Application has been assessed by FEtC-H"
 
-#: proposals/models.py:156
 #: proposals/models.py:156
 msgid "in het kader van een cursus"
 msgstr "in the context of a course"
 
-#: proposals/models.py:157
 #: proposals/models.py:157
 msgid "om de portal te exploreren"
 msgstr "to explore the portal"
 
 # Not actually used in the interface
 #: proposals/models.py:169
-#: proposals/models.py:169
 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?"
 msgstr "Which chamber should be reviewing this application?"
 
-#: proposals/models.py:178
 #: proposals/models.py:178
 msgid "Aan welk onderzoeksinstituut ben je verbonden?"
 msgstr "To which research institute are you affiliated?"
 
-#: proposals/models.py:184
 #: proposals/models.py:184
 msgid ""
 "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt "
@@ -1654,7 +1623,6 @@ msgstr ""
 "What is the desired starting date of the actual research for which this "
 "application is being submitted?"
 
-#: proposals/models.py:185
 #: proposals/models.py:185
 msgid ""
 "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW "
@@ -1665,7 +1633,6 @@ msgstr ""
 "has approved it cannot receive formal approval; in such cases, the FEtC-H "
 "only provides a post-hoc advice."
 
-#: proposals/models.py:194
 #: proposals/models.py:194
 msgid ""
 "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle "
@@ -1674,7 +1641,6 @@ msgstr ""
 "What is the title of your application? This title will be used in all formal "
 "correspondence."
 
-#: proposals/models.py:199
 #: proposals/models.py:199
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
@@ -1687,7 +1653,6 @@ msgstr ""
 "portal. The title cannot be identical to that of a study you have previously "
 "submitted."
 
-#: proposals/models.py:207
 #: proposals/models.py:207
 msgid ""
 "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. "
@@ -1696,7 +1661,6 @@ msgstr ""
 "Give a clear, concise description of the research question or questions. Use "
 "a maximum of 200 words."
 
-#: proposals/models.py:215
 #: proposals/models.py:215
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd "
@@ -1705,12 +1669,10 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:229
 #: proposals/models.py:229
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:234
 #: proposals/models.py:234
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
@@ -1719,35 +1681,29 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:241
 #: proposals/models.py:241
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:250
 #: proposals/models.py:250
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:261
 #: proposals/models.py:261
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:265
 #: proposals/models.py:265
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:271
 #: proposals/models.py:271
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:277
 #: proposals/models.py:277
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
@@ -1771,7 +1727,6 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:297
 #: proposals/models.py:297
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
@@ -1784,18 +1739,15 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:308
 #: proposals/models.py:308
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:318
 #: proposals/models.py:318
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:326
 #: proposals/models.py:326
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
@@ -1804,12 +1756,10 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:334
 #: proposals/models.py:334
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:342
 #: proposals/models.py:342
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
@@ -1818,17 +1768,14 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:350
 #: proposals/models.py:350
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:355
 #: proposals/models.py:355
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:367
 #: proposals/models.py:367
 msgid ""
 "Kan voor alle deelnemersgroepen dezelfde informatiebrief en         "
@@ -1836,7 +1783,6 @@ msgid ""
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:369
 #: proposals/models.py:369
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
@@ -1861,12 +1807,10 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:385
 #: proposals/models.py:385
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:403
 #: proposals/models.py:403
 msgid ""
 "Ik heb kennis genomen van het bovenstaande en begrijp mijn "
@@ -1875,7 +1819,6 @@ msgstr ""
 "I have read the information above and have considered my responsibilities "
 "with regard to the AVG."
 
-#: proposals/models.py:410
 #: proposals/models.py:410
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
@@ -1886,12 +1829,10 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 reviews/models.py:184
 #: proposals/models.py:422 reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:434
 #: proposals/models.py:434
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
@@ -1900,12 +1841,10 @@ msgstr "Date confirmation sent"
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:444
 #: proposals/models.py:444
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:450
 #: proposals/models.py:450
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
@@ -1915,27 +1854,22 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:464
 #: proposals/models.py:464
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:472
 #: proposals/models.py:472
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:479
 #: proposals/models.py:479
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:486
 #: proposals/models.py:486
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:493
 #: proposals/models.py:493
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
@@ -1950,7 +1884,6 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:510
 #: proposals/models.py:510
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
@@ -1960,14 +1893,12 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:517
 #: proposals/models.py:517
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
 msgid "Eindverantwoordelijke onderzoeker"
 msgstr "Researcher with final responsibility"
 
-#: proposals/models.py:520
 #: proposals/models.py:520
 msgid ""
 "Aan het einde van de procedure kan je deze aanvraag ter\n"
@@ -1990,7 +1921,6 @@ msgstr ""
 "can continue filling in the application while you wait for them to do this, "
 "but remember to come back and fill in this field before submitting."
 
-#: proposals/models.py:545
 #: proposals/models.py:545
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
@@ -1998,12 +1928,10 @@ msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:617
 #: proposals/models.py:617
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
 #: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
@@ -2011,42 +1939,34 @@ msgstr "Amendment"
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:623
 #: proposals/models.py:623
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:628
 #: proposals/models.py:628
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:630
 #: proposals/models.py:630
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:632
 #: proposals/models.py:632
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:730
 #: proposals/models.py:730
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:731
 #: proposals/models.py:731
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:732
 #: proposals/models.py:732
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:736
 #: proposals/models.py:736
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
@@ -2055,12 +1975,10 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:750
 #: proposals/models.py:750
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:756
 #: proposals/models.py:756
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
@@ -2069,7 +1987,6 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:758
 #: proposals/models.py:758
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
@@ -2091,7 +2008,6 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:774
 #: proposals/models.py:774
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
@@ -2101,17 +2017,14 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:781
 #: proposals/models.py:781
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:786
 #: proposals/models.py:786
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:824
 #: proposals/models.py:824
 #, python-brace-format
 msgid "WMO {title}, status {status}"
@@ -2218,10 +2131,6 @@ msgstr ""
 #: proposals/templates/proposals/proposal_diff.html:211
 #: proposals/templates/proposals/proposal_diff.html:244
 #: proposals/templates/proposals/proposal_diff.html:268
-#: proposals/templates/proposals/proposal_diff.html:178
-#: proposals/templates/proposals/proposal_diff.html:211
-#: proposals/templates/proposals/proposal_diff.html:244
-#: proposals/templates/proposals/proposal_diff.html:268
 msgid "Originele aanvraag"
 msgstr "Original application"
 
@@ -2241,10 +2150,6 @@ msgstr "Original application"
 #: proposals/templates/proposals/proposal_diff.html:212
 #: proposals/templates/proposals/proposal_diff.html:245
 #: proposals/templates/proposals/proposal_diff.html:269
-#: proposals/templates/proposals/proposal_diff.html:179
-#: proposals/templates/proposals/proposal_diff.html:212
-#: proposals/templates/proposals/proposal_diff.html:245
-#: proposals/templates/proposals/proposal_diff.html:269
 msgid "Revisie/amendement"
 msgstr "Revision/amendment"
 
@@ -2341,16 +2246,6 @@ msgstr "yes,no,"
 #: proposals/templates/proposals/proposal_diff.html:250
 #: proposals/templates/proposals/proposal_diff.html:273
 #: proposals/templates/proposals/proposal_diff.html:274
-#: proposals/templates/proposals/proposal_diff.html:121
-#: proposals/templates/proposals/proposal_diff.html:122
-#: proposals/templates/proposals/proposal_diff.html:216
-#: proposals/templates/proposals/proposal_diff.html:217
-#: proposals/templates/proposals/proposal_diff.html:221
-#: proposals/templates/proposals/proposal_diff.html:222
-#: proposals/templates/proposals/proposal_diff.html:249
-#: proposals/templates/proposals/proposal_diff.html:250
-#: proposals/templates/proposals/proposal_diff.html:273
-#: proposals/templates/proposals/proposal_diff.html:274
 #: proposals/templates/proposals/proposal_pdf.html:109
 #: proposals/templates/proposals/proposal_pdf.html:125
 #: proposals/templates/proposals/proposal_pdf.html:182
@@ -2408,8 +2303,6 @@ msgstr ""
 #: proposals/templates/proposals/pdf/observation_v1.html:53
 #: proposals/templates/proposals/proposal_diff.html:228
 #: proposals/templates/proposals/proposal_diff.html:232
-#: proposals/templates/proposals/proposal_diff.html:228
-#: proposals/templates/proposals/proposal_diff.html:232
 #: proposals/templates/proposals/proposal_pdf.html:189
 #: proposals/templates/proposals/proposal_pdf.html:444
 #: proposals/templates/proposals/proposal_pdf.html:447
@@ -2812,8 +2705,6 @@ msgstr ""
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_diff.html:133
-#: proposals/templates/proposals/proposal_diff.html:134
 #: proposals/templates/proposals/proposal_diff.html:133
 #: proposals/templates/proposals/proposal_diff.html:134
 #: proposals/templates/proposals/proposal_pdf.html:133
@@ -2823,7 +2714,6 @@ msgstr "General information about the application"
 msgid "onbekend"
 msgstr "unknown"
 
-#: proposals/templates/proposals/proposal_diff.html:174
 #: proposals/templates/proposals/proposal_diff.html:174
 #: proposals/templates/proposals/proposal_pdf.html:159
 #: proposals/templates/proposals/proposal_pdf_empty.html:104
@@ -2835,7 +2725,6 @@ msgid ""
 msgstr ""
 "Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
 
-#: proposals/templates/proposals/proposal_diff.html:207
 #: proposals/templates/proposals/proposal_diff.html:207
 #: proposals/templates/proposals/proposal_pdf.html:179
 #: proposals/templates/proposals/proposal_pdf_empty.html:120
@@ -2844,7 +2733,6 @@ msgstr ""
 msgid "Aanmelding bij de METC"
 msgstr "Registration with the METC"
 
-#: proposals/templates/proposals/proposal_diff.html:240
 #: proposals/templates/proposals/proposal_diff.html:240
 #: proposals/templates/proposals/proposal_pdf.html:201
 #: proposals/templates/proposals/proposal_pdf_empty.html:134
@@ -2854,7 +2742,6 @@ msgstr "Registration with the METC"
 msgid "Eén of meerdere trajecten?"
 msgstr "One or more trajectories?"
 
-#: proposals/templates/proposals/proposal_diff.html:264
 #: proposals/templates/proposals/proposal_diff.html:264
 #: proposals/templates/proposals/proposal_submit.html:179
 msgid "Concept-aanmelding versturen"
@@ -3714,7 +3601,7 @@ msgstr "Route:"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:187
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
-#: reviews/templates/reviews/vue_templates/review_list.html:184
+#: reviews/templates/reviews/vue_templates/review_list.html:193
 msgid "Indieners"
 msgstr "Applicants"
 
@@ -3735,7 +3622,7 @@ msgstr "Hide"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:139
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
-#: reviews/templates/reviews/vue_templates/review_list.html:139
+#: reviews/templates/reviews/vue_templates/review_list.html:148
 msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
@@ -3789,12 +3676,10 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:416
 #: proposals/utils/proposal_utils.py:416
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:418
 #: proposals/utils/proposal_utils.py:418
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
@@ -3844,48 +3729,39 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:43
 #: proposals/views/proposal_views.py:43
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:44
 #: proposals/views/proposal_views.py:44
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:63
 #: proposals/views/proposal_views.py:63
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:64
 #: proposals/views/proposal_views.py:64
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:77
 #: proposals/views/proposal_views.py:77
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:89
 #: proposals/views/proposal_views.py:89
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:101
 #: proposals/views/proposal_views.py:101
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:114
 #: proposals/views/proposal_views.py:114
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:127
 #: proposals/views/proposal_views.py:127
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
@@ -3894,15 +3770,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:242
+#: proposals/views/proposal_views.py:246
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:380
+#: proposals/views/proposal_views.py:384
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:481
+#: proposals/views/proposal_views.py:485
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3943,7 +3819,7 @@ msgstr "Stage"
 #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
-#: reviews/templates/reviews/vue_templates/review_list.html:177
+#: reviews/templates/reviews/vue_templates/review_list.html:186
 msgid "Route"
 msgstr "Route"
 
@@ -4055,33 +3931,27 @@ msgstr "Post hoc negative advice by FETC-H"
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:178
 #: reviews/models.py:51 reviews/models.py:178
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:126
 #: reviews/models.py:126
 msgid "Onbekend"
 msgstr "Unknown"
 
-#: reviews/models.py:143
 #: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:172
 #: reviews/models.py:172
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:173
 #: reviews/models.py:173
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:174
 #: reviews/models.py:174
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
@@ -4690,6 +4560,10 @@ msgstr "Remove this application from the archive"
 msgid "Plaats aanvraag in archief"
 msgstr "Add this application to the archive"
 
+#: reviews/templates/reviews/vue_templates/review_list.html:125
+msgid "Reviewronde beëindigd: "
+msgstr "Reviewing round ended: "
+
 #: reviews/templatetags/documents_list.py:145
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
@@ -4770,73 +4644,60 @@ msgstr "Change date of confirmation letter"
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_utils.py:54
 #: reviews/utils/review_utils.py:54
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:74
 #: reviews/utils/review_utils.py:74
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:124
 #: reviews/utils/review_utils.py:124
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:218
 #: reviews/utils/review_utils.py:218
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:232
 #: reviews/utils/review_utils.py:232
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:281
 #: reviews/utils/review_utils.py:281
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:296
 #: reviews/utils/review_utils.py:296
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:312
 #: reviews/utils/review_utils.py:312
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:338
 #: reviews/utils/review_utils.py:338
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:341
 #: reviews/utils/review_utils.py:341
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:344
 #: reviews/utils/review_utils.py:344
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:347
 #: reviews/utils/review_utils.py:347
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:350
 #: reviews/utils/review_utils.py:350
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
@@ -4845,7 +4706,6 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:356
 #: reviews/utils/review_utils.py:356
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
@@ -4856,7 +4716,6 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:360
 #: reviews/utils/review_utils.py:360
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
@@ -4867,7 +4726,6 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:367
 #: reviews/utils/review_utils.py:367
 #, python-brace-format
 msgid ""
@@ -4879,7 +4737,6 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:384
 #: reviews/utils/review_utils.py:384
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
@@ -4887,7 +4744,6 @@ msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:388
 #: reviews/utils/review_utils.py:388
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
@@ -4896,7 +4752,6 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:390
 #: reviews/utils/review_utils.py:390
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
@@ -4907,12 +4762,10 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:395
 #: reviews/utils/review_utils.py:395
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:416
 #: reviews/utils/review_utils.py:416
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
diff --git a/reviews/templates/reviews/vue_templates/review_list.html b/reviews/templates/reviews/vue_templates/review_list.html
index 87654c0f7..8eafa24eb 100644
--- a/reviews/templates/reviews/vue_templates/review_list.html
+++ b/reviews/templates/reviews/vue_templates/review_list.html
@@ -119,11 +119,12 @@ <h4>
                 {% endverbatim %}
             </div>
             {# For some reason context.review.REVISION and other class variables of continuation are None?#}
-            {# Only context.review.GO returns 1 for me, as it should #}
+            {# Only context.review.GO returns 0 for me, as it should #}
             {# Which is why I've hardcoded the 1 here ... #}
             <div class="ufl-undertitle-line" v-if="review.stage === context.review.CLOSED && review.continuation === 1">
+                {% trans "Reviewronde beëindigd: " %}
                 {% verbatim %}
-                {{review.decision.date_decision}}
+                {{ review.date_end | date("DD-MM-YYYY") }}
                 {% endverbatim %}
             </div>
         </template>

From 6b15e484e40fcc3e5b9ae0335148e2e9081ca154 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 7 Nov 2023 09:56:56 +0100
Subject: [PATCH 058/148] msgcat

---
 locale/en/LC_MESSAGES/django.mo |  Bin 147190 -> 152805 bytes
 locale/en/LC_MESSAGES/django.po | 1321 +++++++++++++++++++------------
 2 files changed, 802 insertions(+), 519 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 4aa2855c41066fc6561baf81b064ca81780db0c4..8dfc74b2de99a68f019ec381aa370aa541812044 100644
GIT binary patch
delta 23091
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
IC(84`0KZq!PXGV_

delta 18865
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
AQ2+n{

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c96ab3da7..5654643f8 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-10-26 16:38+0200\n"
+"POT-Creation-Date: 2023-11-03 15:43+0100\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -62,7 +62,7 @@ msgstr ""
 "X-Generator: Poedit 2.4.1\n"
 
 #: faqs/menus.py:7 main/templates/base/menu.html:125
-#: main/templates/main/index.html:169
+#: main/templates/main/index.html:201
 msgid "FETC-GW website"
 msgstr "FEtC-H website"
 
@@ -74,16 +74,16 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/"
 msgid "Reglement FETC-GW"
 msgstr "Regulations FEtC-H"
 
-#: faqs/menus.py:13 main/templates/main/index.html:172
+#: faqs/menus.py:13 main/templates/main/index.html:204
 #: proposals/templates/proposals/proposal_start_pre_approved.html:14
 msgid "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/"
 msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
 #: faqs/menus.py:17 main/templates/base/menu.html:134
-#: main/templates/main/index.html:177
+#: main/templates/main/index.html:209
+#: proposals/templates/proposals/proposal_pdf.html:430
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
-#: proposals/utils/pdf_diff_logic.py:874
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -152,7 +152,7 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:58
+#: proposals/templates/proposals/proposal_diff.html:294
 #: proposals/templates/proposals/proposal_update_attachments.html:26
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
@@ -201,11 +201,11 @@ msgstr ""
 msgid "Feedback verstuurd"
 msgstr "Feedback sent"
 
-#: fetc/settings.py:121
+#: fetc/settings.py:133
 msgid "Nederlands"
 msgstr "Dutch"
 
-#: fetc/settings.py:122
+#: fetc/settings.py:134
 msgid "Engels"
 msgstr "English"
 
@@ -282,13 +282,14 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
+#: proposals/templates/proposals/diff/intervention.html:4
+#: proposals/templates/proposals/proposal_pdf.html:285
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
-#: proposals/utils/pdf_diff_logic.py:601
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
 #: interventions/templates/interventions/intervention_form.html:17
-#: main/models.py:55
+#: main/models.py:57
 #: observations/templates/observations/observation_form.html:27
 #: studies/templates/studies/study_end.html:67
 #: studies/templates/studies/study_end.html:98
@@ -325,48 +326,48 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:560 proposals/forms.py:624 proposals/forms.py:639
+#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
 
-#: main/menus.py:5 main/templates/base/menu.html:7
-#: main/templates/main/index.html:7 main/templates/main/index.html:24
-#: main/templates/registration/login.html:35
+#: main/menus.py:6 main/templates/base/menu.html:7
+#: main/templates/main/index.html:7 main/templates/main/index.html:56
+#: main/templates/main/landing.html:34
 msgid "Startpagina"
 msgstr "Start page"
 
-#: main/menus.py:10
+#: main/menus.py:11
 msgid "Log in"
 msgstr "Log in"
 
-#: main/menus.py:15 main/templates/base/login_header.html:7
+#: main/menus.py:16 main/templates/base/login_header.html:7
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:8 main/utils.py:13 proposals/utils/pdf_diff_logic.py:256
+#: main/models.py:10 main/utils.py:15
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:9 main/utils.py:13 proposals/utils/pdf_diff_logic.py:256
+#: main/models.py:11 main/utils.py:15
 msgid "nee"
 msgstr "no"
 
-#: main/models.py:10
+#: main/models.py:12
 msgid "twijfel"
 msgstr "uncertain"
 
-#: main/models.py:64
+#: main/models.py:66
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:68 observations/models.py:129 proposals/models.py:253
+#: main/models.py:70 observations/models.py:129 proposals/models.py:255
 #: studies/models.py:208 studies/models.py:244 tasks/models.py:157
 #: tasks/models.py:169
 msgid "Namelijk"
 msgstr "Please specify"
 
-#: main/models.py:73
+#: main/models.py:75
 msgid ""
 "Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of "
 "een ander persoon die bevoegd is?"
@@ -374,13 +375,13 @@ msgstr ""
 "Will the task be conducted under the supervision of the teacher or another "
 "qualified person?"
 
-#: main/models.py:79
+#: main/models.py:81
 msgid "Is de testleider in het bezit van een VOG?"
 msgstr ""
 "Does the test leader hold a Certificate of Conduct (Verklaring Omtrent "
 "Gedrag, VOG)?"
 
-#: main/models.py:80
+#: main/models.py:82
 msgid ""
 "Iedereen die op een school werkt moet in het bezit         zijn van een "
 "Verklaring Omtrent Gedrag (VOG, zie         <a href=\"https://www.justis.nl/"
@@ -401,7 +402,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:105
+#: proposals/templates/proposals/proposal_pdf.html:79
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
 msgid "E-mail"
 msgstr "E-mail"
@@ -458,7 +459,7 @@ msgid "Mijn besluit"
 msgstr "My decision"
 
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
-#: reviews/models.py:56
+#: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
 #: reviews/templates/reviews/vue_templates/review_list.html:131
 msgid "Afhandeling"
@@ -469,7 +470,7 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:131
+#: main/templates/auth/user_detail.html:75 reviews/models.py:135
 msgid ", met revisie"
 msgstr ", with revision"
 
@@ -546,7 +547,7 @@ msgstr "Save and go to next step >>"
 
 #: main/templates/base/login_header.html:6
 msgid "Welkom {}"
-msgstr ""
+msgstr "Welcome {}"
 
 #: main/templates/base/menu.html:11 proposals/menus.py:80
 msgid "Mijn aanvragen"
@@ -608,8 +609,8 @@ msgstr "My supervised applications"
 msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
-#: main/templates/base/menu.html:52 proposals/menus.py:108
-#: proposals/views/proposal_views.py:149
+#: main/templates/base/menu.html:52 proposals/menus.py:110
+#: proposals/views/proposal_views.py:153
 msgid "Archief"
 msgstr "Archive"
 
@@ -622,17 +623,17 @@ msgid "Alle aanvragen bekijken van de Linguïstiek Kamer"
 msgstr ""
 "View all processed and approved applications of the Linguistics Chamber"
 
-#: main/templates/base/menu.html:62 proposals/menus.py:98
+#: main/templates/base/menu.html:62 proposals/menus.py:100
 msgid "Site-export"
 msgstr "Site-export"
 
-#: main/templates/base/menu.html:69 reviews/forms.py:29 reviews/menus.py:60
+#: main/templates/base/menu.html:69 reviews/forms.py:31 reviews/menus.py:60
 #: reviews/mixins.py:127
 msgid "Algemene Kamer"
 msgstr "General Chamber"
 
 #: main/templates/base/menu.html:72 main/templates/base/menu.html:99
-#: reviews/menus.py:14 reviews/views.py:61
+#: reviews/menus.py:14 reviews/views.py:70
 msgid "Mijn openstaande besluiten"
 msgstr "My pending decisions"
 
@@ -652,16 +653,16 @@ msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
 #: main/templates/base/menu.html:85 main/templates/base/menu.html:112
-#: reviews/menus.py:32 reviews/views.py:181
+#: reviews/menus.py:32 reviews/views.py:229
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
 #: main/templates/base/menu.html:88 main/templates/base/menu.html:115
-#: reviews/menus.py:47 reviews/views.py:237
+#: reviews/menus.py:47 reviews/views.py:275
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
-#: main/templates/base/menu.html:96 reviews/forms.py:30 reviews/menus.py:67
+#: main/templates/base/menu.html:96 reviews/forms.py:32 reviews/menus.py:67
 #: reviews/mixins.py:130
 msgid "Linguïstiek Kamer"
 msgstr "Linguistics Chamber"
@@ -683,8 +684,9 @@ msgstr "Log out"
 msgid "FETC-GW-website"
 msgstr "FEtC-H website"
 
-#: main/templates/base/menu.html:152 main/templates/registration/login.html:67
-#: main/templates/registration/login.html:79
+#: main/templates/base/menu.html:152 main/templates/main/landing.html:77
+#: main/templates/registration/login.html:15
+#: main/templates/registration/login.html:32
 msgid "Inloggen"
 msgstr "Log in"
 
@@ -835,7 +837,40 @@ msgstr ""
 "Try to explain what you were doing and note the page that you were on, if "
 "you can."
 
-#: main/templates/main/index.html:32
+#: main/templates/main/index.html:18
+msgid ""
+"Deze portal is bedoeld voor medewerkers (en studenten) van de Faculteit "
+"Geesteswetenschappen."
+msgstr ""
+"This portal is intended for employees (and students) of the Faculty of "
+"Humanities."
+
+#: main/templates/main/index.html:24
+msgid "Volgens onze gegevens werk/studeer je bij de"
+msgstr "According to our information, you work/study at the"
+
+#: main/templates/main/index.html:29
+msgid ""
+"Volgens onze gegevens werk/studeer je bij een andere faculteit of dienst."
+msgstr "According to our data, you work/study at another faculty or service."
+
+#: main/templates/main/index.html:34
+msgid ""
+"Controleer of je inderdaad een aanvraag wilt indienen bij de Facultaire "
+"Ethische Toetsingscommissie van Geesteswetenschappen."
+msgstr ""
+"Please check whether you indeed want to submit an application to the Faculty "
+"Ethics Assessment Committee – Humanities."
+
+#: main/templates/main/index.html:39
+msgid ""
+"Als je vermoedt dat dit incorrect is, neem dan contact op met <a "
+"href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>."
+msgstr ""
+"If you suspect this is incorrect, please contact support at <a href=\"mailto:"
+"portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>. "
+
+#: main/templates/main/index.html:64
 msgid ""
 "Formele goedkeuring door één van beide kamers van de FETC-GW (middels een "
 "formele goedkeuringsbrief) is vereist voor mensgebonden onderzoek binnen de "
@@ -850,7 +885,7 @@ msgstr ""
 "even to recruiting participants. Therefore, always wait for the letter of "
 "approval before starting research activities."
 
-#: main/templates/main/index.html:39
+#: main/templates/main/index.html:71
 msgid ""
 "NB: Goedgekeurde aanvragen komen in het archief van deze portal te staan, "
 "zie het menu hierboven. Dit archief is toegankelijk voor iedereen met een "
@@ -860,7 +895,7 @@ msgstr ""
 "studying or working at the Faculty of Humanities with a Solis-ID can access "
 "this archive through the menu bar above."
 
-#: main/templates/main/index.html:47
+#: main/templates/main/index.html:79
 msgid ""
 "Heb je een vraag over de werking van de portal, ontdek je een foutje, "
 "missende functionaliteit, of verkeerde vertaling? Neem dan contact op met  "
@@ -871,13 +906,13 @@ msgstr ""
 "email to <a href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</"
 "a>."
 
-#: main/templates/main/index.html:54
+#: main/templates/main/index.html:86
 #: proposals/templates/proposals/proposal_start.html:16
 #: proposals/templates/proposals/proposal_start_practice.html:18
 msgid "Check voor het indienen:"
 msgstr "Before submitting an application, please consult:"
 
-#: main/templates/main/index.html:57
+#: main/templates/main/index.html:89
 #: proposals/templates/proposals/proposal_start.html:19
 #: proposals/templates/proposals/proposal_start_practice.html:21
 msgid ""
@@ -887,7 +922,7 @@ msgstr ""
 "The <a href=\"https://fetc-gw.wp.hum.uu.nl/en/\"  target=\"_blank\">UU-"
 "webpage of the FEtC-H</a> for news and upcoming dates."
 
-#: main/templates/main/index.html:64
+#: main/templates/main/index.html:96
 msgid ""
 "Het <a href=\"https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/\" "
 "target=\"blank\">reglement van de FETC-GW</a>."
@@ -895,7 +930,7 @@ msgstr ""
 "The <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/\"  "
 "target=\"_blank\">regulations of the FEtC-H </a>."
 
-#: main/templates/main/index.html:70
+#: main/templates/main/index.html:102
 msgid ""
 "Gebruik de juiste (meest recente) <a href=\"https://intranet.uu.nl/"
 "documenten-ethische-toetsingscommissie-gw\" "
@@ -907,7 +942,7 @@ msgstr ""
 "target=\"_blank\">model documents</a> for <em>informed consent</em>. (Latest "
 "version: <u>December 2021</u>)"
 
-#: main/templates/main/index.html:74
+#: main/templates/main/index.html:106
 msgid ""
 "<li>Voor advies over data management (plannen): <a href=\"mailto:"
 "datamanagement.gw@uu.nl\">datamanagement.gw@uu.nl</a>.</li> <li>Voor advies "
@@ -924,114 +959,110 @@ msgstr ""
 "itself: <a href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>."
 "</li>"
 
-#: main/templates/main/index.html:83
+#: main/templates/main/index.html:115
 msgid "In deze portal kan je het volgende doen:"
 msgstr "In this portal you can do the following:"
 
-#: main/templates/main/index.html:92
+#: main/templates/main/index.html:124
 msgid "Dien een nieuwe aanvraag in"
 msgstr "Submit a new proposal"
 
-#: main/templates/main/index.html:97
+#: main/templates/main/index.html:129
 msgid "die volledig nieuw is in deze portal;"
 msgstr "that is completely new in this portal;"
 
-#: main/templates/main/index.html:100
+#: main/templates/main/index.html:132
 msgid "op basis van een kopie van een oude aanvraag;"
 msgstr "from a copy of an old proposal;"
 
-#: main/templates/main/index.html:103
+#: main/templates/main/index.html:135
 msgid "voor (al dan niet goedgekeurde) subsidieaanvragen;"
 msgstr "to supplement a grant application"
 
-#: main/templates/main/index.html:106
+#: main/templates/main/index.html:138
 msgid "die al goedgekeurd is door een andere ethische toetsingscomissie."
 msgstr "that has been approved by another ethics committee."
 
-#: main/templates/main/index.html:112
+#: main/templates/main/index.html:144
 msgid "Een aanvraag reviseren"
 msgstr "Revise a proposal"
 
-#: main/templates/main/index.html:117
+#: main/templates/main/index.html:149
 msgid "als een revisie, gebaseerd op opmerkingen van de FETC-GW;"
 msgstr "as a revision, based on comments of the FEtC-H;"
 
-#: main/templates/main/index.html:120
+#: main/templates/main/index.html:152
 msgid "als amendement, wanneer de aanvraag al goedgekeurd is door de FETC-GW."
 msgstr ""
 "as an amendment, after your proposal has already been approved by the FEtC-H."
 
-#: main/templates/main/index.html:128
+#: main/templates/main/index.html:160
 msgid "Bekijk"
 msgstr "View"
 
-#: main/templates/main/index.html:132
+#: main/templates/main/index.html:164
 msgid "mijn conceptaanvragen;"
 msgstr "my draft applications;"
 
-#: main/templates/main/index.html:135
+#: main/templates/main/index.html:167
 msgid "mijn oefenaanvragen;"
 msgstr "my practice applications;"
 
-#: main/templates/main/index.html:138
+#: main/templates/main/index.html:170
 msgid "mijn ingediende aanvragen;"
 msgstr "my submitted applications;"
 
-#: main/templates/main/index.html:141
+#: main/templates/main/index.html:173
 msgid "mijn afgehandelde aanvragen;"
 msgstr "my processed applications;"
 
-#: main/templates/main/index.html:144
+#: main/templates/main/index.html:176
 msgid "mijn aanvragen als eindverantwoordelijke;"
 msgstr "my supervised applications;"
 
-#: main/templates/main/index.html:147
+#: main/templates/main/index.html:179
 msgid "al mijn aanvragen."
 msgstr "all my applications"
 
-#: main/templates/main/index.html:151
+#: main/templates/main/index.html:183
 msgid "FETC-GW archief"
 msgstr "FEtC-H archive"
 
-#: main/templates/main/index.html:155
+#: main/templates/main/index.html:187
 msgid "Alle goedgekeurde aanvragen bekijken van de Algemene Kamer"
 msgstr "View all processed and approved applications of the General Chamber"
 
-#: main/templates/main/index.html:158
+#: main/templates/main/index.html:190
 msgid "Alle goedgekeurde aanvragen bekijken van de Linguïstiek Kamer"
 msgstr ""
 "View all processed and approved applications of the Linguistics Chamber"
 
-#: main/templates/main/index.html:173
+#: main/templates/main/index.html:205
 msgid "Reglement van de FETC-GW"
 msgstr "Regulations of the FEtC-H"
 
-#: main/templates/main/index.html:180
+#: main/templates/main/index.html:212
 msgid "Veelgestelde vragen m.b.t. dit portal"
 msgstr "Frequently asked questions relating to this portal"
 
-#: main/templates/main/index.html:183
+#: main/templates/main/index.html:215
 msgid "Feedback op dit portal geven"
 msgstr "Give feedback on this portal"
 
-#: main/templates/main/index.html:193
+#: main/templates/main/index.html:225
 msgid "Bannerfoto door Kim O'leary"
 msgstr "Cover image by Kim O'leary"
 
-#: main/templates/registration/logged_out.html:12
-msgid "Je bent succesvol uitgelogd."
-msgstr "You have successfully logged out."
-
-#: main/templates/registration/logged_out.html:17
-#, python-format
+#: main/templates/main/landing.html:52
 msgid ""
-"Klik  <a href=\"%(login_url)s\">hier</a> om opnieuw in te loggen met je "
-"Solis-ID."
+"Welkom bij het portal van de Facultaire Ethische Toetsingscommissie "
+"Geesteswetenschappen (FETC-GW)."
 msgstr ""
-"Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-ID."
+"Welcome to the portal of the Faculty Ethics assessment Committee Humanities "
+"(FEtC-H)"
 
+#: main/templates/main/landing.html:58
 #: main/templates/registration/logged_out.html:22
-#: main/templates/registration/login.html:48
 msgid ""
 "Klik <a href=\"http://fetc-gw.wp.hum.uu.nl\">hier</a> om terug te keren naar "
 "de FETC-GW-website."
@@ -1039,45 +1070,59 @@ msgstr ""
 "Click <a href=\"http://fetc-gw.wp.hum.uu.nl/en/\">here</a> to return to the "
 "FEtC-H website."
 
-#: main/templates/registration/login.html:42
-msgid ""
-"Welkom bij het portal van de Facultaire Ethische Toetsingscommissie "
-"Geesteswetenschappen (FETC-GW)."
-msgstr ""
-"Welcome to the portal of the Faculty Ethics assessment Committee Humanities "
-"(FEtC-H)"
-
-#: main/templates/registration/login.html:52
+#: main/templates/main/landing.html:62
 msgid "Contact"
 msgstr "Contact"
 
-#: main/templates/registration/login.html:54
+#: main/templates/main/landing.html:64
 msgid "Secretaris FETC-GW"
 msgstr "FEtC-H Secretary"
 
-#: main/templates/registration/login.html:56
-#: main/templates/registration/login.html:62
+#: main/templates/main/landing.html:66 main/templates/main/landing.html:72
 msgid "Om hier een e-mail adres te zien moet Javascript aan staan"
 msgstr "Javascript needs to be enabled to see the email address"
 
-#: main/templates/registration/login.html:60
+#: main/templates/main/landing.html:70
 msgid "Technische ondersteuning"
 msgstr "Technical support"
 
-#: main/templates/registration/login.html:70
+#: main/templates/main/landing.html:79
+msgid ""
+"Om in te loggen heb je een Solis-ID nodig. Heb je geen Solis-ID, neem dan "
+"contact op met de secretaris van de FETC-GW."
+msgstr ""
+"You need a Solis-ID to log in. If you do not have a Solis ID, please contact "
+"the secretary of the FEtC-H."
+
+#: main/templates/main/landing.html:86 main/templates/main/landing.html:93
+msgid "Log in met je Solis-ID"
+msgstr "Log in with your Solis-ID"
+
+#: main/templates/registration/logged_out.html:12
+msgid "Je bent succesvol uitgelogd."
+msgstr "You have successfully logged out."
+
+#: main/templates/registration/logged_out.html:17
+#, python-format
+msgid ""
+"Klik  <a href=\"%(landing_url)s\">hier</a> om naar de startpagina te gaan."
+msgstr ""
+"Click <a href=\"%(landing_url)s\">here</a> to return to the start page."
+
+#: main/templates/registration/login.html:23
 msgid ""
 "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw."
 msgstr "Username or password incorrect. Please try again."
 
-#: main/templates/registration/login.html:74
+#: main/templates/registration/login.html:27
 msgid "Je kan hier inloggen met je Solis-ID en wachtwoord."
 msgstr "You can log in here with your Solis-ID and password."
 
-#: main/templates/registration/login.html:77
+#: main/templates/registration/login.html:30
 msgid "Gebruikersnaam"
 msgstr "Username"
 
-#: main/templates/registration/login.html:78
+#: main/templates/registration/login.html:31
 msgid "Wachtwoord"
 msgstr "Password"
 
@@ -1153,7 +1198,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:682 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1237,8 +1282,9 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
+#: proposals/templates/proposals/diff/observation.html:4
+#: proposals/templates/proposals/proposal_pdf.html:297
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
-#: proposals/utils/pdf_diff_logic.py:657
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1306,7 +1352,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:42 proposals/models.py:219
+#: proposals/forms.py:42 proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1315,11 +1361,11 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:63 proposals/forms.py:270 proposals/validators.py:25
+#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:134
+#: proposals/forms.py:133
 msgid "Selecteer..."
 msgstr "Select..."
 
@@ -1338,19 +1384,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:189
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
+#: proposals/forms.py:192
+msgid "Je dient een promotor/begeleider op te geven."
+msgstr "You are required to specify a promotor/supervisor."
+
+#: proposals/forms.py:199
+msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
+msgstr "You cannot submit yourself as the promotor/supervisor."
 
-#: proposals/forms.py:204
+#: proposals/forms.py:213
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:209
+#: proposals/forms.py:218
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:219
+#: proposals/forms.py:228
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1358,7 +1408,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:229
+#: proposals/forms.py:238
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1371,23 +1421,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:256
+#: proposals/forms.py:265
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:276 proposals/models.py:534
+#: proposals/forms.py:285 proposals/models.py:538
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:278 proposals/models.py:536
+#: proposals/forms.py:287 proposals/models.py:540
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:318 proposals/forms.py:353
+#: proposals/forms.py:327 proposals/forms.py:362
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:320 proposals/forms.py:355
+#: proposals/forms.py:329 proposals/forms.py:364
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1397,11 +1447,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:327
+#: proposals/forms.py:336
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:328
+#: proposals/forms.py:337
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1409,69 +1459,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:362
+#: proposals/forms.py:371
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:363
+#: proposals/forms.py:372
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:672
+#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:426
+#: proposals/forms.py:435
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:484
+#: proposals/forms.py:493
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:492
+#: proposals/forms.py:501
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:494
+#: proposals/forms.py:503
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:496
+#: proposals/forms.py:505
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:498
+#: proposals/forms.py:507
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:500
+#: proposals/forms.py:509
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:502
+#: proposals/forms.py:511
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:504
+#: proposals/forms.py:513
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:506
+#: proposals/forms.py:515
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:508
+#: proposals/forms.py:517
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:510
+#: proposals/forms.py:519
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:554
+#: proposals/forms.py:563
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1479,15 +1529,15 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:631
+#: proposals/forms.py:640
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:635
+#: proposals/forms.py:644
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:647
+#: proposals/forms.py:656
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1495,7 +1545,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:678
+#: proposals/forms.py:687
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1527,49 +1577,49 @@ msgstr "New application"
 msgid "Bekijk alle goedgekeurde aanvragen van de Algemene Kamer"
 msgstr "View all approved applications of the General Chamber"
 
-#: proposals/menus.py:94
+#: proposals/menus.py:95
 msgid "Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"
 msgstr "View all approved applications of the Linguistics Chamber"
 
-#: proposals/mixins.py:17
+#: proposals/mixins.py:20
 #, python-format
 msgid "Aanvraag %(title)s bewerkt"
 msgstr "Application %(title)s edited"
 
-#: proposals/models.py:141
+#: proposals/models.py:143
 msgid "Concept"
 msgstr "Draft"
 
-#: proposals/models.py:144
+#: proposals/models.py:146
 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke"
 msgstr "Sent for assessment by the researcher with final responsibility"
 
-#: proposals/models.py:145
+#: proposals/models.py:147
 msgid "Opgestuurd ter beoordeling door FETC-GW"
 msgstr "Sent for assessment by FEtC-H"
 
-#: proposals/models.py:147 proposals/models.py:148
+#: proposals/models.py:149 proposals/models.py:150
 msgid "Aanvraag is beoordeeld door FETC-GW"
 msgstr "Application has been assessed by FEtC-H"
 
-#: proposals/models.py:154
+#: proposals/models.py:156
 msgid "in het kader van een cursus"
 msgstr "in the context of a course"
 
-#: proposals/models.py:155
+#: proposals/models.py:157
 msgid "om de portal te exploreren"
 msgstr "to explore the portal"
 
 # Not actually used in the interface
-#: proposals/models.py:167
+#: proposals/models.py:169
 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?"
 msgstr "Which chamber should be reviewing this application?"
 
-#: proposals/models.py:176
+#: proposals/models.py:178
 msgid "Aan welk onderzoeksinstituut ben je verbonden?"
 msgstr "To which research institute are you affiliated?"
 
-#: proposals/models.py:182
+#: proposals/models.py:184
 msgid ""
 "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt "
 "ingediend?"
@@ -1577,7 +1627,7 @@ msgstr ""
 "What is the desired starting date of the actual research for which this "
 "application is being submitted?"
 
-#: proposals/models.py:183
+#: proposals/models.py:185
 msgid ""
 "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW "
 "de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer gegeven "
@@ -1587,7 +1637,7 @@ msgstr ""
 "has approved it cannot receive formal approval; in such cases, the FEtC-H "
 "only provides a post-hoc advice."
 
-#: proposals/models.py:192
+#: proposals/models.py:194
 msgid ""
 "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle "
 "formele correspondentie."
@@ -1595,7 +1645,7 @@ msgstr ""
 "What is the title of your application? This title will be used in all formal "
 "correspondence."
 
-#: proposals/models.py:197
+#: proposals/models.py:199
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1607,7 +1657,7 @@ msgstr ""
 "portal. The title cannot be identical to that of a study you have previously "
 "submitted."
 
-#: proposals/models.py:205
+#: proposals/models.py:207
 msgid ""
 "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. "
 "Gebruik maximaal 200 woorden."
@@ -1615,7 +1665,7 @@ msgstr ""
 "Give a clear, concise description of the research question or questions. Use "
 "a maximum of 200 words."
 
-#: proposals/models.py:213
+#: proposals/models.py:215
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd "
 "zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?"
@@ -1623,11 +1673,11 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:227
+#: proposals/models.py:229
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:232
+#: proposals/models.py:234
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
 "Nederlands of Engels?"
@@ -1635,30 +1685,30 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:239
+#: proposals/models.py:241
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:248
+#: proposals/models.py:250
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:259
+#: proposals/models.py:261
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:263
+#: proposals/models.py:265
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:269
+#: proposals/models.py:271
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:275
+#: proposals/models.py:277
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
 "faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS "
@@ -1681,7 +1731,7 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:295
+#: proposals/models.py:297
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
 "ervoor kiezen je applicatie pas later op te laten nemen in het           "
@@ -1693,16 +1743,16 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:306
+#: proposals/models.py:308
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:316
+#: proposals/models.py:318
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:324
+#: proposals/models.py:326
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
 "deze FETC-GW commissie?"
@@ -1710,11 +1760,11 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:332
+#: proposals/models.py:334
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:340
+#: proposals/models.py:342
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
 "doc(x)-formaat)"
@@ -1722,22 +1772,22 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:348
+#: proposals/models.py:350
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:353
+#: proposals/models.py:355
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:365
+#: proposals/models.py:367
 msgid ""
 "Kan voor alle deelnemersgroepen dezelfde informatiebrief en         "
 "toestemmingsverklaring gebruikt worden?"
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:367
+#: proposals/models.py:369
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
 "sprake van in essentie hetzelfde traject, en voldoet één set documenten voor "
@@ -1761,11 +1811,11 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:383
+#: proposals/models.py:385
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:401
+#: proposals/models.py:403
 msgid ""
 "Ik heb kennis genomen van het bovenstaande en begrijp mijn "
 "verantwoordelijkheden ten opzichte van de AVG."
@@ -1773,7 +1823,7 @@ msgstr ""
 "I have read the information above and have considered my responsibilities "
 "with regard to the AVG."
 
-#: proposals/models.py:408
+#: proposals/models.py:410
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
 "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het "
@@ -1783,24 +1833,23 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:420 proposals/utils/pdf_diff_logic.py:1045
-#: reviews/models.py:180
+#: proposals/models.py:422 reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:432
+#: proposals/models.py:434
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:437 reviews/forms.py:108
+#: proposals/models.py:439 reviews/forms.py:110
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:442
+#: proposals/models.py:444
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:448
+#: proposals/models.py:450
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
 "kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden."
@@ -1809,23 +1858,23 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:462
+#: proposals/models.py:464
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:470
+#: proposals/models.py:472
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:477
+#: proposals/models.py:479
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:484
+#: proposals/models.py:486
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:491
+#: proposals/models.py:493
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
 "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met "
@@ -1839,7 +1888,7 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:508
+#: proposals/models.py:510
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
 "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
@@ -1848,81 +1897,89 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:515
+#: proposals/models.py:517
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
-
-#: proposals/models.py:518
-msgid ""
-"Aan het einde van de procedure kan je deze aanvraag ter\n"
-"        verificatie naar je eindverantwoordelijke sturen. De\n"
-"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-"en\n"
-"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
-"wel\n"
-"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
-"je de\n"
-"        aanvraag indient."
-msgstr ""
-"At the end of the procedure, you can send this application to the researcher "
-"with final responsibility for verification. The researcher with final "
-"responsibility can then make adjustments and submit the study to the FEtC-H. "
-"<strong>Note</strong>: if you cannot find your supervisor using this field, "
-"they may have to log into this portal at least once with their Solis-ID. You "
-"can continue filling in the application while you wait for them to do this, "
-"but remember to come back and fill in this field before submitting."
-
-#: proposals/models.py:543
+msgid "Promotor/Begeleider"
+msgstr "Promotor/Supervisor"
+
+#: proposals/models.py:520
+msgid ""
+"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
+"                    naar je promotor of begeleider gestuurd worden. Deze "
+"persoon \n"
+"                    is de eindverantwoordelijk onderzoeker, en zal de "
+"aanvraag \n"
+"                    vervolgens waar nodig kunnen aanpassen en indienen bij "
+"de FETC-GW.\n"
+"                    <br><br><strong>Belangrijk</strong>: als je je promotor "
+"of \n"
+"                    begeleider niet kunt vinden met dit veld, dan moeten "
+"zij \n"
+"                    waarschijnlijk eerst één keer inloggen in deze portal. \n"
+"                    Je kunt nog wel verder met de aanvraag, maar vergeet dit "
+"veld \n"
+"                    niet in te vullen voor je de aanvraag indient. Je "
+"aanvraag \n"
+"                    zal dan namelijk niet in behandeling kunnen worden "
+"genomen."
+msgstr ""
+"At the end of the procedure, you need to send this application to your "
+"promotor or supervisor for verification. this person is the researcher with "
+"final responsibility and can then make adjustments and submit the study to "
+"the FEtC-H. <strong>Note</strong>: if you cannot find your promotor or "
+"supervisor using this field, they may have to log into this portal at least "
+"once with their Solis-ID. You can continue filling in the application, while "
+"you wait for them to do this, but remember to come back and fill in this "
+"field before submitting."
+
+#: proposals/models.py:547
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:615
+#: proposals/models.py:619
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:615 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
-#: reviews/templates/reviews/committee_members_workload.html:71
+#: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:621
+#: proposals/models.py:625
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:626
+#: proposals/models.py:630
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:628
+#: proposals/models.py:632
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:630
+#: proposals/models.py:634
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:667
+#: proposals/models.py:732
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:668
+#: proposals/models.py:733
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:669
+#: proposals/models.py:734
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:673
+#: proposals/models.py:738
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1930,11 +1987,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:687
+#: proposals/models.py:752
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:693
+#: proposals/models.py:758
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1942,7 +1999,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:695
+#: proposals/models.py:760
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1963,7 +2020,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:711
+#: proposals/models.py:776
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1972,15 +2029,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:718
+#: proposals/models.py:783
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:723
+#: proposals/models.py:788
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:761
+#: proposals/models.py:826
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2044,6 +2101,298 @@ msgstr "Old"
 msgid "Nieuw"
 msgstr "New"
 
+#: proposals/templates/proposals/diff/intervention.html:8
+msgid ""
+"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
+"niet bevat."
+msgstr ""
+"This revision involves intervention research, whereas the original "
+"application does not."
+
+#: proposals/templates/proposals/diff/intervention.html:12
+msgid ""
+"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
+"dat wel bevat."
+msgstr ""
+"This revision does not involve intervention research, whereas the original "
+"application does include this."
+
+#: proposals/templates/proposals/diff/intervention.html:28
+msgid ""
+"De revisie en de originele aanvraag hebben beide een interventieonderzoek, "
+"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
+"versie van het formulier gebruikt."
+msgstr ""
+"This revision and the original application both involve intervention "
+"research, but this aspect cannot be compared. The revision uses a newer "
+"version of the form than the original."
+
+#: proposals/templates/proposals/diff/intervention_v1.html:8
+#: proposals/templates/proposals/diff/intervention_v2.html:8
+#: proposals/templates/proposals/diff/observation_v1.html:9
+#: proposals/templates/proposals/diff/observation_v2.html:9
+#: proposals/templates/proposals/diff/sessions.html:23
+#: proposals/templates/proposals/diff/sessions.html:42
+#: proposals/templates/proposals/diff/sessions.html:103
+#: proposals/templates/proposals/diff/sessions.html:174
+#: proposals/templates/proposals/diff/study.html:25
+#: proposals/templates/proposals/diff/study.html:151
+#: proposals/templates/proposals/diff/study.html:215
+#: proposals/templates/proposals/proposal_diff.html:53
+#: proposals/templates/proposals/proposal_diff.html:178
+#: proposals/templates/proposals/proposal_diff.html:211
+#: proposals/templates/proposals/proposal_diff.html:244
+#: proposals/templates/proposals/proposal_diff.html:268
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/diff/intervention_v1.html:9
+#: proposals/templates/proposals/diff/intervention_v2.html:9
+#: proposals/templates/proposals/diff/observation_v1.html:10
+#: proposals/templates/proposals/diff/observation_v2.html:10
+#: proposals/templates/proposals/diff/sessions.html:24
+#: proposals/templates/proposals/diff/sessions.html:43
+#: proposals/templates/proposals/diff/sessions.html:104
+#: proposals/templates/proposals/diff/sessions.html:175
+#: proposals/templates/proposals/diff/study.html:26
+#: proposals/templates/proposals/diff/study.html:152
+#: proposals/templates/proposals/diff/study.html:216
+#: proposals/templates/proposals/proposal_diff.html:54
+#: proposals/templates/proposals/proposal_diff.html:179
+#: proposals/templates/proposals/proposal_diff.html:212
+#: proposals/templates/proposals/proposal_diff.html:245
+#: proposals/templates/proposals/proposal_diff.html:269
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
+#: proposals/templates/proposals/diff/intervention_v1.html:28
+#: proposals/templates/proposals/diff/intervention_v1.html:33
+#: proposals/templates/proposals/diff/intervention_v1.html:42
+#: proposals/templates/proposals/diff/intervention_v1.html:47
+#: proposals/templates/proposals/diff/intervention_v2.html:28
+#: proposals/templates/proposals/diff/intervention_v2.html:33
+#: proposals/templates/proposals/diff/intervention_v2.html:42
+#: proposals/templates/proposals/diff/intervention_v2.html:47
+#: proposals/templates/proposals/diff/intervention_v2.html:62
+#: proposals/templates/proposals/diff/intervention_v2.html:67
+#: proposals/templates/proposals/diff/observation_v1.html:43
+#: proposals/templates/proposals/diff/observation_v1.html:48
+#: proposals/templates/proposals/diff/observation_v2.html:43
+#: proposals/templates/proposals/diff/observation_v2.html:48
+#: proposals/templates/proposals/diff/sessions.html:62
+#: proposals/templates/proposals/diff/sessions.html:67
+#: proposals/templates/proposals/diff/sessions.html:76
+#: proposals/templates/proposals/diff/sessions.html:81
+msgid "ja,nee,"
+msgstr "yes,no,"
+
+#: proposals/templates/proposals/diff/intervention_v1.html:87
+#: proposals/templates/proposals/diff/intervention_v1.html:92
+#: proposals/templates/proposals/diff/intervention_v2.html:102
+#: proposals/templates/proposals/diff/intervention_v2.html:107
+#: proposals/templates/proposals/diff/observation_v1.html:29
+#: proposals/templates/proposals/diff/observation_v1.html:34
+#: proposals/templates/proposals/diff/observation_v1.html:68
+#: proposals/templates/proposals/diff/observation_v1.html:73
+#: proposals/templates/proposals/diff/observation_v1.html:81
+#: proposals/templates/proposals/diff/observation_v1.html:86
+#: proposals/templates/proposals/diff/observation_v1.html:94
+#: proposals/templates/proposals/diff/observation_v1.html:99
+#: proposals/templates/proposals/diff/observation_v1.html:108
+#: proposals/templates/proposals/diff/observation_v1.html:113
+#: proposals/templates/proposals/diff/observation_v1.html:122
+#: proposals/templates/proposals/diff/observation_v1.html:127
+#: proposals/templates/proposals/diff/observation_v2.html:29
+#: proposals/templates/proposals/diff/observation_v2.html:34
+#: proposals/templates/proposals/diff/observation_v2.html:73
+#: proposals/templates/proposals/diff/observation_v2.html:78
+#: proposals/templates/proposals/diff/observation_v2.html:93
+#: proposals/templates/proposals/diff/observation_v2.html:98
+#: proposals/templates/proposals/diff/observation_v2.html:113
+#: proposals/templates/proposals/diff/observation_v2.html:118
+#: proposals/templates/proposals/diff/observation_v2.html:132
+#: proposals/templates/proposals/diff/observation_v2.html:137
+#: proposals/templates/proposals/diff/observation_v2.html:146
+#: proposals/templates/proposals/diff/observation_v2.html:151
+#: proposals/templates/proposals/diff/sessions.html:151
+#: proposals/templates/proposals/diff/sessions.html:156
+#: proposals/templates/proposals/diff/study.html:43
+#: proposals/templates/proposals/diff/study.html:48
+#: proposals/templates/proposals/diff/study.html:63
+#: proposals/templates/proposals/diff/study.html:64
+#: proposals/templates/proposals/diff/study.html:220
+#: proposals/templates/proposals/diff/study.html:221
+#: proposals/templates/proposals/diff/study.html:262
+#: proposals/templates/proposals/diff/study.html:267
+#: proposals/templates/proposals/pdf/intervention_v1.html:16
+#: proposals/templates/proposals/pdf/intervention_v1.html:20
+#: proposals/templates/proposals/pdf/intervention_v1.html:43
+#: proposals/templates/proposals/pdf/intervention_v2.html:16
+#: proposals/templates/proposals/pdf/intervention_v2.html:20
+#: proposals/templates/proposals/pdf/intervention_v2.html:28
+#: proposals/templates/proposals/pdf/intervention_v2.html:48
+#: proposals/templates/proposals/pdf/intervention_v2.html:57
+#: proposals/templates/proposals/pdf/observation_v1.html:16
+#: proposals/templates/proposals/pdf/observation_v1.html:20
+#: proposals/templates/proposals/pdf/observation_v1.html:31
+#: proposals/templates/proposals/pdf/observation_v1.html:34
+#: proposals/templates/proposals/pdf/observation_v1.html:37
+#: proposals/templates/proposals/pdf/observation_v1.html:41
+#: proposals/templates/proposals/pdf/observation_v1.html:45
+#: proposals/templates/proposals/pdf/observation_v2.html:16
+#: proposals/templates/proposals/pdf/observation_v2.html:20
+#: proposals/templates/proposals/pdf/observation_v2.html:34
+#: proposals/templates/proposals/pdf/observation_v2.html:42
+#: proposals/templates/proposals/pdf/observation_v2.html:50
+#: proposals/templates/proposals/pdf/observation_v2.html:57
+#: proposals/templates/proposals/pdf/observation_v2.html:67
+#: proposals/templates/proposals/proposal_diff.html:95
+#: proposals/templates/proposals/proposal_diff.html:96
+#: proposals/templates/proposals/proposal_diff.html:121
+#: proposals/templates/proposals/proposal_diff.html:122
+#: proposals/templates/proposals/proposal_diff.html:216
+#: proposals/templates/proposals/proposal_diff.html:217
+#: proposals/templates/proposals/proposal_diff.html:221
+#: proposals/templates/proposals/proposal_diff.html:222
+#: proposals/templates/proposals/proposal_diff.html:249
+#: proposals/templates/proposals/proposal_diff.html:250
+#: proposals/templates/proposals/proposal_diff.html:273
+#: proposals/templates/proposals/proposal_diff.html:274
+#: proposals/templates/proposals/proposal_pdf.html:109
+#: proposals/templates/proposals/proposal_pdf.html:125
+#: proposals/templates/proposals/proposal_pdf.html:182
+#: proposals/templates/proposals/proposal_pdf.html:185
+#: proposals/templates/proposals/proposal_pdf.html:204
+#: proposals/templates/proposals/proposal_pdf.html:223
+#: proposals/templates/proposals/proposal_pdf.html:232
+#: proposals/templates/proposals/proposal_pdf.html:274
+#: proposals/templates/proposals/proposal_pdf.html:329
+#: proposals/templates/proposals/proposal_pdf.html:333
+#: proposals/templates/proposals/proposal_pdf.html:369
+#: proposals/templates/proposals/proposal_pdf.html:435
+#: proposals/templates/proposals/proposal_pdf.html:452
+#: proposals/templates/proposals/proposal_pdf.html:516
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
+#: proposals/templates/proposals/diff/observation.html:8
+msgid ""
+"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet "
+"bevat."
+msgstr ""
+"This revision involves observation research, whereas the original "
+"application does not."
+
+#: proposals/templates/proposals/diff/observation.html:12
+msgid ""
+"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat "
+"wel bevat."
+msgstr ""
+"This revision does not involve intervention research, whereas the original "
+"application involve this."
+
+#: proposals/templates/proposals/diff/observation.html:28
+msgid ""
+"De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
+"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
+"versie van het formulier gebruikt."
+msgstr ""
+"This revision and the original application both involve observation "
+"research, but this aspect cannot be compared. The revision uses a newer "
+"version of the form than the original."
+
+#: proposals/templates/proposals/diff/observation_v1.html:139
+#: proposals/templates/proposals/diff/observation_v1.html:140
+#: proposals/templates/proposals/diff/study.html:233
+#: proposals/templates/proposals/diff/study.html:239
+#: proposals/templates/proposals/diff/study.html:247
+#: proposals/templates/proposals/diff/study.html:253
+#: proposals/templates/proposals/pdf/observation_v1.html:53
+#: proposals/templates/proposals/proposal_diff.html:228
+#: proposals/templates/proposals/proposal_diff.html:232
+#: proposals/templates/proposals/proposal_pdf.html:189
+#: proposals/templates/proposals/proposal_pdf.html:444
+#: proposals/templates/proposals/proposal_pdf.html:447
+#: proposals/templates/proposals/proposal_pdf.html:462
+#: proposals/templates/proposals/proposal_pdf.html:467
+#: proposals/templates/proposals/proposal_pdf.html:472
+#: proposals/templates/proposals/proposal_pdf.html:486
+#: proposals/templates/proposals/proposal_pdf.html:491
+#: proposals/templates/proposals/proposal_pdf.html:507
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
+msgid "Download"
+msgstr "Download"
+
+#: proposals/templates/proposals/diff/sessions.html:7
+#: proposals/templates/proposals/proposal_pdf.html:308
+#: proposals/templates/proposals/proposal_pdf_empty.html:279
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
+#: proposals/templates/proposals/diff/sessions.html:11
+msgid ""
+"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
+"bevat."
+msgstr ""
+"This revision involves tasks research, whereas the original application does "
+"not."
+
+#: proposals/templates/proposals/diff/sessions.html:15
+msgid ""
+"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel "
+"bevat."
+msgstr ""
+"This revision does not involve tasks research, whereas the original "
+"application does involve this."
+
+#: proposals/templates/proposals/diff/sessions.html:170
+#: proposals/templates/proposals/proposal_pdf.html:381
+#: proposals/templates/proposals/proposal_pdf_empty.html:335
+#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
+#: proposals/templates/proposals/diff/study.html:9
+#: proposals/templates/proposals/proposal_pdf.html:215
+#: proposals/templates/proposals/proposal_pdf_empty.html:145
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/templates/proposals/diff/study.html:14
+msgid "Dit traject is nieuw in de revisie."
+msgstr "This trajectory was added in this revision."
+
+#: proposals/templates/proposals/diff/study.html:18
+msgid "Dit traject is weggehaald uit de revisie"
+msgstr "This trajectory was removed in this revision."
+
+#: proposals/templates/proposals/diff/study.html:144
+#: proposals/templates/proposals/proposal_pdf.html:391
+#: proposals/templates/proposals/proposal_pdf_empty.html:343
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/templates/proposals/diff/study.html:206
+#: proposals/templates/proposals/proposal_pdf_empty.html:372
+msgid "Informed consent formulieren voor het onderzoek"
+msgstr "Informed consent forms for the study"
+
 #: proposals/templates/proposals/proposal_confirm_delete.html:6
 #: proposals/templates/proposals/proposal_confirm_delete.html:12
 msgid "Aanvraag verwijderen"
@@ -2209,7 +2558,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/utils/pdf_diff_logic.py:1019
+#: proposals/templates/proposals/proposal_pdf.html:499
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2339,14 +2688,11 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
+#: proposals/templates/proposals/proposal_diff.html:37
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:38
-msgid "Overzicht van wijzigingen bij aanmelding "
-msgstr "Summary of changes of application "
-
-#: proposals/templates/proposals/proposal_diff.html:42
+#: proposals/templates/proposals/proposal_diff.html:39
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2354,28 +2700,72 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
+#: proposals/templates/proposals/proposal_diff.html:49
 #: proposals/templates/proposals/proposal_form.html:7
-#: proposals/templates/proposals/proposal_form.html:92
+#: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
-#: proposals/templates/proposals/proposal_form_pre_approved.html:75
+#: proposals/templates/proposals/proposal_form_pre_approved.html:81
+#: proposals/templates/proposals/proposal_pdf.html:82
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/pdf_diff_logic.py:441 proposals/utils/proposal_utils.py:40
-#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
+#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55
+#: proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_form.html:72
-#: proposals/templates/proposals/proposal_form_pre_approved.html:66
+#: proposals/templates/proposals/proposal_diff.html:133
+#: proposals/templates/proposals/proposal_diff.html:134
+#: proposals/templates/proposals/proposal_pdf.html:133
+#: proposals/templates/proposals/proposal_pdf.html:520
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
+msgid "onbekend"
+msgstr "unknown"
+
+#: proposals/templates/proposals/proposal_diff.html:174
+#: proposals/templates/proposals/proposal_pdf.html:159
+#: proposals/templates/proposals/proposal_pdf_empty.html:104
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
+#: proposals/templates/proposals/proposal_diff.html:207
+#: proposals/templates/proposals/proposal_pdf.html:179
+#: proposals/templates/proposals/proposal_pdf_empty.html:120
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
+#: proposals/templates/proposals/proposal_diff.html:240
+#: proposals/templates/proposals/proposal_pdf.html:201
+#: proposals/templates/proposals/proposal_pdf_empty.html:134
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
+#: proposals/templates/proposals/proposal_diff.html:264
+#: proposals/templates/proposals/proposal_submit.html:179
+msgid "Concept-aanmelding versturen"
+msgstr "Submit draft application"
+
+#: proposals/templates/proposals/proposal_form.html:56
+#: proposals/templates/proposals/proposal_form_pre_approved.html:72
 #: proposals/templates/proposals/proposal_submit.html:33
 msgid "Aantal woorden:"
 msgstr "Number of words:"
 
-#: proposals/templates/proposals/proposal_form.html:89
+#: proposals/templates/proposals/proposal_form.html:73
 #: proposals/templates/proposals/proposal_submit.html:168
 msgid ""
 "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling "
@@ -2384,7 +2774,7 @@ msgstr ""
 "You are currently editing a practice application. These can not be submitted "
 "to the FETC-H for review."
 
-#: proposals/templates/proposals/proposal_form.html:94
+#: proposals/templates/proposals/proposal_form.html:78
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2394,7 +2784,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form.html:121
+#: proposals/templates/proposals/proposal_form.html:105
 msgid ""
 "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag "
 "ligt, kan de FETC geen officiële goedkeuring meer geven."
@@ -2402,7 +2792,7 @@ msgstr ""
 "If the intended start date lies within two weeks of submission, the FETC-H "
 "will not be able to provide official approval for this proposal."
 
-#: proposals/templates/proposals/proposal_form_pre_approved.html:77
+#: proposals/templates/proposals/proposal_form_pre_approved.html:83
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder je "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2412,7 +2802,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form_pre_approved.html:91
+#: proposals/templates/proposals/proposal_form_pre_approved.html:97
 #, python-format
 msgid ""
 "Dit formulier is bedoeld voor aanvragen die al goedgekeurd zijn door een "
@@ -2502,7 +2892,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:73
+#: proposals/templates/proposals/proposal_pdf.html:44
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
@@ -2511,31 +2901,47 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:79
+#: proposals/templates/proposals/proposal_pdf.html:50
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:95
+#: proposals/templates/proposals/proposal_pdf.html:66
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:99
+#: proposals/templates/proposals/proposal_pdf.html:70
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:102
+#: proposals/templates/proposals/proposal_pdf.html:73
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:104
+#: proposals/templates/proposals/proposal_pdf.html:76
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
 
+#: proposals/templates/proposals/proposal_pdf.html:194
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/templates/proposals/proposal_pdf.html:481
+#: proposals/templates/proposals/study_consent.html:138
+msgid "Extra formulieren"
+msgstr "Additional forms"
+
+#: proposals/templates/proposals/proposal_pdf.html:513
+#: proposals/templates/proposals/proposal_pdf_empty.html:389
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
+#: proposals/templates/proposals/proposal_submit.html:181
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_pdf_empty.html:42
 msgid ""
 "\n"
@@ -2558,49 +2964,6 @@ msgstr ""
 "            Reference number <em>reference number</em>\n"
 "            "
 
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-#: proposals/utils/pdf_diff_logic.py:493
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-#: proposals/utils/pdf_diff_logic.py:518
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/pdf_diff_logic.py:526
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: proposals/utils/pdf_diff_logic.py:544
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: proposals/utils/pdf_diff_logic.py:748
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
 #: proposals/templates/proposals/proposal_pdf_empty.html:286
 #: proposals/templates/proposals/proposal_start.html:62
 #: proposals/templates/proposals/proposal_start_practice.html:63
@@ -2615,30 +2978,6 @@ msgstr "Session"
 msgid "Taak"
 msgstr "Task"
 
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: proposals/utils/pdf_diff_logic.py:330 tasks/templates/tasks/task_end.html:7
-#: tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: proposals/utils/pdf_diff_logic.py:836
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-#: proposals/utils/pdf_diff_logic.py:1027
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
 #, python-format
 msgid ""
@@ -2664,25 +3003,6 @@ msgstr ""
 "            Reference number %(reference_number)s\n"
 "            "
 
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-#: proposals/utils/pdf_diff_logic.py:303
-msgid "Download"
-msgstr "Download"
-
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
 #, python-format
 msgid ""
@@ -2788,7 +3108,6 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
-#: proposals/utils/pdf_diff_logic.py:350
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3094,10 +3413,6 @@ msgstr ""
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
-#: proposals/templates/proposals/proposal_submit.html:179
-msgid "Concept-aanmelding versturen"
-msgstr "Submit draft application"
-
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3216,10 +3531,6 @@ msgstr ""
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
-#: proposals/templates/proposals/study_consent.html:138
-msgid "Extra formulieren"
-msgstr "Additional forms"
-
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3241,14 +3552,6 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
-#: proposals/templates/proposals/table_with_header_diff.html:13
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/table_with_header_diff.html:14
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
 #: proposals/templates/proposals/translated_consent_forms.html:25
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
@@ -3352,50 +3655,6 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
-#: proposals/utils/pdf_diff_logic.py:88
-msgid ""
-"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
-"aanvraag."
-msgstr ""
-"This section was added in the revision, and did not feature in the original "
-"application."
-
-#: proposals/utils/pdf_diff_logic.py:95
-msgid ""
-"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
-msgstr ""
-"This section was present in the original application, but was removed for "
-"the revision."
-
-#: proposals/utils/pdf_diff_logic.py:260 reviews/models.py:122
-msgid "Onbekend"
-msgstr "Unknown"
-
-#: proposals/utils/pdf_diff_logic.py:306
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/utils/pdf_diff_logic.py:343 proposals/utils/pdf_diff_logic.py:370
-#: proposals/utils/pdf_diff_logic.py:379 proposals/utils/pdf_diff_logic.py:403
-msgid "Traject "
-msgstr "Trajectory "
-
-#: proposals/utils/pdf_diff_logic.py:373 proposals/utils/pdf_diff_logic.py:406
-msgid "sessie "
-msgstr "session "
-
-#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:414
-msgid "Sessie "
-msgstr "Session "
-
-#: proposals/utils/pdf_diff_logic.py:408 proposals/utils/pdf_diff_logic.py:416
-msgid ", taak "
-msgstr ", task "
-
-#: proposals/utils/pdf_diff_logic.py:995
-msgid "Extra formulieren "
-msgstr "Additional forms "
-
 #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
 #: proposals/utils/validate_proposal.py:76
 msgid "Ethische toetsing nodig door een METC?"
@@ -3429,11 +3688,11 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:412
+#: proposals/utils/proposal_utils.py:416
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:414
+#: proposals/utils/proposal_utils.py:418
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
@@ -3523,15 +3782,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:242
+#: proposals/views/proposal_views.py:246
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:380
+#: proposals/views/proposal_views.py:384
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:481
+#: proposals/views/proposal_views.py:485
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3580,43 +3839,51 @@ msgstr "Route"
 msgid "Start datum"
 msgstr "Start date review"
 
-#: reviews/forms.py:12 reviews/models.py:138
+#: reviews/forms.py:14 reviews/models.py:142
 msgid "korte (2-weken) route"
 msgstr "short (2-week) route"
 
-#: reviews/forms.py:13 reviews/models.py:137
+#: reviews/forms.py:15 reviews/models.py:141
 msgid "lange (4-weken) route"
 msgstr "long (4-week) route"
 
-#: reviews/forms.py:14
+#: reviews/forms.py:16
 msgid "direct naar revisie"
 msgstr "straight to revision"
 
-#: reviews/forms.py:62
+#: reviews/forms.py:64
 msgid "Selecteer de commissieleden"
 msgstr "Select committee members"
 
-#: reviews/forms.py:71
+#: reviews/forms.py:73
 msgid "Er moet tenminste één beoordelaar geselecteerd worden."
 msgstr "You must select at least one reviewer."
 
-#: reviews/forms.py:105
+#: reviews/forms.py:107
 msgid "Voeg deze aanvraag toe aan het archief"
 msgstr "Add this application to the archive"
 
-#: reviews/forms.py:111
+#: reviews/forms.py:113
 msgid "Opmerkingen over revisie"
 msgstr "Comments about this revision"
 
-#: reviews/forms.py:118
+#: reviews/forms.py:120
 msgid "Bevestig beëindiging"
 msgstr "Confirm termination of this review"
 
-#: reviews/menus.py:37 reviews/views.py:197
+#: reviews/forms.py:153
+msgid "Start datum periode:"
+msgstr "Start date period:"
+
+#: reviews/forms.py:154
+msgid "Eind datum periode:"
+msgstr "End date period:"
+
+#: reviews/menus.py:37 reviews/views.py:241
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:42 reviews/views.py:211
+#: reviews/menus.py:42 reviews/views.py:253
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
@@ -3676,24 +3943,28 @@ msgstr "Post hoc negative advice by FETC-H"
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:174
+#: reviews/models.py:51 reviews/models.py:178
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:139
+#: reviews/models.py:126
+msgid "Onbekend"
+msgstr "Unknown"
+
+#: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:168
+#: reviews/models.py:172
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:169
+#: reviews/models.py:173
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:170
+#: reviews/models.py:174
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
 
@@ -3884,14 +4155,14 @@ msgid "Lopende reviews"
 msgstr "Ongoing reviews"
 
 #: reviews/templates/reviews/committee_members_workload.html:23
-#: reviews/templates/reviews/committee_members_workload.html:67
+#: reviews/templates/reviews/committee_members_workload.html:78
 #: reviews/templates/reviews/review_table.html:8
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:68
 msgid "Reviewer"
 msgstr "Reviewer"
 
 #: reviews/templates/reviews/committee_members_workload.html:38
-#: reviews/templates/reviews/committee_members_workload.html:69
+#: reviews/templates/reviews/committee_members_workload.html:80
 msgid "Korte route"
 msgstr "Short route"
 
@@ -3900,14 +4171,23 @@ msgid "Lange route"
 msgstr "Long route"
 
 #: reviews/templates/reviews/committee_members_workload.html:63
-msgid "Werkverdeling overzicht van afgelopen jaar"
-msgstr "Workload overview of past year"
+msgid "Werkverdeling overzicht van afgelopen periode"
+msgstr "Workload overview of past period"
 
-#: reviews/templates/reviews/committee_members_workload.html:68
+#: reviews/templates/reviews/committee_members_workload.html:65
+msgid ""
+"Vul hieronder een start- en einddatum in voor de periode van dit overzicht."
+msgstr "Select a start- and enddate for the period of the overview below."
+
+#: reviews/templates/reviews/committee_members_workload.html:72
+msgid "Periode toepassen"
+msgstr "Apply period"
+
+#: reviews/templates/reviews/committee_members_workload.html:79
 msgid "Totaal"
 msgstr "Total"
 
-#: reviews/templates/reviews/committee_members_workload.html:70
+#: reviews/templates/reviews/committee_members_workload.html:81
 msgid "Lange Route"
 msgstr "Long route"
 
@@ -4372,61 +4652,61 @@ msgstr "Change date of confirmation letter"
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_utils.py:53
+#: reviews/utils/review_utils.py:54
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:64
+#: reviews/utils/review_utils.py:74
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:113
+#: reviews/utils/review_utils.py:124
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:193
+#: reviews/utils/review_utils.py:218
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:207
+#: reviews/utils/review_utils.py:232
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:256
+#: reviews/utils/review_utils.py:281
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:271
+#: reviews/utils/review_utils.py:296
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:287
+#: reviews/utils/review_utils.py:312
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:313
+#: reviews/utils/review_utils.py:338
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:316
+#: reviews/utils/review_utils.py:341
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:319
+#: reviews/utils/review_utils.py:344
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:322
+#: reviews/utils/review_utils.py:347
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:325
+#: reviews/utils/review_utils.py:350
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4434,7 +4714,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:331
+#: reviews/utils/review_utils.py:356
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4444,7 +4724,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:335
+#: reviews/utils/review_utils.py:360
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4454,7 +4734,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:342
+#: reviews/utils/review_utils.py:367
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4465,14 +4745,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:359
+#: reviews/utils/review_utils.py:384
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:363
+#: reviews/utils/review_utils.py:388
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4480,7 +4760,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:365
+#: reviews/utils/review_utils.py:390
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4490,26 +4770,26 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:370
+#: reviews/utils/review_utils.py:395
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:391
+#: reviews/utils/review_utils.py:416
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""
 "The application contains psychophysiological measurements on children under "
 "{} year(s) old."
 
-#: reviews/views.py:47
+#: reviews/views.py:60
 msgid "Mijn besluiten"
 msgstr "My results"
 
-#: reviews/views.py:76
+#: reviews/views.py:82
 msgid "Openstaande besluiten commissieleden"
 msgstr "Pending decisions committee members"
 
-#: reviews/views.py:151
+#: reviews/views.py:200
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
@@ -5673,73 +5953,76 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
-#~ msgid "Ja"
-#~ msgstr "Yes"
-
-#~ msgid "Nee"
-#~ msgstr "No"
-
-#~ msgid ""
-#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-#~ "niet bevat."
-#~ msgstr ""
-#~ "This revision involves intervention research, whereas the original "
-#~ "application does not."
-
-#~ msgid ""
-#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-#~ "dat wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve intervention research, whereas the "
-#~ "original application does include this."
-
-#~ msgid ""
-#~ "De revisie en de originele aanvraag hebben beide een "
-#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
-#~ "doordat de revisie een andere versie van het formulier gebruikt."
-#~ msgstr ""
-#~ "This revision and the original application both involve intervention "
-#~ "research, but this aspect cannot be compared. The revision uses a newer "
-#~ "version of the form than the original."
-
-#~ msgid "ja,nee,"
-#~ msgstr "yes,no,"
-
-#~ msgid ""
-#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
-#~ "niet bevat."
-#~ msgstr ""
-#~ "This revision involves observation research, whereas the original "
-#~ "application does not."
-
-#~ msgid ""
-#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
-#~ "dat wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve intervention research, whereas the "
-#~ "original application involve this."
-
-#~ msgid ""
-#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
-#~ "andere versie van het formulier gebruikt."
-#~ msgstr ""
-#~ "This revision and the original application both involve observation "
-#~ "research, but this aspect cannot be compared. The revision uses a newer "
-#~ "version of the form than the original."
-
-#~ msgid ""
-#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
-#~ "wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve tasks research, whereas the original "
-#~ "application does involve this."
-
-#~ msgid "Dit traject is nieuw in de revisie."
-#~ msgstr "This trajectory was added in this revision."
-
-#~ msgid "Dit traject is weggehaald uit de revisie"
-#~ msgstr "This trajectory was removed in this revision."
-
-#~ msgid "eindverantwoordelijke"
-#~ msgstr "Researcher with final responsibility"
+#: main/templates/registration/logged_out.html:17
+#, python-format
+msgid ""
+"Klik  <a href=\"%(login_url)s\">hier</a> om opnieuw in te loggen met je "
+"Solis-ID."
+msgstr ""
+"Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-ID."
+
+#: proposals/models.py:518
+msgid ""
+"Aan het einde van de procedure kan je deze aanvraag ter\n"
+"        verificatie naar je eindverantwoordelijke sturen. De\n"
+"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
+"en\n"
+"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
+"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
+"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
+"wel\n"
+"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
+"je de\n"
+"        aanvraag indient."
+msgstr ""
+"At the end of the procedure, you can send this application to the researcher "
+"with final responsibility for verification. The researcher with final "
+"responsibility can then make adjustments and submit the study to the FEtC-H. "
+"<strong>Note</strong>: if you cannot find your supervisor using this field, "
+"they may have to log into this portal at least once with their Solis-ID. You "
+"can continue filling in the application while you wait for them to do this, "
+"but remember to come back and fill in this field before submitting."
+
+#: proposals/templates/proposals/proposal_diff.html:38
+msgid "Overzicht van wijzigingen bij aanmelding "
+msgstr "Summary of changes of application "
+
+#: proposals/utils/pdf_diff_logic.py:88
+msgid ""
+"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
+"aanvraag."
+msgstr ""
+"This section was added in the revision, and did not feature in the original "
+"application."
+
+#: proposals/utils/pdf_diff_logic.py:95
+msgid ""
+"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+msgstr ""
+"This section was present in the original application, but was removed for "
+"the revision."
+
+#: proposals/utils/pdf_diff_logic.py:343 proposals/utils/pdf_diff_logic.py:370
+#: proposals/utils/pdf_diff_logic.py:379 proposals/utils/pdf_diff_logic.py:403
+msgid "Traject "
+msgstr "Trajectory "
+
+#: proposals/utils/pdf_diff_logic.py:373 proposals/utils/pdf_diff_logic.py:406
+msgid "sessie "
+msgstr "session "
+
+#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:414
+msgid "Sessie "
+msgstr "Session "
+
+#: proposals/utils/pdf_diff_logic.py:408 proposals/utils/pdf_diff_logic.py:416
+msgid ", taak "
+msgstr ", task "
+
+#: proposals/utils/pdf_diff_logic.py:995
+msgid "Extra formulieren "
+msgstr "Additional forms "
+
+#: reviews/templates/reviews/committee_members_workload.html:63
+msgid "Werkverdeling overzicht van afgelopen jaar"
+msgstr "Workload overview of past year"

From a67aa15fc0a61911cb0d7079a5227fcce6013d96 Mon Sep 17 00:00:00 2001
From: Michael Villeneuve <m.l.villeneuve@uu.nl>
Date: Tue, 7 Nov 2023 10:30:29 +0100
Subject: [PATCH 059/148] fix: Remove star import for pdf_diff_logic

---
 proposals/views/proposal_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index a87177a9e..2c767133b 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -20,7 +20,7 @@
     HumanitiesRequiredMixin, UpdateView, UserAllowedMixin
 from observations.models import Observation
 from proposals.utils.validate_proposal import get_form_errors
-from proposals.utils.pdf_diff_logic import *
+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
 from studies.models import Documents

From c72a839b0919535d066989b42c212ef97c27f497 Mon Sep 17 00:00:00 2001
From: Michael Villeneuve <m.l.villeneuve@uu.nl>
Date: Tue, 7 Nov 2023 10:36:41 +0100
Subject: [PATCH 060/148] cleanup: Remove cumulative msgcat and poedit
 regurgitations

---
 locale/en/LC_MESSAGES/django.po | 808 ++++++++++++--------------------
 1 file changed, 293 insertions(+), 515 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 5654643f8..2784d4124 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -2,62 +2,19 @@
 # Copyright (C) 2016
 # This file is distributed under the same license as the fetc-h package.
 # Martijn van der Klis <M.H.vanderKlis@uu.nl>, 2016.
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-03 15:43+0100\n"
-"PO-Revision-Date: 2020-10-07 11:22+0200\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
+"PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.pr  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.pr  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.acc  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.acc  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.pr  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.acc  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
@@ -81,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
 #: faqs/menus.py:17 main/templates/base/menu.html:134
 #: main/templates/main/index.html:209
-#: proposals/templates/proposals/proposal_pdf.html:430
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
+#: proposals/utils/pdf_diff_logic.py:859
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -152,7 +109,7 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:294
+#: proposals/templates/proposals/proposal_diff.html:58
 #: proposals/templates/proposals/proposal_update_attachments.html:26
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
@@ -282,9 +239,8 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
-#: proposals/templates/proposals/diff/intervention.html:4
-#: proposals/templates/proposals/proposal_pdf.html:285
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
+#: proposals/utils/pdf_diff_logic.py:586
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -345,11 +301,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:15
+#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:15
+#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "nee"
 msgstr "no"
 
@@ -402,7 +358,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:79
+#: proposals/templates/proposals/proposal_pdf.html:119
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
 msgid "E-mail"
 msgstr "E-mail"
@@ -581,27 +537,27 @@ msgid "Maak een amendement van een al goedgekeurde aanvraag"
 msgstr "Create an amendment to an already approved application"
 
 #: main/templates/base/menu.html:32 proposals/menus.py:56
-#: proposals/views/proposal_views.py:76
+#: proposals/views/proposal_views.py:77
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
 #: main/templates/base/menu.html:35 proposals/menus.py:60
-#: proposals/views/proposal_views.py:126
+#: proposals/views/proposal_views.py:127
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
 #: main/templates/base/menu.html:38 proposals/menus.py:64
-#: proposals/views/proposal_views.py:88
+#: proposals/views/proposal_views.py:89
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
 #: main/templates/base/menu.html:41 proposals/menus.py:68
-#: proposals/views/proposal_views.py:100
+#: proposals/views/proposal_views.py:101
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
 #: main/templates/base/menu.html:44 proposals/menus.py:72
-#: proposals/views/proposal_views.py:112
+#: proposals/views/proposal_views.py:113
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
@@ -610,7 +566,7 @@ msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
 #: main/templates/base/menu.html:52 proposals/menus.py:110
-#: proposals/views/proposal_views.py:153
+#: proposals/views/proposal_views.py:154
 msgid "Archief"
 msgstr "Archive"
 
@@ -1282,9 +1238,8 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
-#: proposals/templates/proposals/diff/observation.html:4
-#: proposals/templates/proposals/proposal_pdf.html:297
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
+#: proposals/utils/pdf_diff_logic.py:642
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1833,7 +1788,8 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 reviews/models.py:184
+#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980
+#: reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -2101,298 +2057,6 @@ msgstr "Old"
 msgid "Nieuw"
 msgstr "New"
 
-#: proposals/templates/proposals/diff/intervention.html:8
-msgid ""
-"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-"niet bevat."
-msgstr ""
-"This revision involves intervention research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/intervention.html:12
-msgid ""
-"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-"dat wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application does include this."
-
-#: proposals/templates/proposals/diff/intervention.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een interventieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve intervention "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/intervention_v1.html:8
-#: proposals/templates/proposals/diff/intervention_v2.html:8
-#: proposals/templates/proposals/diff/observation_v1.html:9
-#: proposals/templates/proposals/diff/observation_v2.html:9
-#: proposals/templates/proposals/diff/sessions.html:23
-#: proposals/templates/proposals/diff/sessions.html:42
-#: proposals/templates/proposals/diff/sessions.html:103
-#: proposals/templates/proposals/diff/sessions.html:174
-#: proposals/templates/proposals/diff/study.html:25
-#: proposals/templates/proposals/diff/study.html:151
-#: proposals/templates/proposals/diff/study.html:215
-#: proposals/templates/proposals/proposal_diff.html:53
-#: proposals/templates/proposals/proposal_diff.html:178
-#: proposals/templates/proposals/proposal_diff.html:211
-#: proposals/templates/proposals/proposal_diff.html:244
-#: proposals/templates/proposals/proposal_diff.html:268
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:9
-#: proposals/templates/proposals/diff/intervention_v2.html:9
-#: proposals/templates/proposals/diff/observation_v1.html:10
-#: proposals/templates/proposals/diff/observation_v2.html:10
-#: proposals/templates/proposals/diff/sessions.html:24
-#: proposals/templates/proposals/diff/sessions.html:43
-#: proposals/templates/proposals/diff/sessions.html:104
-#: proposals/templates/proposals/diff/sessions.html:175
-#: proposals/templates/proposals/diff/study.html:26
-#: proposals/templates/proposals/diff/study.html:152
-#: proposals/templates/proposals/diff/study.html:216
-#: proposals/templates/proposals/proposal_diff.html:54
-#: proposals/templates/proposals/proposal_diff.html:179
-#: proposals/templates/proposals/proposal_diff.html:212
-#: proposals/templates/proposals/proposal_diff.html:245
-#: proposals/templates/proposals/proposal_diff.html:269
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:28
-#: proposals/templates/proposals/diff/intervention_v1.html:33
-#: proposals/templates/proposals/diff/intervention_v1.html:42
-#: proposals/templates/proposals/diff/intervention_v1.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:28
-#: proposals/templates/proposals/diff/intervention_v2.html:33
-#: proposals/templates/proposals/diff/intervention_v2.html:42
-#: proposals/templates/proposals/diff/intervention_v2.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:62
-#: proposals/templates/proposals/diff/intervention_v2.html:67
-#: proposals/templates/proposals/diff/observation_v1.html:43
-#: proposals/templates/proposals/diff/observation_v1.html:48
-#: proposals/templates/proposals/diff/observation_v2.html:43
-#: proposals/templates/proposals/diff/observation_v2.html:48
-#: proposals/templates/proposals/diff/sessions.html:62
-#: proposals/templates/proposals/diff/sessions.html:67
-#: proposals/templates/proposals/diff/sessions.html:76
-#: proposals/templates/proposals/diff/sessions.html:81
-msgid "ja,nee,"
-msgstr "yes,no,"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:87
-#: proposals/templates/proposals/diff/intervention_v1.html:92
-#: proposals/templates/proposals/diff/intervention_v2.html:102
-#: proposals/templates/proposals/diff/intervention_v2.html:107
-#: proposals/templates/proposals/diff/observation_v1.html:29
-#: proposals/templates/proposals/diff/observation_v1.html:34
-#: proposals/templates/proposals/diff/observation_v1.html:68
-#: proposals/templates/proposals/diff/observation_v1.html:73
-#: proposals/templates/proposals/diff/observation_v1.html:81
-#: proposals/templates/proposals/diff/observation_v1.html:86
-#: proposals/templates/proposals/diff/observation_v1.html:94
-#: proposals/templates/proposals/diff/observation_v1.html:99
-#: proposals/templates/proposals/diff/observation_v1.html:108
-#: proposals/templates/proposals/diff/observation_v1.html:113
-#: proposals/templates/proposals/diff/observation_v1.html:122
-#: proposals/templates/proposals/diff/observation_v1.html:127
-#: proposals/templates/proposals/diff/observation_v2.html:29
-#: proposals/templates/proposals/diff/observation_v2.html:34
-#: proposals/templates/proposals/diff/observation_v2.html:73
-#: proposals/templates/proposals/diff/observation_v2.html:78
-#: proposals/templates/proposals/diff/observation_v2.html:93
-#: proposals/templates/proposals/diff/observation_v2.html:98
-#: proposals/templates/proposals/diff/observation_v2.html:113
-#: proposals/templates/proposals/diff/observation_v2.html:118
-#: proposals/templates/proposals/diff/observation_v2.html:132
-#: proposals/templates/proposals/diff/observation_v2.html:137
-#: proposals/templates/proposals/diff/observation_v2.html:146
-#: proposals/templates/proposals/diff/observation_v2.html:151
-#: proposals/templates/proposals/diff/sessions.html:151
-#: proposals/templates/proposals/diff/sessions.html:156
-#: proposals/templates/proposals/diff/study.html:43
-#: proposals/templates/proposals/diff/study.html:48
-#: proposals/templates/proposals/diff/study.html:63
-#: proposals/templates/proposals/diff/study.html:64
-#: proposals/templates/proposals/diff/study.html:220
-#: proposals/templates/proposals/diff/study.html:221
-#: proposals/templates/proposals/diff/study.html:262
-#: proposals/templates/proposals/diff/study.html:267
-#: proposals/templates/proposals/pdf/intervention_v1.html:16
-#: proposals/templates/proposals/pdf/intervention_v1.html:20
-#: proposals/templates/proposals/pdf/intervention_v1.html:43
-#: proposals/templates/proposals/pdf/intervention_v2.html:16
-#: proposals/templates/proposals/pdf/intervention_v2.html:20
-#: proposals/templates/proposals/pdf/intervention_v2.html:28
-#: proposals/templates/proposals/pdf/intervention_v2.html:48
-#: proposals/templates/proposals/pdf/intervention_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v1.html:16
-#: proposals/templates/proposals/pdf/observation_v1.html:20
-#: proposals/templates/proposals/pdf/observation_v1.html:31
-#: proposals/templates/proposals/pdf/observation_v1.html:34
-#: proposals/templates/proposals/pdf/observation_v1.html:37
-#: proposals/templates/proposals/pdf/observation_v1.html:41
-#: proposals/templates/proposals/pdf/observation_v1.html:45
-#: proposals/templates/proposals/pdf/observation_v2.html:16
-#: proposals/templates/proposals/pdf/observation_v2.html:20
-#: proposals/templates/proposals/pdf/observation_v2.html:34
-#: proposals/templates/proposals/pdf/observation_v2.html:42
-#: proposals/templates/proposals/pdf/observation_v2.html:50
-#: proposals/templates/proposals/pdf/observation_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v2.html:67
-#: proposals/templates/proposals/proposal_diff.html:95
-#: proposals/templates/proposals/proposal_diff.html:96
-#: proposals/templates/proposals/proposal_diff.html:121
-#: proposals/templates/proposals/proposal_diff.html:122
-#: proposals/templates/proposals/proposal_diff.html:216
-#: proposals/templates/proposals/proposal_diff.html:217
-#: proposals/templates/proposals/proposal_diff.html:221
-#: proposals/templates/proposals/proposal_diff.html:222
-#: proposals/templates/proposals/proposal_diff.html:249
-#: proposals/templates/proposals/proposal_diff.html:250
-#: proposals/templates/proposals/proposal_diff.html:273
-#: proposals/templates/proposals/proposal_diff.html:274
-#: proposals/templates/proposals/proposal_pdf.html:109
-#: proposals/templates/proposals/proposal_pdf.html:125
-#: proposals/templates/proposals/proposal_pdf.html:182
-#: proposals/templates/proposals/proposal_pdf.html:185
-#: proposals/templates/proposals/proposal_pdf.html:204
-#: proposals/templates/proposals/proposal_pdf.html:223
-#: proposals/templates/proposals/proposal_pdf.html:232
-#: proposals/templates/proposals/proposal_pdf.html:274
-#: proposals/templates/proposals/proposal_pdf.html:329
-#: proposals/templates/proposals/proposal_pdf.html:333
-#: proposals/templates/proposals/proposal_pdf.html:369
-#: proposals/templates/proposals/proposal_pdf.html:435
-#: proposals/templates/proposals/proposal_pdf.html:452
-#: proposals/templates/proposals/proposal_pdf.html:516
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/diff/observation.html:8
-msgid ""
-"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves observation research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/observation.html:12
-msgid ""
-"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat "
-"wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application involve this."
-
-#: proposals/templates/proposals/diff/observation.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve observation "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/observation_v1.html:139
-#: proposals/templates/proposals/diff/observation_v1.html:140
-#: proposals/templates/proposals/diff/study.html:233
-#: proposals/templates/proposals/diff/study.html:239
-#: proposals/templates/proposals/diff/study.html:247
-#: proposals/templates/proposals/diff/study.html:253
-#: proposals/templates/proposals/pdf/observation_v1.html:53
-#: proposals/templates/proposals/proposal_diff.html:228
-#: proposals/templates/proposals/proposal_diff.html:232
-#: proposals/templates/proposals/proposal_pdf.html:189
-#: proposals/templates/proposals/proposal_pdf.html:444
-#: proposals/templates/proposals/proposal_pdf.html:447
-#: proposals/templates/proposals/proposal_pdf.html:462
-#: proposals/templates/proposals/proposal_pdf.html:467
-#: proposals/templates/proposals/proposal_pdf.html:472
-#: proposals/templates/proposals/proposal_pdf.html:486
-#: proposals/templates/proposals/proposal_pdf.html:491
-#: proposals/templates/proposals/proposal_pdf.html:507
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-msgid "Download"
-msgstr "Download"
-
-#: proposals/templates/proposals/diff/sessions.html:7
-#: proposals/templates/proposals/proposal_pdf.html:308
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
-#: proposals/templates/proposals/diff/sessions.html:11
-msgid ""
-"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves tasks research, whereas the original application does "
-"not."
-
-#: proposals/templates/proposals/diff/sessions.html:15
-msgid ""
-"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel "
-"bevat."
-msgstr ""
-"This revision does not involve tasks research, whereas the original "
-"application does involve this."
-
-#: proposals/templates/proposals/diff/sessions.html:170
-#: proposals/templates/proposals/proposal_pdf.html:381
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/diff/study.html:9
-#: proposals/templates/proposals/proposal_pdf.html:215
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/diff/study.html:14
-msgid "Dit traject is nieuw in de revisie."
-msgstr "This trajectory was added in this revision."
-
-#: proposals/templates/proposals/diff/study.html:18
-msgid "Dit traject is weggehaald uit de revisie"
-msgstr "This trajectory was removed in this revision."
-
-#: proposals/templates/proposals/diff/study.html:144
-#: proposals/templates/proposals/proposal_pdf.html:391
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/diff/study.html:206
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
 #: proposals/templates/proposals/proposal_confirm_delete.html:6
 #: proposals/templates/proposals/proposal_confirm_delete.html:12
 msgid "Aanvraag verwijderen"
@@ -2558,7 +2222,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/templates/proposals/proposal_pdf.html:499
+#: proposals/utils/pdf_diff_logic.py:954
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2688,11 +2352,14 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
-#: proposals/templates/proposals/proposal_diff.html:37
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:39
+#: proposals/templates/proposals/proposal_diff.html:38
+msgid "Overzicht van wijzigingen bij aanmelding "
+msgstr "Summary of changes of application "
+
+#: proposals/templates/proposals/proposal_diff.html:42
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2700,65 +2367,21 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
-#: proposals/templates/proposals/proposal_diff.html:49
 #: proposals/templates/proposals/proposal_form.html:7
 #: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
-#: proposals/templates/proposals/proposal_pdf.html:82
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55
-#: proposals/utils/validate_proposal.py:33
+#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40
+#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_diff.html:133
-#: proposals/templates/proposals/proposal_diff.html:134
-#: proposals/templates/proposals/proposal_pdf.html:133
-#: proposals/templates/proposals/proposal_pdf.html:520
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_diff.html:174
-#: proposals/templates/proposals/proposal_pdf.html:159
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_diff.html:207
-#: proposals/templates/proposals/proposal_pdf.html:179
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_diff.html:240
-#: proposals/templates/proposals/proposal_pdf.html:201
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_diff.html:264
-#: proposals/templates/proposals/proposal_submit.html:179
-msgid "Concept-aanmelding versturen"
-msgstr "Submit draft application"
-
 #: proposals/templates/proposals/proposal_form.html:56
 #: proposals/templates/proposals/proposal_form_pre_approved.html:72
 #: proposals/templates/proposals/proposal_submit.html:33
@@ -2892,7 +2515,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:44
+#: proposals/templates/proposals/proposal_pdf.html:87
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
@@ -2901,47 +2524,31 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:50
+#: proposals/templates/proposals/proposal_pdf.html:93
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:66
+#: proposals/templates/proposals/proposal_pdf.html:109
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:70
+#: proposals/templates/proposals/proposal_pdf.html:113
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:73
+#: proposals/templates/proposals/proposal_pdf.html:116
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:76
+#: proposals/templates/proposals/proposal_pdf.html:118
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
 
-#: proposals/templates/proposals/proposal_pdf.html:194
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/templates/proposals/proposal_pdf.html:481
-#: proposals/templates/proposals/study_consent.html:138
-msgid "Extra formulieren"
-msgstr "Additional forms"
-
-#: proposals/templates/proposals/proposal_pdf.html:513
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
 #: proposals/templates/proposals/proposal_pdf_empty.html:42
 msgid ""
 "\n"
@@ -2964,6 +2571,49 @@ msgstr ""
 "            Reference number <em>reference number</em>\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:104
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+#: proposals/utils/pdf_diff_logic.py:478
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:120
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+#: proposals/utils/pdf_diff_logic.py:503
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:134
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/pdf_diff_logic.py:511
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:145
+#: proposals/utils/pdf_diff_logic.py:529
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:279
+#: proposals/utils/pdf_diff_logic.py:733
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
 #: proposals/templates/proposals/proposal_pdf_empty.html:286
 #: proposals/templates/proposals/proposal_start.html:62
 #: proposals/templates/proposals/proposal_start_practice.html:63
@@ -2978,6 +2628,30 @@ msgstr "Session"
 msgid "Taak"
 msgstr "Task"
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:335
+#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
+#: tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:343
+#: proposals/utils/pdf_diff_logic.py:821
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:372
+msgid "Informed consent formulieren voor het onderzoek"
+msgstr "Informed consent forms for the study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:389
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
+#: proposals/templates/proposals/proposal_submit.html:181
+#: proposals/utils/pdf_diff_logic.py:962
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
 #, python-format
 msgid ""
@@ -3003,6 +2677,25 @@ msgstr ""
 "            Reference number %(reference_number)s\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
+msgid "onbekend"
+msgstr "unknown"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
+#: proposals/utils/pdf_diff_logic.py:281
+msgid "Download"
+msgstr "Download"
+
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
 #, python-format
 msgid ""
@@ -3108,6 +2801,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
+#: proposals/utils/pdf_diff_logic.py:328
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3413,6 +3107,10 @@ msgstr ""
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
+#: proposals/templates/proposals/proposal_submit.html:179
+msgid "Concept-aanmelding versturen"
+msgstr "Submit draft application"
+
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3531,6 +3229,10 @@ msgstr ""
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
+#: proposals/templates/proposals/study_consent.html:138
+msgid "Extra formulieren"
+msgstr "Additional forms"
+
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3552,6 +3254,14 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
+#: proposals/templates/proposals/table_with_header_diff.html:13
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/table_with_header_diff.html:14
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
 #: proposals/templates/proposals/translated_consent_forms.html:25
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
@@ -3655,6 +3365,50 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
+#: proposals/utils/pdf_diff_logic.py:93
+msgid ""
+"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
+"aanvraag."
+msgstr ""
+"This section was added in the revision, and did not feature in the original "
+"application."
+
+#: proposals/utils/pdf_diff_logic.py:100
+msgid ""
+"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+msgstr ""
+"This section was present in the original application, but was removed for "
+"the revision."
+
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126
+msgid "Onbekend"
+msgstr "Unknown"
+
+#: proposals/utils/pdf_diff_logic.py:284
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348
+#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381
+msgid "Traject "
+msgstr "Trajectory "
+
+#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384
+msgid "sessie "
+msgstr "session "
+
+#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392
+msgid "Sessie "
+msgstr "Session "
+
+#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394
+msgid ", taak "
+msgstr ", task "
+
+#: proposals/utils/pdf_diff_logic.py:930
+msgid "Extra formulieren "
+msgstr "Additional forms "
+
 #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
 #: proposals/utils/validate_proposal.py:76
 msgid "Ethische toetsing nodig door een METC?"
@@ -3688,11 +3442,11 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:416
+#: proposals/utils/proposal_utils.py:415
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:418
+#: proposals/utils/proposal_utils.py:417
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
@@ -3741,40 +3495,40 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:43
+#: proposals/views/proposal_views.py:44
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:44
+#: proposals/views/proposal_views.py:45
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:63
+#: proposals/views/proposal_views.py:64
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:64
+#: proposals/views/proposal_views.py:65
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:77
+#: proposals/views/proposal_views.py:78
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:89
+#: proposals/views/proposal_views.py:90
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:101
+#: proposals/views/proposal_views.py:102
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:114
+#: proposals/views/proposal_views.py:115
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:127
+#: proposals/views/proposal_views.py:128
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
 "eindverantwoordelijke bij betrokken bent."
@@ -3782,15 +3536,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:246
+#: proposals/views/proposal_views.py:247
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:384
+#: proposals/views/proposal_views.py:385
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:485
+#: proposals/views/proposal_views.py:486
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3948,10 +3702,6 @@ msgstr "Not to be assessed further"
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:126
-msgid "Onbekend"
-msgstr "Unknown"
-
 #: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
@@ -5953,76 +5703,104 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
-#: main/templates/registration/logged_out.html:17
-#, python-format
-msgid ""
-"Klik  <a href=\"%(login_url)s\">hier</a> om opnieuw in te loggen met je "
-"Solis-ID."
-msgstr ""
-"Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-ID."
-
-#: proposals/models.py:518
-msgid ""
-"Aan het einde van de procedure kan je deze aanvraag ter\n"
-"        verificatie naar je eindverantwoordelijke sturen. De\n"
-"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-"en\n"
-"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
-"wel\n"
-"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
-"je de\n"
-"        aanvraag indient."
-msgstr ""
-"At the end of the procedure, you can send this application to the researcher "
-"with final responsibility for verification. The researcher with final "
-"responsibility can then make adjustments and submit the study to the FEtC-H. "
-"<strong>Note</strong>: if you cannot find your supervisor using this field, "
-"they may have to log into this portal at least once with their Solis-ID. You "
-"can continue filling in the application while you wait for them to do this, "
-"but remember to come back and fill in this field before submitting."
-
-#: proposals/templates/proposals/proposal_diff.html:38
-msgid "Overzicht van wijzigingen bij aanmelding "
-msgstr "Summary of changes of application "
-
-#: proposals/utils/pdf_diff_logic.py:88
-msgid ""
-"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
-"aanvraag."
-msgstr ""
-"This section was added in the revision, and did not feature in the original "
-"application."
+#~ msgid ""
+#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves intervention research, whereas the original "
+#~ "application does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application does include this."
+
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een "
+#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
+#~ "doordat de revisie een andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve intervention "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
+
+#~ msgid "ja,nee,"
+#~ msgstr "yes,no,"
+
+#~ msgid ""
+#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves observation research, whereas the original "
+#~ "application does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application involve this."
+
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
+#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
+#~ "andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve observation "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
+
+#~ msgid ""
+#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
+#~ "bevat."
+#~ msgstr ""
+#~ "This revision involves tasks research, whereas the original application "
+#~ "does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
+#~ "wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve tasks research, whereas the original "
+#~ "application does involve this."
+
+#~ msgid "Dit traject is nieuw in de revisie."
+#~ msgstr "This trajectory was added in this revision."
+
+#~ msgid "Dit traject is weggehaald uit de revisie"
+#~ msgstr "This trajectory was removed in this revision."
 
-#: proposals/utils/pdf_diff_logic.py:95
-msgid ""
-"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
-msgstr ""
-"This section was present in the original application, but was removed for "
-"the revision."
-
-#: proposals/utils/pdf_diff_logic.py:343 proposals/utils/pdf_diff_logic.py:370
-#: proposals/utils/pdf_diff_logic.py:379 proposals/utils/pdf_diff_logic.py:403
-msgid "Traject "
-msgstr "Trajectory "
-
-#: proposals/utils/pdf_diff_logic.py:373 proposals/utils/pdf_diff_logic.py:406
-msgid "sessie "
-msgstr "session "
-
-#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:414
-msgid "Sessie "
-msgstr "Session "
-
-#: proposals/utils/pdf_diff_logic.py:408 proposals/utils/pdf_diff_logic.py:416
-msgid ", taak "
-msgstr ", task "
-
-#: proposals/utils/pdf_diff_logic.py:995
-msgid "Extra formulieren "
-msgstr "Additional forms "
-
-#: reviews/templates/reviews/committee_members_workload.html:63
-msgid "Werkverdeling overzicht van afgelopen jaar"
-msgstr "Workload overview of past year"
+#, python-format
+#~ msgid ""
+#~ "Klik  <a href=\"%(login_url)s\">hier</a> om opnieuw in te loggen met je "
+#~ "Solis-ID."
+#~ msgstr ""
+#~ "Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-"
+#~ "ID."
+
+#~ msgid ""
+#~ "Aan het einde van de procedure kan je deze aanvraag ter\n"
+#~ "        verificatie naar je eindverantwoordelijke sturen. De\n"
+#~ "        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
+#~ "en\n"
+#~ "        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
+#~ "        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
+#~ "        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt "
+#~ "nog wel\n"
+#~ "        verder met de aanvraag, maar vergeet dit veld niet in te vullen "
+#~ "voor je de\n"
+#~ "        aanvraag indient."
+#~ msgstr ""
+#~ "At the end of the procedure, you can send this application to the "
+#~ "researcher with final responsibility for verification. The researcher "
+#~ "with final responsibility can then make adjustments and submit the study "
+#~ "to the FEtC-H. <strong>Note</strong>: if you cannot find your supervisor "
+#~ "using this field, they may have to log into this portal at least once "
+#~ "with their Solis-ID. You can continue filling in the application while "
+#~ "you wait for them to do this, but remember to come back and fill in this "
+#~ "field before submitting."
+
+#~ msgid "Werkverdeling overzicht van afgelopen jaar"
+#~ msgstr "Workload overview of past year"

From f49afa4a4f3677b12529c8339b3b73859499d19b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 7 Nov 2023 15:16:52 +0100
Subject: [PATCH 061/148] Secretary is now able to adjust the start_date from
 review detail page.

---
 locale/en/LC_MESSAGES/django.mo               | Bin 150464 -> 151278 bytes
 locale/en/LC_MESSAGES/django.po               |  72 +++++++++++++-----
 proposals/forms.py                            |   7 ++
 .../proposals/proposal_update_date_start.html |  36 +++++++++
 proposals/urls.py                             |  11 ++-
 proposals/views/proposal_views.py             |  15 +++-
 reviews/templates/reviews/documents_list.html |   8 ++
 reviews/templatetags/documents_list.py        |   5 ++
 8 files changed, 128 insertions(+), 26 deletions(-)
 create mode 100644 proposals/templates/proposals/proposal_update_date_start.html

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 83bb30771cfcb8bf016f493d9f314729d9991ec3..a4c6935b3184c3adbb835146bb238d71a5f9f931 100644
GIT binary patch
delta 17379
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

delta 16713
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
ALI3~&

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index a3563555d..d4d3df4dd 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-06 10:52+0100\n"
+"POT-Creation-Date: 2023-11-07 15:10+0100\n"
 "PO-Revision-Date: 2020-10-07 11:22+0200\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -154,6 +154,7 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: proposals/templates/proposals/proposal_confirmation.html:36
 #: proposals/templates/proposals/proposal_diff.html:294
 #: proposals/templates/proposals/proposal_update_attachments.html:26
+#: proposals/templates/proposals/proposal_update_date_start.html:32
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
 #: reviews/templates/reviews/review_assign_form.html:46
@@ -326,7 +327,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:560 proposals/forms.py:624 proposals/forms.py:639
+#: proposals/forms.py:560 proposals/forms.py:631 proposals/forms.py:646
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -1310,6 +1311,7 @@ msgstr "Recording behaviour"
 #: proposals/templates/proposals/proposal_update_attachments.html:7
 #: proposals/templates/proposals/proposal_update_attachments.html:14
 #: proposals/templates/proposals/proposal_update_attachments.html:25
+#: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
 #: studies/templates/studies/study_update_attachments.html:14
 #: studies/templates/studies/study_update_attachments.html:25
@@ -1465,7 +1467,7 @@ msgid ""
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:672
+#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:679
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
@@ -1525,15 +1527,15 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:631
+#: proposals/forms.py:638
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:635
+#: proposals/forms.py:642
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:647
+#: proposals/forms.py:654
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1541,7 +1543,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:678
+#: proposals/forms.py:685
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -2547,7 +2549,7 @@ msgstr ""
 
 #: proposals/templates/proposals/proposal_data_management.html:24
 #: proposals/templates/proposals/proposal_pdf.html:499
-#: reviews/templatetags/documents_list.py:245
+#: reviews/templatetags/documents_list.py:250
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
 
@@ -3450,6 +3452,29 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
+#: proposals/templates/proposals/proposal_update_date_start.html:14
+#: proposals/templates/proposals/proposal_update_date_start.html:31
+msgid "Startdatum aanpassen"
+msgstr "Edit start date"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:17
+msgid ""
+"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
+"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
+"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
+"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op "
+"met"
+msgstr ""
+"On this page, the start date of proposal %(title)s (reference number "
+"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
+"already been concluded, the new start date will not be displayed in the PDF. "
+"If you would like the PDF to be generated with the new start date, please "
+"reach out to "
+
+#: proposals/templates/proposals/proposal_update_date_start.html:26
+msgid "Vul de datum in als 'DD-MM-YYYY'."
+msgstr "Enter the date as 'YYYY-MM-DD'."
+
 #: proposals/templates/proposals/study_consent.html:27
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
@@ -3774,11 +3799,11 @@ msgstr ""
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:384
+#: proposals/views/proposal_views.py:396
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:485
+#: proposals/views/proposal_views.py:497
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -4282,6 +4307,11 @@ msgstr "Edit Data Management Plan"
 
 #: reviews/templates/reviews/documents_list.html:44
 #: reviews/templates/reviews/documents_list.html:46
+msgid "Startdatum wijzigen"
+msgstr "Edit start date"
+
+#: reviews/templates/reviews/documents_list.html:52
+#: reviews/templates/reviews/documents_list.html:54
 msgid "Documenten wijzigen"
 msgstr "Edit documents"
 
@@ -4576,47 +4606,47 @@ msgstr "Trajectory {}: <i>{}</i>"
 msgid "Extra documenten {}"
 msgstr "Extra documents {}"
 
-#: reviews/templatetags/documents_list.py:213
+#: reviews/templatetags/documents_list.py:214
 msgid "Aanmelding"
 msgstr "Application"
 
-#: reviews/templatetags/documents_list.py:215
+#: reviews/templatetags/documents_list.py:216
 msgid "Aanvraag in PDF-vorm"
 msgstr "Application in PDF format"
 
-#: reviews/templatetags/documents_list.py:228
+#: reviews/templatetags/documents_list.py:233
 msgid "Eerdere goedkeuring"
 msgstr "Prior approval"
 
-#: reviews/templatetags/documents_list.py:236
+#: reviews/templatetags/documents_list.py:241
 msgid "Aanvraag bij voortoetsing"
 msgstr "Application for preliminary assessment"
 
-#: reviews/templatetags/documents_list.py:257
+#: reviews/templatetags/documents_list.py:262
 msgid "Beslissing METC"
 msgstr "Decision by METC"
 
-#: reviews/templatetags/documents_list.py:282
+#: reviews/templatetags/documents_list.py:287
 msgid "Informed consent"
 msgstr "Informed consent"
 
-#: reviews/templatetags/documents_list.py:283
+#: reviews/templatetags/documents_list.py:288
 msgid "Informatiebrief"
 msgstr "Information letter"
 
-#: reviews/templatetags/documents_list.py:284
+#: reviews/templatetags/documents_list.py:289
 msgid "Consent declaratie directeur/departementshoofd"
 msgstr "Declaration of consent school director/head of the department"
 
-#: reviews/templatetags/documents_list.py:286
+#: reviews/templatetags/documents_list.py:291
 msgid "Informatiebrief directeur/departementshoofd"
 msgstr "Information letter school director/head of the department"
 
-#: reviews/templatetags/documents_list.py:288
+#: reviews/templatetags/documents_list.py:293
 msgid "Informatiebrief ouders"
 msgstr "Information letter for the parents"
 
-#: reviews/templatetags/documents_list.py:296
+#: reviews/templatetags/documents_list.py:301
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
diff --git a/proposals/forms.py b/proposals/forms.py
index fee52a503..75ea839aa 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -574,6 +574,13 @@ class Meta:
             'dmp_file'
         ]
 
+class ProposalUpdateDateStartForm(forms.ModelForm):
+    class Meta:
+        model = Proposal
+        fields = [
+            'date_start'
+        ]
+
 class ProposalSubmitForm(forms.ModelForm):
     class Meta:
         model = Proposal
diff --git a/proposals/templates/proposals/proposal_update_date_start.html b/proposals/templates/proposals/proposal_update_date_start.html
new file mode 100644
index 000000000..4c7dabc3c
--- /dev/null
+++ b/proposals/templates/proposals/proposal_update_date_start.html
@@ -0,0 +1,36 @@
+{% extends "base/base.html" %}
+
+{% load static %}
+{% load i18n %}
+
+{% block header_title %}
+    {% trans "Formulieren aanpassen" %} - {{ block.super }}
+{% endblock %}
+
+{% block content %}
+    <div class="uu-inner-container">
+        <div class="col-12">
+            <h2>
+                {% trans "Startdatum aanpassen" %}
+            </h2>
+            <p>
+                {% blocktrans trimmed with title=proposal.title ref_number=proposal.reference_number %}
+                Op deze pagina kan de startdatum worden aangepast van de aanvraag {{ title }}
+                (referentienummer <em>{{ ref_number }}</em>). <b>Let op!</b> Als de review al is afgerond,
+                wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht u de PDF 
+                opnieuw willen genereren, neem hierover dan contact op met 
+                {% endblocktrans %}
+                <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.
+            </p>
+            <p>
+                {% trans "Vul de datum in als 'DD-MM-YYYY'." %}
+            </p>
+            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
+                <table>{{ form.as_table }}</table>
+                <input type="hidden" name="next" value="{{ request.META.HTTP_REFERER }}">
+                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Startdatum aanpassen' %}" />
+                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+            </form>
+        </div>
+    </div>
+{% endblock %}
\ No newline at end of file
diff --git a/proposals/urls.py b/proposals/urls.py
index d7dcd56e5..b237908c1 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -15,7 +15,8 @@
     ProposalSubmitPreApproved, ProposalUpdatePreApproved, \
     ProposalUsersOnlyArchiveView, \
     ProposalCopyAmendment, ProposalsPublicArchiveView, \
-    ProposalUpdateDataManagement, TranslatedConsentFormsView
+    ProposalUpdateDataManagement, TranslatedConsentFormsView, \
+    ProposalUpdateDateStart
 
 from .views.study_views import StudyStart, StudyConsent
 from .views.wmo_views import WmoCreate, WmoUpdate, \
@@ -84,10 +85,12 @@
          name='data_management'),
     path('update_data_management/<int:pk>/', ProposalUpdateDataManagement.as_view(), 
          name='update_data_management'),
+    path('update_date_start/<int:pk>/', ProposalUpdateDateStart.as_view(), 
+         name='update_date_start'),
+
+    path('submit/<int:pk>/', include([msgstr ""
+
 
-    path('submit/<int:pk>/', include([
-        path('', ProposalSubmit.as_view(), name='submit'),
-        path('pre/', ProposalSubmitPreAssessment.as_view(),
              name='submit_pre'),
         path('pre_approved/', ProposalSubmitPreApproved.as_view(),
              name='submit_pre_approved'),
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 67c635aa2..1353e5c66 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -27,7 +27,8 @@
 from ..forms import ProposalConfirmationForm, ProposalCopyForm, \
     ProposalDataManagementForm, ProposalForm, ProposalStartPracticeForm, \
     ProposalSubmitForm, RevisionProposalCopyForm, AmendmentProposalCopyForm, \
-    ProposalUpdateDataManagementForm, TranslatedConsentForms
+    ProposalUpdateDataManagementForm, ProposalUpdateDateStartForm, \
+    TranslatedConsentForms
 from ..models import Proposal, Wmo
 from ..utils import generate_pdf, generate_ref_number
 from proposals.mixins import ProposalMixin, ProposalContextMixin, \
@@ -375,7 +376,19 @@ class ProposalUpdateDataManagement(GroupRequiredMixin, generic.UpdateView):
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
         return reverse('reviews:detail', args=[self.object.latest_review().pk])
+    
+class ProposalUpdateDateStart(GroupRequiredMixin, generic.UpdateView):
+    """
+    Allows the secretary to change the date_start on the Proposal level
+    """
+    model = Proposal
+    template_name = 'proposals/proposal_update_date_start.html'
+    form_class = ProposalUpdateDateStartForm
+    group_required = settings.GROUP_SECRETARY
 
+    def get_success_url(self):
+        """Continue to the URL specified in the 'next' POST parameter"""
+        return reverse('reviews:detail', args=[self.object.latest_review().pk])
 
 class ProposalSubmit(ProposalContextMixin, AllowErrorsOnBackbuttonMixin, UpdateView, ):
     model = Proposal
diff --git a/reviews/templates/reviews/documents_list.html b/reviews/templates/reviews/documents_list.html
index 42c683277..b02a54113 100644
--- a/reviews/templates/reviews/documents_list.html
+++ b/reviews/templates/reviews/documents_list.html
@@ -39,6 +39,14 @@ <h5>
     </a>
 {% endif %}
 
+{% if container.date_start_edit_link %}
+    <a href="{{ container.date_start_edit_link }}" class="d-block mb-3">
+        {% trans "Startdatum wijzigen" %}
+        <img src="{% static 'proposals/images/pencil.png' %}"
+            title="{% trans 'Startdatum wijzigen' %}" />
+    </a>
+{% endif %}
+
 {% if container.edit_link %}
 <a href="{{ container.edit_link }}" class="d-block mb-3">
     {% trans "Documenten wijzigen" %}
diff --git a/reviews/templatetags/documents_list.py b/reviews/templatetags/documents_list.py
index 19b5972b4..38611afac 100644
--- a/reviews/templatetags/documents_list.py
+++ b/reviews/templatetags/documents_list.py
@@ -165,6 +165,7 @@ def __init__(self, header, **kwargs):
 
         self.edit_link = False
         self.dmp_edit_link = False
+        self.date_start_edit_link = False
         self.header = header
         self.items = []
 
@@ -222,6 +223,10 @@ def documents_list(review, user):
 
     pdf_container.items.append(proposal_pdf)
 
+    if is_secretary(user):
+        pdf_container.date_start_edit_link = reverse('proposals:update_date_start',
+                                                     args=[proposal.pk])
+
     # Pre-approval
     if proposal.pre_approval_pdf:
 

From f2d701bfe31fe568f333ea2db2a11bd2a9a67019 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 7 Nov 2023 15:26:46 +0100
Subject: [PATCH 062/148] removed accidental garbage in proposals/urls.py

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

diff --git a/proposals/urls.py b/proposals/urls.py
index b237908c1..8b42ab94c 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -88,9 +88,9 @@
     path('update_date_start/<int:pk>/', ProposalUpdateDateStart.as_view(), 
          name='update_date_start'),
 
-    path('submit/<int:pk>/', include([msgstr ""
-
-
+    path('submit/<int:pk>/', include([
+        path('', ProposalSubmit.as_view(), name='submit'),
+        path('pre/', ProposalSubmitPreAssessment.as_view(),
              name='submit_pre'),
         path('pre_approved/', ProposalSubmitPreApproved.as_view(),
              name='submit_pre_approved'),

From 380cd970734210589ff14a0b39c28b3942edc35f Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 7 Nov 2023 16:47:15 +0100
Subject: [PATCH 063/148] msgcat

---
 locale/en/LC_MESSAGES/django.mo |  Bin 151278 -> 148903 bytes
 locale/en/LC_MESSAGES/django.po | 1030 ++++++++++++++-----------------
 2 files changed, 451 insertions(+), 579 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index a4c6935b3184c3adbb835146bb238d71a5f9f931..9024e24d3b3c2752f9349179c5099766d275735c 100644
GIT binary patch
delta 20290
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

delta 22120
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

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index d4d3df4dd..c13119c5c 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -2,62 +2,19 @@
 # Copyright (C) 2016
 # This file is distributed under the same license as the fetc-h package.
 # Martijn van der Klis <M.H.vanderKlis@uu.nl>, 2016.
+#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-07 15:10+0100\n"
-"PO-Revision-Date: 2020-10-07 11:22+0200\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
+"PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
 "Language: en\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.pr  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.pr  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.develop  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.acc  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.acc  #-#-#-#-#\n"
-"#-#-#-#-#  django.po.pr  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  django.po.acc  #-#-#-#-#\n"
-"#-#-#-#-#  manual.po  #-#-#-#-#\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Poedit 2.4.1\n"
-"#-#-#-#-#  github.po  #-#-#-#-#\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
@@ -81,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
 #: faqs/menus.py:17 main/templates/base/menu.html:134
 #: main/templates/main/index.html:209
-#: proposals/templates/proposals/proposal_pdf.html:430
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
+#: proposals/utils/pdf_diff_logic.py:859
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -152,9 +109,8 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:294
+#: proposals/templates/proposals/proposal_diff.html:58
 #: proposals/templates/proposals/proposal_update_attachments.html:26
-#: proposals/templates/proposals/proposal_update_date_start.html:32
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
 #: reviews/templates/reviews/review_assign_form.html:46
@@ -283,9 +239,8 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
-#: proposals/templates/proposals/diff/intervention.html:4
-#: proposals/templates/proposals/proposal_pdf.html:285
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
+#: proposals/utils/pdf_diff_logic.py:586
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -327,7 +282,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:560 proposals/forms.py:631 proposals/forms.py:646
+#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -346,11 +301,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:15
+#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:15
+#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "nee"
 msgstr "no"
 
@@ -403,7 +358,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:79
+#: proposals/templates/proposals/proposal_pdf.html:119
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
 msgid "E-mail"
 msgstr "E-mail"
@@ -442,7 +397,7 @@ msgstr "Phase"
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
-#: reviews/templates/reviews/vue_templates/review_list.html:160
+#: reviews/templates/reviews/vue_templates/review_list.html:151
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
@@ -450,7 +405,7 @@ msgstr "Date submitted"
 #: reviews/templates/reviews/committee_members_workload.html:27
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
-#: reviews/templates/reviews/vue_templates/review_list.html:170
+#: reviews/templates/reviews/vue_templates/review_list.html:161
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
@@ -462,7 +417,7 @@ msgstr "My decision"
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
-#: reviews/templates/reviews/vue_templates/review_list.html:140
+#: reviews/templates/reviews/vue_templates/review_list.html:131
 msgid "Afhandeling"
 msgstr "Conclusion"
 
@@ -548,7 +503,7 @@ msgstr "Save and go to next step >>"
 
 #: main/templates/base/login_header.html:6
 msgid "Welkom {}"
-msgstr ""
+msgstr "Welcome {}"
 
 #: main/templates/base/menu.html:11 proposals/menus.py:80
 msgid "Mijn aanvragen"
@@ -582,27 +537,27 @@ msgid "Maak een amendement van een al goedgekeurde aanvraag"
 msgstr "Create an amendment to an already approved application"
 
 #: main/templates/base/menu.html:32 proposals/menus.py:56
-#: proposals/views/proposal_views.py:76
+#: proposals/views/proposal_views.py:77
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
 #: main/templates/base/menu.html:35 proposals/menus.py:60
-#: proposals/views/proposal_views.py:126
+#: proposals/views/proposal_views.py:127
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
 #: main/templates/base/menu.html:38 proposals/menus.py:64
-#: proposals/views/proposal_views.py:88
+#: proposals/views/proposal_views.py:89
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
 #: main/templates/base/menu.html:41 proposals/menus.py:68
-#: proposals/views/proposal_views.py:100
+#: proposals/views/proposal_views.py:101
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
 #: main/templates/base/menu.html:44 proposals/menus.py:72
-#: proposals/views/proposal_views.py:112
+#: proposals/views/proposal_views.py:113
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
@@ -611,7 +566,7 @@ msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
 #: main/templates/base/menu.html:52 proposals/menus.py:110
-#: proposals/views/proposal_views.py:153
+#: proposals/views/proposal_views.py:154
 msgid "Archief"
 msgstr "Archive"
 
@@ -1199,7 +1154,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1283,9 +1238,8 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
-#: proposals/templates/proposals/diff/observation.html:4
-#: proposals/templates/proposals/proposal_pdf.html:297
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
+#: proposals/utils/pdf_diff_logic.py:642
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1311,7 +1265,6 @@ msgstr "Recording behaviour"
 #: proposals/templates/proposals/proposal_update_attachments.html:7
 #: proposals/templates/proposals/proposal_update_attachments.html:14
 #: proposals/templates/proposals/proposal_update_attachments.html:25
-#: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
 #: studies/templates/studies/study_update_attachments.html:14
 #: studies/templates/studies/study_update_attachments.html:25
@@ -1363,11 +1316,11 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:63 proposals/forms.py:270 proposals/validators.py:25
+#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:134
+#: proposals/forms.py:133
 msgid "Selecteer..."
 msgstr "Select..."
 
@@ -1386,19 +1339,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:189
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
+#: proposals/forms.py:192
+msgid "Je dient een promotor/begeleider op te geven."
+msgstr "You are required to specify a promotor/supervisor."
+
+#: proposals/forms.py:199
+msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
+msgstr "You cannot submit yourself as the promotor/supervisor."
 
-#: proposals/forms.py:204
+#: proposals/forms.py:213
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:209
+#: proposals/forms.py:218
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:219
+#: proposals/forms.py:228
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1406,7 +1363,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:229
+#: proposals/forms.py:238
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1419,23 +1376,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:256
+#: proposals/forms.py:265
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:276 proposals/models.py:536
+#: proposals/forms.py:285 proposals/models.py:538
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:278 proposals/models.py:538
+#: proposals/forms.py:287 proposals/models.py:540
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:318 proposals/forms.py:353
+#: proposals/forms.py:327 proposals/forms.py:362
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:320 proposals/forms.py:355
+#: proposals/forms.py:329 proposals/forms.py:364
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1445,11 +1402,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:327
+#: proposals/forms.py:336
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:328
+#: proposals/forms.py:337
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1457,69 +1414,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:362
+#: proposals/forms.py:371
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:363
+#: proposals/forms.py:372
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:418 proposals/forms.py:548 proposals/forms.py:679
+#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:426
+#: proposals/forms.py:435
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:484
+#: proposals/forms.py:493
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:492
+#: proposals/forms.py:501
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:494
+#: proposals/forms.py:503
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:496
+#: proposals/forms.py:505
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:498
+#: proposals/forms.py:507
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:500
+#: proposals/forms.py:509
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:502
+#: proposals/forms.py:511
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:504
+#: proposals/forms.py:513
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:506
+#: proposals/forms.py:515
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:508
+#: proposals/forms.py:517
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:510
+#: proposals/forms.py:519
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:554
+#: proposals/forms.py:563
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1527,15 +1484,15 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:638
+#: proposals/forms.py:640
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:642
+#: proposals/forms.py:644
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:654
+#: proposals/forms.py:656
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1543,7 +1500,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:685
+#: proposals/forms.py:687
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1831,7 +1788,8 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 reviews/models.py:184
+#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980
+#: reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -1898,78 +1856,86 @@ msgstr ""
 #: proposals/models.py:517
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
+msgid "Promotor/Begeleider"
+msgstr "Promotor/Supervisor"
 
 #: proposals/models.py:520
 msgid ""
-"Aan het einde van de procedure kan je deze aanvraag ter\n"
-"        verificatie naar je eindverantwoordelijke sturen. De\n"
-"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-"en\n"
-"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
-"wel\n"
-"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
-"je de\n"
-"        aanvraag indient."
-msgstr ""
-"At the end of the procedure, you can send this application to the researcher "
-"with final responsibility for verification. The researcher with final "
-"responsibility can then make adjustments and submit the study to the FEtC-H. "
-"<strong>Note</strong>: if you cannot find your supervisor using this field, "
-"they may have to log into this portal at least once with their Solis-ID. You "
-"can continue filling in the application while you wait for them to do this, "
-"but remember to come back and fill in this field before submitting."
-
-#: proposals/models.py:545
+"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
+"                    naar je promotor of begeleider gestuurd worden. Deze "
+"persoon \n"
+"                    is de eindverantwoordelijk onderzoeker, en zal de "
+"aanvraag \n"
+"                    vervolgens waar nodig kunnen aanpassen en indienen bij "
+"de FETC-GW.\n"
+"                    <br><br><strong>Belangrijk</strong>: als je je promotor "
+"of \n"
+"                    begeleider niet kunt vinden met dit veld, dan moeten "
+"zij \n"
+"                    waarschijnlijk eerst één keer inloggen in deze portal. \n"
+"                    Je kunt nog wel verder met de aanvraag, maar vergeet dit "
+"veld \n"
+"                    niet in te vullen voor je de aanvraag indient. Je "
+"aanvraag \n"
+"                    zal dan namelijk niet in behandeling kunnen worden "
+"genomen."
+msgstr ""
+"At the end of the procedure, you need to send this application to your "
+"promotor or supervisor for verification. this person is the researcher with "
+"final responsibility and can then make adjustments and submit the study to "
+"the FEtC-H. <strong>Note</strong>: if you cannot find your promotor or "
+"supervisor using this field, they may have to log into this portal at least "
+"once with their Solis-ID. You can continue filling in the application, while "
+"you wait for them to do this, but remember to come back and fill in this "
+"field before submitting."
+
+#: proposals/models.py:547
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:617
+#: proposals/models.py:619
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:623
+#: proposals/models.py:625
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:628
+#: proposals/models.py:630
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:630
+#: proposals/models.py:632
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:632
+#: proposals/models.py:634
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:730
+#: proposals/models.py:732
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:731
+#: proposals/models.py:733
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:732
+#: proposals/models.py:734
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:736
+#: proposals/models.py:738
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1977,11 +1943,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:750
+#: proposals/models.py:752
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:756
+#: proposals/models.py:758
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1989,7 +1955,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:758
+#: proposals/models.py:760
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -2010,7 +1976,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:774
+#: proposals/models.py:776
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -2019,15 +1985,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:781
+#: proposals/models.py:783
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:786
+#: proposals/models.py:788
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:824
+#: proposals/models.py:826
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2091,298 +2057,6 @@ msgstr "Old"
 msgid "Nieuw"
 msgstr "New"
 
-#: proposals/templates/proposals/diff/intervention.html:8
-msgid ""
-"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-"niet bevat."
-msgstr ""
-"This revision involves intervention research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/intervention.html:12
-msgid ""
-"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-"dat wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application does include this."
-
-#: proposals/templates/proposals/diff/intervention.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een interventieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve intervention "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/intervention_v1.html:8
-#: proposals/templates/proposals/diff/intervention_v2.html:8
-#: proposals/templates/proposals/diff/observation_v1.html:9
-#: proposals/templates/proposals/diff/observation_v2.html:9
-#: proposals/templates/proposals/diff/sessions.html:23
-#: proposals/templates/proposals/diff/sessions.html:42
-#: proposals/templates/proposals/diff/sessions.html:103
-#: proposals/templates/proposals/diff/sessions.html:174
-#: proposals/templates/proposals/diff/study.html:25
-#: proposals/templates/proposals/diff/study.html:151
-#: proposals/templates/proposals/diff/study.html:215
-#: proposals/templates/proposals/proposal_diff.html:53
-#: proposals/templates/proposals/proposal_diff.html:178
-#: proposals/templates/proposals/proposal_diff.html:211
-#: proposals/templates/proposals/proposal_diff.html:244
-#: proposals/templates/proposals/proposal_diff.html:268
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:9
-#: proposals/templates/proposals/diff/intervention_v2.html:9
-#: proposals/templates/proposals/diff/observation_v1.html:10
-#: proposals/templates/proposals/diff/observation_v2.html:10
-#: proposals/templates/proposals/diff/sessions.html:24
-#: proposals/templates/proposals/diff/sessions.html:43
-#: proposals/templates/proposals/diff/sessions.html:104
-#: proposals/templates/proposals/diff/sessions.html:175
-#: proposals/templates/proposals/diff/study.html:26
-#: proposals/templates/proposals/diff/study.html:152
-#: proposals/templates/proposals/diff/study.html:216
-#: proposals/templates/proposals/proposal_diff.html:54
-#: proposals/templates/proposals/proposal_diff.html:179
-#: proposals/templates/proposals/proposal_diff.html:212
-#: proposals/templates/proposals/proposal_diff.html:245
-#: proposals/templates/proposals/proposal_diff.html:269
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:28
-#: proposals/templates/proposals/diff/intervention_v1.html:33
-#: proposals/templates/proposals/diff/intervention_v1.html:42
-#: proposals/templates/proposals/diff/intervention_v1.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:28
-#: proposals/templates/proposals/diff/intervention_v2.html:33
-#: proposals/templates/proposals/diff/intervention_v2.html:42
-#: proposals/templates/proposals/diff/intervention_v2.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:62
-#: proposals/templates/proposals/diff/intervention_v2.html:67
-#: proposals/templates/proposals/diff/observation_v1.html:43
-#: proposals/templates/proposals/diff/observation_v1.html:48
-#: proposals/templates/proposals/diff/observation_v2.html:43
-#: proposals/templates/proposals/diff/observation_v2.html:48
-#: proposals/templates/proposals/diff/sessions.html:62
-#: proposals/templates/proposals/diff/sessions.html:67
-#: proposals/templates/proposals/diff/sessions.html:76
-#: proposals/templates/proposals/diff/sessions.html:81
-msgid "ja,nee,"
-msgstr "yes,no,"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:87
-#: proposals/templates/proposals/diff/intervention_v1.html:92
-#: proposals/templates/proposals/diff/intervention_v2.html:102
-#: proposals/templates/proposals/diff/intervention_v2.html:107
-#: proposals/templates/proposals/diff/observation_v1.html:29
-#: proposals/templates/proposals/diff/observation_v1.html:34
-#: proposals/templates/proposals/diff/observation_v1.html:68
-#: proposals/templates/proposals/diff/observation_v1.html:73
-#: proposals/templates/proposals/diff/observation_v1.html:81
-#: proposals/templates/proposals/diff/observation_v1.html:86
-#: proposals/templates/proposals/diff/observation_v1.html:94
-#: proposals/templates/proposals/diff/observation_v1.html:99
-#: proposals/templates/proposals/diff/observation_v1.html:108
-#: proposals/templates/proposals/diff/observation_v1.html:113
-#: proposals/templates/proposals/diff/observation_v1.html:122
-#: proposals/templates/proposals/diff/observation_v1.html:127
-#: proposals/templates/proposals/diff/observation_v2.html:29
-#: proposals/templates/proposals/diff/observation_v2.html:34
-#: proposals/templates/proposals/diff/observation_v2.html:73
-#: proposals/templates/proposals/diff/observation_v2.html:78
-#: proposals/templates/proposals/diff/observation_v2.html:93
-#: proposals/templates/proposals/diff/observation_v2.html:98
-#: proposals/templates/proposals/diff/observation_v2.html:113
-#: proposals/templates/proposals/diff/observation_v2.html:118
-#: proposals/templates/proposals/diff/observation_v2.html:132
-#: proposals/templates/proposals/diff/observation_v2.html:137
-#: proposals/templates/proposals/diff/observation_v2.html:146
-#: proposals/templates/proposals/diff/observation_v2.html:151
-#: proposals/templates/proposals/diff/sessions.html:151
-#: proposals/templates/proposals/diff/sessions.html:156
-#: proposals/templates/proposals/diff/study.html:43
-#: proposals/templates/proposals/diff/study.html:48
-#: proposals/templates/proposals/diff/study.html:63
-#: proposals/templates/proposals/diff/study.html:64
-#: proposals/templates/proposals/diff/study.html:220
-#: proposals/templates/proposals/diff/study.html:221
-#: proposals/templates/proposals/diff/study.html:262
-#: proposals/templates/proposals/diff/study.html:267
-#: proposals/templates/proposals/pdf/intervention_v1.html:16
-#: proposals/templates/proposals/pdf/intervention_v1.html:20
-#: proposals/templates/proposals/pdf/intervention_v1.html:43
-#: proposals/templates/proposals/pdf/intervention_v2.html:16
-#: proposals/templates/proposals/pdf/intervention_v2.html:20
-#: proposals/templates/proposals/pdf/intervention_v2.html:28
-#: proposals/templates/proposals/pdf/intervention_v2.html:48
-#: proposals/templates/proposals/pdf/intervention_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v1.html:16
-#: proposals/templates/proposals/pdf/observation_v1.html:20
-#: proposals/templates/proposals/pdf/observation_v1.html:31
-#: proposals/templates/proposals/pdf/observation_v1.html:34
-#: proposals/templates/proposals/pdf/observation_v1.html:37
-#: proposals/templates/proposals/pdf/observation_v1.html:41
-#: proposals/templates/proposals/pdf/observation_v1.html:45
-#: proposals/templates/proposals/pdf/observation_v2.html:16
-#: proposals/templates/proposals/pdf/observation_v2.html:20
-#: proposals/templates/proposals/pdf/observation_v2.html:34
-#: proposals/templates/proposals/pdf/observation_v2.html:42
-#: proposals/templates/proposals/pdf/observation_v2.html:50
-#: proposals/templates/proposals/pdf/observation_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v2.html:67
-#: proposals/templates/proposals/proposal_diff.html:95
-#: proposals/templates/proposals/proposal_diff.html:96
-#: proposals/templates/proposals/proposal_diff.html:121
-#: proposals/templates/proposals/proposal_diff.html:122
-#: proposals/templates/proposals/proposal_diff.html:216
-#: proposals/templates/proposals/proposal_diff.html:217
-#: proposals/templates/proposals/proposal_diff.html:221
-#: proposals/templates/proposals/proposal_diff.html:222
-#: proposals/templates/proposals/proposal_diff.html:249
-#: proposals/templates/proposals/proposal_diff.html:250
-#: proposals/templates/proposals/proposal_diff.html:273
-#: proposals/templates/proposals/proposal_diff.html:274
-#: proposals/templates/proposals/proposal_pdf.html:109
-#: proposals/templates/proposals/proposal_pdf.html:125
-#: proposals/templates/proposals/proposal_pdf.html:182
-#: proposals/templates/proposals/proposal_pdf.html:185
-#: proposals/templates/proposals/proposal_pdf.html:204
-#: proposals/templates/proposals/proposal_pdf.html:223
-#: proposals/templates/proposals/proposal_pdf.html:232
-#: proposals/templates/proposals/proposal_pdf.html:274
-#: proposals/templates/proposals/proposal_pdf.html:329
-#: proposals/templates/proposals/proposal_pdf.html:333
-#: proposals/templates/proposals/proposal_pdf.html:369
-#: proposals/templates/proposals/proposal_pdf.html:435
-#: proposals/templates/proposals/proposal_pdf.html:452
-#: proposals/templates/proposals/proposal_pdf.html:516
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/diff/observation.html:8
-msgid ""
-"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves observation research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/observation.html:12
-msgid ""
-"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat "
-"wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application involve this."
-
-#: proposals/templates/proposals/diff/observation.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve observation "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/observation_v1.html:139
-#: proposals/templates/proposals/diff/observation_v1.html:140
-#: proposals/templates/proposals/diff/study.html:233
-#: proposals/templates/proposals/diff/study.html:239
-#: proposals/templates/proposals/diff/study.html:247
-#: proposals/templates/proposals/diff/study.html:253
-#: proposals/templates/proposals/pdf/observation_v1.html:53
-#: proposals/templates/proposals/proposal_diff.html:228
-#: proposals/templates/proposals/proposal_diff.html:232
-#: proposals/templates/proposals/proposal_pdf.html:189
-#: proposals/templates/proposals/proposal_pdf.html:444
-#: proposals/templates/proposals/proposal_pdf.html:447
-#: proposals/templates/proposals/proposal_pdf.html:462
-#: proposals/templates/proposals/proposal_pdf.html:467
-#: proposals/templates/proposals/proposal_pdf.html:472
-#: proposals/templates/proposals/proposal_pdf.html:486
-#: proposals/templates/proposals/proposal_pdf.html:491
-#: proposals/templates/proposals/proposal_pdf.html:507
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-msgid "Download"
-msgstr "Download"
-
-#: proposals/templates/proposals/diff/sessions.html:7
-#: proposals/templates/proposals/proposal_pdf.html:308
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
-#: proposals/templates/proposals/diff/sessions.html:11
-msgid ""
-"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves tasks research, whereas the original application does "
-"not."
-
-#: proposals/templates/proposals/diff/sessions.html:15
-msgid ""
-"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel "
-"bevat."
-msgstr ""
-"This revision does not involve tasks research, whereas the original "
-"application does involve this."
-
-#: proposals/templates/proposals/diff/sessions.html:170
-#: proposals/templates/proposals/proposal_pdf.html:381
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/diff/study.html:9
-#: proposals/templates/proposals/proposal_pdf.html:215
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/diff/study.html:14
-msgid "Dit traject is nieuw in de revisie."
-msgstr "This trajectory was added in this revision."
-
-#: proposals/templates/proposals/diff/study.html:18
-msgid "Dit traject is weggehaald uit de revisie"
-msgstr "This trajectory was removed in this revision."
-
-#: proposals/templates/proposals/diff/study.html:144
-#: proposals/templates/proposals/proposal_pdf.html:391
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/diff/study.html:206
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
 #: proposals/templates/proposals/proposal_confirm_delete.html:6
 #: proposals/templates/proposals/proposal_confirm_delete.html:12
 msgid "Aanvraag verwijderen"
@@ -2548,8 +2222,8 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/templates/proposals/proposal_pdf.html:499
-#: reviews/templatetags/documents_list.py:250
+#: proposals/utils/pdf_diff_logic.py:954
+#: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
 
@@ -2678,11 +2352,14 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
-#: proposals/templates/proposals/proposal_diff.html:37
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:39
+#: proposals/templates/proposals/proposal_diff.html:38
+msgid "Overzicht van wijzigingen bij aanmelding "
+msgstr "Summary of changes of application "
+
+#: proposals/templates/proposals/proposal_diff.html:42
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2690,72 +2367,28 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
-#: proposals/templates/proposals/proposal_diff.html:49
 #: proposals/templates/proposals/proposal_form.html:7
-#: proposals/templates/proposals/proposal_form.html:92
+#: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
-#: proposals/templates/proposals/proposal_pdf.html:82
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55
-#: proposals/utils/validate_proposal.py:33
+#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40
+#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_diff.html:133
-#: proposals/templates/proposals/proposal_diff.html:134
-#: proposals/templates/proposals/proposal_pdf.html:133
-#: proposals/templates/proposals/proposal_pdf.html:520
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_diff.html:174
-#: proposals/templates/proposals/proposal_pdf.html:159
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_diff.html:207
-#: proposals/templates/proposals/proposal_pdf.html:179
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_diff.html:240
-#: proposals/templates/proposals/proposal_pdf.html:201
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_diff.html:264
-#: proposals/templates/proposals/proposal_submit.html:179
-msgid "Concept-aanmelding versturen"
-msgstr "Submit draft application"
-
-#: proposals/templates/proposals/proposal_form.html:72
+#: proposals/templates/proposals/proposal_form.html:56
 #: proposals/templates/proposals/proposal_form_pre_approved.html:72
 #: proposals/templates/proposals/proposal_submit.html:33
 msgid "Aantal woorden:"
 msgstr "Number of words:"
 
-#: proposals/templates/proposals/proposal_form.html:89
+#: proposals/templates/proposals/proposal_form.html:73
 #: proposals/templates/proposals/proposal_submit.html:168
 msgid ""
 "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling "
@@ -2764,7 +2397,7 @@ msgstr ""
 "You are currently editing a practice application. These can not be submitted "
 "to the FETC-H for review."
 
-#: proposals/templates/proposals/proposal_form.html:94
+#: proposals/templates/proposals/proposal_form.html:78
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2774,7 +2407,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form.html:121
+#: proposals/templates/proposals/proposal_form.html:105
 msgid ""
 "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag "
 "ligt, kan de FETC geen officiële goedkeuring meer geven."
@@ -2882,7 +2515,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:44
+#: proposals/templates/proposals/proposal_pdf.html:87
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
@@ -2891,47 +2524,31 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:50
+#: proposals/templates/proposals/proposal_pdf.html:93
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:66
+#: proposals/templates/proposals/proposal_pdf.html:109
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:70
+#: proposals/templates/proposals/proposal_pdf.html:113
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:73
+#: proposals/templates/proposals/proposal_pdf.html:116
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:76
+#: proposals/templates/proposals/proposal_pdf.html:118
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
 
-#: proposals/templates/proposals/proposal_pdf.html:194
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/templates/proposals/proposal_pdf.html:481
-#: proposals/templates/proposals/study_consent.html:138
-msgid "Extra formulieren"
-msgstr "Additional forms"
-
-#: proposals/templates/proposals/proposal_pdf.html:513
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
 #: proposals/templates/proposals/proposal_pdf_empty.html:42
 msgid ""
 "\n"
@@ -2954,6 +2571,49 @@ msgstr ""
 "            Reference number <em>reference number</em>\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:104
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+#: proposals/utils/pdf_diff_logic.py:478
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:120
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+#: proposals/utils/pdf_diff_logic.py:503
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:134
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/pdf_diff_logic.py:511
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:145
+#: proposals/utils/pdf_diff_logic.py:529
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:279
+#: proposals/utils/pdf_diff_logic.py:733
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
 #: proposals/templates/proposals/proposal_pdf_empty.html:286
 #: proposals/templates/proposals/proposal_start.html:62
 #: proposals/templates/proposals/proposal_start_practice.html:63
@@ -2968,6 +2628,30 @@ msgstr "Session"
 msgid "Taak"
 msgstr "Task"
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:335
+#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
+#: tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:343
+#: proposals/utils/pdf_diff_logic.py:821
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:372
+msgid "Informed consent formulieren voor het onderzoek"
+msgstr "Informed consent forms for the study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:389
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
+#: proposals/templates/proposals/proposal_submit.html:181
+#: proposals/utils/pdf_diff_logic.py:962
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
 #, python-format
 msgid ""
@@ -2993,6 +2677,25 @@ msgstr ""
 "            Reference number %(reference_number)s\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
+msgid "onbekend"
+msgstr "unknown"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
+#: proposals/utils/pdf_diff_logic.py:281
+msgid "Download"
+msgstr "Download"
+
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
 #, python-format
 msgid ""
@@ -3098,6 +2801,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
+#: proposals/utils/pdf_diff_logic.py:328
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3403,6 +3107,10 @@ msgstr ""
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
+#: proposals/templates/proposals/proposal_submit.html:179
+msgid "Concept-aanmelding versturen"
+msgstr "Submit draft application"
+
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3452,29 +3160,6 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
-#: proposals/templates/proposals/proposal_update_date_start.html:14
-#: proposals/templates/proposals/proposal_update_date_start.html:31
-msgid "Startdatum aanpassen"
-msgstr "Edit start date"
-
-#: proposals/templates/proposals/proposal_update_date_start.html:17
-msgid ""
-"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
-"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
-"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
-"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op "
-"met"
-msgstr ""
-"On this page, the start date of proposal %(title)s (reference number "
-"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
-"already been concluded, the new start date will not be displayed in the PDF. "
-"If you would like the PDF to be generated with the new start date, please "
-"reach out to "
-
-#: proposals/templates/proposals/proposal_update_date_start.html:26
-msgid "Vul de datum in als 'DD-MM-YYYY'."
-msgstr "Enter the date as 'YYYY-MM-DD'."
-
 #: proposals/templates/proposals/study_consent.html:27
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
@@ -3544,6 +3229,10 @@ msgstr ""
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
+#: proposals/templates/proposals/study_consent.html:138
+msgid "Extra formulieren"
+msgstr "Additional forms"
+
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3565,6 +3254,14 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
+#: proposals/templates/proposals/table_with_header_diff.html:13
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/table_with_header_diff.html:14
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
 #: proposals/templates/proposals/translated_consent_forms.html:25
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
@@ -3626,7 +3323,7 @@ msgstr "Route:"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:187
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
-#: reviews/templates/reviews/vue_templates/review_list.html:193
+#: reviews/templates/reviews/vue_templates/review_list.html:184
 msgid "Indieners"
 msgstr "Applicants"
 
@@ -3647,7 +3344,7 @@ msgstr "Hide"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:139
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
-#: reviews/templates/reviews/vue_templates/review_list.html:148
+#: reviews/templates/reviews/vue_templates/review_list.html:139
 msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
@@ -3668,6 +3365,50 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
+#: proposals/utils/pdf_diff_logic.py:93
+msgid ""
+"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
+"aanvraag."
+msgstr ""
+"This section was added in the revision, and did not feature in the original "
+"application."
+
+#: proposals/utils/pdf_diff_logic.py:100
+msgid ""
+"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+msgstr ""
+"This section was present in the original application, but was removed for "
+"the revision."
+
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126
+msgid "Onbekend"
+msgstr "Unknown"
+
+#: proposals/utils/pdf_diff_logic.py:284
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348
+#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381
+msgid "Traject "
+msgstr "Trajectory "
+
+#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384
+msgid "sessie "
+msgstr "session "
+
+#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392
+msgid "Sessie "
+msgstr "Session "
+
+#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394
+msgid ", taak "
+msgstr ", task "
+
+#: proposals/utils/pdf_diff_logic.py:930
+msgid "Extra formulieren "
+msgstr "Additional forms "
+
 #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
 #: proposals/utils/validate_proposal.py:76
 msgid "Ethische toetsing nodig door een METC?"
@@ -3701,11 +3442,11 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:416
+#: proposals/utils/proposal_utils.py:415
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:418
+#: proposals/utils/proposal_utils.py:417
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
@@ -3754,40 +3495,40 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:43
+#: proposals/views/proposal_views.py:44
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:44
+#: proposals/views/proposal_views.py:45
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:63
+#: proposals/views/proposal_views.py:64
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:64
+#: proposals/views/proposal_views.py:65
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:77
+#: proposals/views/proposal_views.py:78
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:89
+#: proposals/views/proposal_views.py:90
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:101
+#: proposals/views/proposal_views.py:102
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:114
+#: proposals/views/proposal_views.py:115
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:127
+#: proposals/views/proposal_views.py:128
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
 "eindverantwoordelijke bij betrokken bent."
@@ -3795,15 +3536,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:246
+#: proposals/views/proposal_views.py:247
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:396
+#: proposals/views/proposal_views.py:385
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:497
+#: proposals/views/proposal_views.py:486
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3844,7 +3585,7 @@ msgstr "Stage"
 #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
-#: reviews/templates/reviews/vue_templates/review_list.html:186
+#: reviews/templates/reviews/vue_templates/review_list.html:177
 msgid "Route"
 msgstr "Route"
 
@@ -3961,10 +3702,6 @@ msgstr "Not to be assessed further"
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:126
-msgid "Onbekend"
-msgstr "Unknown"
-
 #: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
@@ -4307,11 +4044,6 @@ msgstr "Edit Data Management Plan"
 
 #: reviews/templates/reviews/documents_list.html:44
 #: reviews/templates/reviews/documents_list.html:46
-msgid "Startdatum wijzigen"
-msgstr "Edit start date"
-
-#: reviews/templates/reviews/documents_list.html:52
-#: reviews/templates/reviews/documents_list.html:54
 msgid "Documenten wijzigen"
 msgstr "Edit documents"
 
@@ -4590,10 +4322,6 @@ msgstr "Remove this application from the archive"
 msgid "Plaats aanvraag in archief"
 msgstr "Add this application to the archive"
 
-#: reviews/templates/reviews/vue_templates/review_list.html:125
-msgid "Reviewronde beëindigd: "
-msgstr "Reviewing round ended: "
-
 #: reviews/templatetags/documents_list.py:145
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
@@ -4606,47 +4334,47 @@ msgstr "Trajectory {}: <i>{}</i>"
 msgid "Extra documenten {}"
 msgstr "Extra documents {}"
 
-#: reviews/templatetags/documents_list.py:214
+#: reviews/templatetags/documents_list.py:213
 msgid "Aanmelding"
 msgstr "Application"
 
-#: reviews/templatetags/documents_list.py:216
+#: reviews/templatetags/documents_list.py:215
 msgid "Aanvraag in PDF-vorm"
 msgstr "Application in PDF format"
 
-#: reviews/templatetags/documents_list.py:233
+#: reviews/templatetags/documents_list.py:228
 msgid "Eerdere goedkeuring"
 msgstr "Prior approval"
 
-#: reviews/templatetags/documents_list.py:241
+#: reviews/templatetags/documents_list.py:236
 msgid "Aanvraag bij voortoetsing"
 msgstr "Application for preliminary assessment"
 
-#: reviews/templatetags/documents_list.py:262
+#: reviews/templatetags/documents_list.py:257
 msgid "Beslissing METC"
 msgstr "Decision by METC"
 
-#: reviews/templatetags/documents_list.py:287
+#: reviews/templatetags/documents_list.py:282
 msgid "Informed consent"
 msgstr "Informed consent"
 
-#: reviews/templatetags/documents_list.py:288
+#: reviews/templatetags/documents_list.py:283
 msgid "Informatiebrief"
 msgstr "Information letter"
 
-#: reviews/templatetags/documents_list.py:289
+#: reviews/templatetags/documents_list.py:284
 msgid "Consent declaratie directeur/departementshoofd"
 msgstr "Declaration of consent school director/head of the department"
 
-#: reviews/templatetags/documents_list.py:291
+#: reviews/templatetags/documents_list.py:286
 msgid "Informatiebrief directeur/departementshoofd"
 msgstr "Information letter school director/head of the department"
 
-#: reviews/templatetags/documents_list.py:293
+#: reviews/templatetags/documents_list.py:288
 msgid "Informatiebrief ouders"
 msgstr "Information letter for the parents"
 
-#: reviews/templatetags/documents_list.py:301
+#: reviews/templatetags/documents_list.py:296
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
@@ -5974,3 +5702,147 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:50
 msgid "Taak verwijderd"
 msgstr "Task deleted"
+
+#: proposals/forms.py:189
+msgid "Je dient een eindverantwoordelijke op te geven."
+msgstr "You are required to specify the researcher with final responsibility."
+
+#: proposals/models.py:517
+#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
+#: proposals/templates/proposals/vue_templates/proposal_list.html:166
+msgid "Eindverantwoordelijke onderzoeker"
+msgstr "Researcher with final responsibility"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:14
+#: proposals/templates/proposals/proposal_update_date_start.html:31
+msgid "Startdatum aanpassen"
+msgstr "Edit start date"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:17
+msgid ""
+"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
+"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
+"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
+"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op "
+"met"
+msgstr ""
+"On this page, the start date of proposal %(title)s (reference number "
+"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
+"already been concluded, the new start date will not be displayed in the PDF. "
+"If you would like the PDF to be generated with the new start date, please "
+"reach out to "
+
+#: proposals/templates/proposals/proposal_update_date_start.html:26
+msgid "Vul de datum in als 'DD-MM-YYYY'."
+msgstr "Enter the date as 'YYYY-MM-DD'."
+
+#: reviews/templates/reviews/documents_list.html:44
+#: reviews/templates/reviews/documents_list.html:46
+msgid "Startdatum wijzigen"
+msgstr "Edit start date"
+
+#: reviews/templates/reviews/vue_templates/review_list.html:125
+msgid "Reviewronde beëindigd: "
+msgstr "Reviewing round ended: "
+
+#~ msgid ""
+#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves intervention research, whereas the original "
+#~ "application does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application does include this."
+
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een "
+#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
+#~ "doordat de revisie een andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve intervention "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
+
+#~ msgid "ja,nee,"
+#~ msgstr "yes,no,"
+
+#~ msgid ""
+#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves observation research, whereas the original "
+#~ "application does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application involve this."
+
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
+#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
+#~ "andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve observation "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
+
+#~ msgid ""
+#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
+#~ "bevat."
+#~ msgstr ""
+#~ "This revision involves tasks research, whereas the original application "
+#~ "does not."
+
+#~ msgid ""
+#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
+#~ "wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve tasks research, whereas the original "
+#~ "application does involve this."
+
+#~ msgid "Dit traject is nieuw in de revisie."
+#~ msgstr "This trajectory was added in this revision."
+
+#~ msgid "Dit traject is weggehaald uit de revisie"
+#~ msgstr "This trajectory was removed in this revision."
+
+#, python-format
+#~ msgid ""
+#~ "Klik  <a href=\"%(login_url)s\">hier</a> om opnieuw in te loggen met je "
+#~ "Solis-ID."
+#~ msgstr ""
+#~ "Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-"
+#~ "ID."
+
+#~ msgid ""
+#~ "Aan het einde van de procedure kan je deze aanvraag ter\n"
+#~ "        verificatie naar je eindverantwoordelijke sturen. De\n"
+#~ "        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
+#~ "en\n"
+#~ "        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
+#~ "        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
+#~ "        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt "
+#~ "nog wel\n"
+#~ "        verder met de aanvraag, maar vergeet dit veld niet in te vullen "
+#~ "voor je de\n"
+#~ "        aanvraag indient."
+#~ msgstr ""
+#~ "At the end of the procedure, you can send this application to the "
+#~ "researcher with final responsibility for verification. The researcher "
+#~ "with final responsibility can then make adjustments and submit the study "
+#~ "to the FEtC-H. <strong>Note</strong>: if you cannot find your supervisor "
+#~ "using this field, they may have to log into this portal at least once "
+#~ "with their Solis-ID. You can continue filling in the application while "
+#~ "you wait for them to do this, but remember to come back and fill in this "
+#~ "field before submitting."
+
+#~ msgid "Werkverdeling overzicht van afgelopen jaar"
+#~ msgstr "Workload overview of past year"

From 1bcd6a29a387b7287eaa2b8cf91d26017b5675ad Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 8 Nov 2023 15:52:40 +0100
Subject: [PATCH 064/148] Ty's requested changes

---
 locale/en/LC_MESSAGES/django.mo               | Bin 148903 -> 149824 bytes
 locale/en/LC_MESSAGES/django.po               | 973 ++++++++++--------
 proposals/forms.py                            |   3 +
 .../proposals/proposal_update_date_start.html |   5 +-
 reviews/api/views.py                          |   2 +
 reviews/templates/reviews/documents_list.html |   8 -
 .../reviews/vue_templates/review_list.html    |   5 +-
 reviews/templatetags/documents_list.py        |   5 -
 reviews/utils/review_actions.py               |  21 +
 9 files changed, 599 insertions(+), 423 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 9024e24d3b3c2752f9349179c5099766d275735c..41f2784f491f506863bab211539321cea43c0095 100644
GIT binary patch
delta 20518
zcmcKB2b@jU!uRpL4`GziMz2Tjz4zX`tA>Ob4n~=gnL$QyL?`-SLJ}>4BnSqh1`#9@
zQ9=?#xLTA55rQ<&@4wfY+&uTmect=I@B8l0XZfzS%c}dFgSD@u+rJ>)rgpwy9>;N#
zM>tLqJc(oR0glEOUT~Z@UB|hJ2T0G3b)20($LSd7IEzT9qY_DHIp)Mwn3;^7Sb_A%
z@s5)oAEU}sjd7epm>08SoiR?(i*zJI6$fBmjK+*O6ZL?Jm>D-?2p+(^cof6%8mitC
zn+|))+@K`tyn0v^+o9@@u;r6q3OY_jGM1203_rGhZ!3h+9eR*b*guuyRL3-`&v_Ye
z1?s`q+jKIjCl6veypDR%d#E1BFu`%MVi9Y#AQ82w1!lsIs0Vo-%i|=hjGM6zUcm-f
z@MY8D=TH|Ojiqr8s{RhFiMOx{7MbWc`>-2^V~$CVGZllQiIjC6=Xab-MwuyeH||26
z(1lu?Fxxc8c@7Wa>sWZY<7~wDkyD-FGw2Qc0ngxqnU2G~ox!irb9f8YQypfRA?StK
zxW6-;NGJspP+c|$)g!N>x_Bj~#SJ!p8|EYZKGw!_sIkvJ+YC(wtVOyy*25^wi0`7t
zeh2FOPcawwcWw~T7&&tsrv&7~7T5$U;0!E_J8&#LbrnmI4xeXc^Gwu(zk_PwR@9{1
zhkCH%NK2iYs0RIttubUi!xH3zU5M1gkqa0X3N|E|Cp>7qh}Fse1^Z&<g^u$U&c{|*
zbCIb(0Sl6T9dqMu)B~MHJ>W&u1KmXRXsX5Ze@P-4h~&qr)=sFF4@W)u>!=gn!*Q65
zeyq+!$%NhUu+MP<sC8X#spAyD#;EeXs2fMw^mHstI&mrepOwf?GSp?CU}-#$#qpWf
z=oKuBsp+AWSf2D6W}wFQG-|bEeZz6uV-0kvHyQhop1O<)hgUEZt1LG|-3S}<z`d6<
z{@p2fZ6z%t<383U9k$wR7#;Bf=~&dN=uE%Ak2g^*UAM-xWH0t4eGz+Lt+fm*&cm*F
z1^=e}b>@L);SSR0gG7>vEPR_y1lzsCSkZzf*qL-HGF9FUi;y3>!Hj98jcmu{*TsDJ
zF=~jep@!@Z=0fK^$9W35@k6=EEaMAUhIFv*W^;joc#w>Vn8b}*Y+*i-{yE7!ScR>o
zrRR}ecYecSxOAK2RKk5&5$~avpMSfV<-JhlZ=#0sG>*VFw5q7q|863s$hc??p<f1&
zu8cWxF%HKK*c|iiG+i5x0n%G>Ef1V`ms$TG>^430F*agIPh%MMaxiXM4W+R@R`X>1
zV~B*1u?h3zPSkAu0@L6<)Pp?2pE1)uF31hj?dJxh3mh=B{dw$1dMuX13pfqae_$S9
zfprb$Ab%GY=KjtJBD&Fi)R;WM4p@xwXo#^`2a~WCevehKBm-IvpT$`?7fWFNLuNHJ
z#muDVqk3Q^X2or&o;ZR*O`cOkQsMWQ8t<bf(<6+)r>F}>95%}+29=(Gew>FI<IPwX
zFQev8!6W8n)dh=_o{!}*8MVx>9bx=+q0Aqdw^bpmOu7f^L1thG&Or@LB5HPTwH`t3
zZ0ArdyNU^}<NSo$YG)obUA-9dl3tGmDL;bWk-q*3{lACE=bti(aNaSqW7Yc1Y^^O(
z4>%7srYo=>9z(S_{c$!Otcyc12D{<~Y>ib;m?0gDB}uPEHRL#E#P5PO@&whAG$+m2
zWI?qwAI4$@)FfPmxp60|g{SZ|euMon>6CfD=lb0AU_9!<#-q-=i5dzYCux5OmLgJ&
zNF&r_3*aDp3$<QD&zMOz3BM-2183r*FU;G||D~A&jj#au;aCQPs2jb5nye?3rt4FE
zWrn)+S+4;>C!9z%Dh$UWxC(XRA*_VAu_)$0XI4ccY)pDCw!o99^K+j!`$&6K*N#HX
zp-I>rr=uS5Gt>t69Y*T?zk&^31?j&rJ6I{KK)NR?e;W4k(IYs6^wUe`Ml=3yX89H@
zLH>2DjiHy#C#shC7U|e4W)kPQYKFK7YADKKX72AaC!!A+-B4rvGO9(dVir7xnl#^_
zdgd3bh=s42mr!R6Aw3W^hoWtMJnDLLZ2B!sLwXmM#se7aMdUUSjal>S?8`U;tKx3#
zf_G7~zR9<&VGQCl%zDH0$P&y)y68>QkcOzaG!$FoyQl^{#G#n&mKoCVx9EShWEC03
z@D%C+9$^h^a@+JoJnDfq;$ggu8ltzqGd=MYYLbQAF?)Mm?93R)<3RF1`QE%utK2mk
z)MQk{_ur-eb>Y1CXf1ZYcQO4BW~<$f?~}fZb#UW-KKtWMtcjC;H0yddE+c&fSK!14
zjx!94J~TV#JnY8<EyJPYKmEyUOhbc@%trGvcB0@YK9Bhxn~Gy_1nKM84SPIsoHuX-
z>OyUQHYTIWi~eHfKs;t3JqbJFTx1SA7cn(n#=;o<mPl42>3%gQ<g=E<wB%RCOjs93
zVjC=t`*9B5!aW%O8=Df=_}xspdsvDVr+vzVBfpa4dXw`uW+VL&({O($gb!?*rI}GT
zEP<J^0_sT{Aj9P}MXideKG$0<gRv{=g{Zl36We0$RIc|~Z~%sq-hyhtek_H@F&{q0
zj9UNM`DCdIg)s+K!aUdl!>}Lb#W*}pi{@fH>Aq<wCw&&v;vN1tOa8+U*Exm9`5ads
zSEV-%If2@k&Y<ph8NK!YgUxU=n1U?ULe>h_`qp;V-qs<gE{#X+1G6w4F2eM<96RGX
zI1zuv;uy^6Ize^)TST(p9@LW^!y@=KK7&uO1wIpMhNd0nBHag{#W?JZ$FUif&E$IP
zegvu~cVT`!jg9aJ)N-$q*$sLHJu;gX#GxK!8fq@QYV%j1W^WQ|NVcPf>Zna$Lbdz>
z*1_L!6xPb(I_K~`jAw{uW;OLvGj5vnp<#Ugx<{lC8C9r|CA;hGa7}Z#&Uo_AU`_0r
z(~RLPRM*W%wICVG;n%1KNSDj?-t*b8I_Wy7y?z9K$@OR8XBeKxG_+DMpP7w~QDgWV
z>Z8~Q)ELI09$-BBaXXg8FHx)EDXNRB<#)Z8PzTITdL*iaGf|WGbu5I*sG<E5y*cnR
z5uM;KV8*sOs_UDhCQp0Rg?gffW(exUmrxJ9617~nqTZGtqUv8pwfq6<yih)OsfP-p
z8def14?2~J=!R`j57Gs7!9l1Sj7Ck;nW)LQ64^MMwOAN8Vq-jks-LZp>CxiYigaVt
zvYTm5M4i7HvugdnOGGE`MLpRG)B~MEZK0QK`g<He`X|&X>FqaTJOovL1*-l!R718}
zKSoX3Z*2K})C2sE^@2=>X9}BH+N6l-x&lQ_S60N-RBVsh$-1Cg(ht=`!%<y34t2vh
zsGaRi)R^x>J?J?sfj3dBCQC762@LAV>e-A=s4*Lenp8p5I$vV*H{1N9s2g2H4T(P3
z=|*W#51Iqj6Gc%yTM;$+nqV`Gz`D4$IP1S4kt<}VCB72oLSd*bDuNo@(x@&Tin?Gd
zYI06RwP-$S=+>fE&t|NT+fY68BWeQ*DQT`-95qSHm8Ac5VgoW>!&cZ7ucDr?6tA#o
z9DqIXG&aHVrCslBI0E&6*RdLwD&u<J|DVJCq_?4F{iw2LM+~AG@G)u?eXWe5M118;
z3rnD%bOqFtcSN;x0IG+gQC&X)_292t*PzCD6RPXKL~T%4a2$q|cbzDlie>O2s(#R4
z!AzEx=#35PMr*Mb?!Xq9t)kiKdSPqQQ?WLlKs{*sN~R|Yp@uXZPvZn!f!!**-bcHi
z&|8*lw=^K=%p{^&y%5jhN^FZSRW-}&2x{zpL$x?>HFLvasL5Fy)kB>zz-sD)w@H6c
z-F3F&#u~2Em;C-UUFS#A2Wz?BPd>@DUA|4T{xj8aok%LQ#8On)T-S8*IaEu3!dlp<
zp6m3(c)X0~P^)Bbeb<?eU!r=VUjx_s!Z8x{{@;!2(VM7A_cLls&)Cp)`g4D$84<N?
z9qNQFsM&rAwWZ!b?SN?-+5G``^S~7`g8bW!UGJMxhbE@$gII<9WvG|XNi0JBv`smW
zbeU$Z_tEV-1}l*<vbpK<H8_Cuebg-N(ZY=V5Y$+2Mm^YVR7-!v#u(Dl%;q+z{bU4A
z;)auv7oHQ++DuA+8#9#Uup;$Zw_*J^A`(xAX7w)A&h`cBwR#;JU|3tzg<Y^A>Hg@$
zH&G9?2Gih1o8E@n7xr2|$I_&4qUKUqJJX|;+6C?GCqpfYKy4tSQDgQJYG<2;+EQOb
zt>^8iq1uP3@eb<z`=|#>+ujU8X4LX)g1X**)MP!0w2k#oq(2!YJJQu;yn<^;pX%f~
z2WVnEUt`vhuG`hL;3{geW$Na7-;ffq9_i1pBxdMtHmIto2ONc6aW$UACpZ>A>ESx<
zFxaZ6+3^;kPB@E|F>No``{lDX4kVrHSu+>LqgKTsd<ir6HnaT|e4g}4?17c~xK0vI
z$B|g?IoJF9f-Sh7bole$&Kh(w^)*}Pc+`!OP_s90Kh`Zh&>pAYh6vaDO}8qGT<drq
zF2czJ%__({$UNXU)K>i=#$kcMuJa}?z~`_AYhBBEAvV<dKSo45U+56CjJlw<$Vu1;
zH)1cmi}SGcP~$n&q#ZiU^}a(+L+yOKQ4KhUn!KUI&ByO{7)g2=mcWoG-iliP6^Uq_
zcSM~q9R0W+H5A8CtKumZ!_3j9yc%i<x}iSpp2RK8p;jYY=LG3rUNAlPX^iWAY3(x7
zteWpoJLg>thS0TXN164Q<wdhj8=+=<J5&n?q4tAGsAaVnHOtqdAGe}b$r;r0x{8|Z
zZoIi(HdKB=)J9ep)dOAPS^v6lJQ><bXQ4KbHK^IV%cd`*>ivW@Fx?n4SsP&`(ovWj
zm!o#l9eA9EeSmt<1>;QqQtN8eGTb<h^{*D~Btz@^II3&DLOsYmYwGc)MY&NIER7nH
z%BYQ{F>1paiY@U~Y>Jm`x)}FSj}AjU=rmLVR|JU^Ch`%s!dqAht4?s8)z}BSp!>4x
zyn<cvAzs3l@r#MB_oGx#_S>DLFXJ2d`ed^j>P&H+rKDfRg_wV;>%54Y@hk?*Omm$>
zL{d+8oe6jp`(WD{_N9dCi7lv}I*c0IuQ3hYL3QN=RM$U6^-#K*#;mB8=fV0|4K>s;
zm|E}uSwyOnF&}H=5meW@ub2;$Sy5e92zBFHs3B^NRWKaYa|=<|xq$j;6*kLt*aDo|
zs2*K8+k6N;ihA%{7^3z60});LXVmP>Fvr}u2xcT*2|HkYEXf6Dq26j+=bEolpUyK6
zco+4451DWFkGwdTbaQ+MH)0#?wZPP0jd`{H_Y%=M{|ZAeeS+!AFjQ9+z-O=~7RLIh
z9_fo(o-d-hb|Hr1Dbx^LLXGte)W#IP&@9slxQW#<7lV3hHA*x$>W1q2Xw-#+s0+S^
z>Y2A~dOvEte})>03s?jnVm#)4)%E_SWC3cq&R*hrfBW?z7E<|A^Ls(9rL6xFbmc-a
zo~K~<Yvyg0_jS|t(Ws4MEN0`0mtarQ>zC0o($6e6p9jXTG!O7TenI))aWU>#<vRPZ
z<C|s@XIX7NZ5Kmr#jRGe+y)TYLPiAUddu8k4E7-XId;afYs}kh9Bv_9d97JiSMe6<
z;5svThrDe*Vy(vJG_2n{rXg$Ib-iCqlTbrZcfA>+XM;r4wGpVXj>qemfLga>HkkFF
zW24#e2BVhYV%&%8@d!5>_MRECYMWi}=lM=pjPmn17xiK&1M{#6?#6l;{GCWMB6X9@
z@|l1YNN-2IT&|&JarjpAv)fVB=Y*fIC>Gmh-j1zMb72+gwYv*7DJyO_8_{r7mv6;n
z9=ITXuwMk7FLs#OehKR_rngX&tK@Do`D$P*(#^0c&PJ`016Tl$q9)Z1)VdDYW0qlN
z%)*TdV_K}T*EF=w`({H5Vn?n2r9`xM-@<X2YoB?5MW}sYHL5GOS<j)C*HhH8O}pQ$
z>)NQ<J{gt28%y9F)Lx(cfO%Kc!y%*xVoC1roFt-+;R$BNW*?ZhU3b(2L}GdzgPJ2#
zFcmJx)c7W<<?FC7zK80;%m<AHt>sZYRS#=p9}IRRvY1FsypGyJ3w~%?+!d9MM|Jgk
zs0$xMweV{!i<u6Y4XO@mXd0oGZEMv2G0+-^dPht|HFVY?)_;4(W*HgU;l4X;mdkzA
zOXDe4q&zQE{3hu(AGyv4SnXruBh(Fd9W@Vh5S4yt)4yX&(v?0jlln!}99oM5@cbu1
z*ZbMM(WmA|<M~*af{UoGa*vtM^@UL_se!sdGt?Ytj~b$G)`578^k~#FZT^`V%HF8@
zQTPpxLhUczg2!DaoX7^$SY|%qIx(0Xv*9!>f=f}a;k~G3cM?0}LsUyzo;2U@*JB;h
z`A*TJ^jvqGPP)(M<~rA`A*W3PgJp?mJ-0>8(s<NdSc$jrENZMjJY&Z0Cu~UC`NGt1
zgqoCtu^LW9Jzz3+!t>Yw%YA8vVkkByorGny{vQ(2OUM6}>48e96RV>ir{b%$WG#l1
zZgkE}&Q+)fJAzuiPf%~g66bllQNJM$C4KK}^ZxI1!OVdvsAam<Gsw4DBAGa$$T#Mr
zQ{{`MrN>dr?kwspc@;GzPf*Jz<0aFjEl`sx5;YgzKyB$8QLE+<7Q-v3NgeWcvs{Z}
z2JY{aA)@6_19gK|sI9a&YEHyrDSQz}<4Wv`c`m!&-}ywLhVVmF&)rA0u;~@E6_3Gq
z(sywzMqV`!bRB~l%M91d%b+c`COsVs<0%}750J5PdS5r+^`@fM{ioO+AEU0*@mn)@
z=Az1v;HUT_YKZpVusb3aBAxvv>tD0A+D%%>5JY1?(y!h!KS(^m#-y9yHV-xpHOWrm
zPE7Nic`ffpJwV(Y*ZB&!VlABgz3aS<hf(K^xN9EZE!;@@)4M^}*+Ar_d!{9&e=uV{
z0f+KHuV7osAKf?a?WRAP9*DpW<gdeCD#tF^`GNWTuo`vVZ#W-YKQv!H&tpH*wSO|@
zOM^r-#@8_e-o`%o2zePgT_2gfz6YwydZX&SgqobwtP5=Z8`ih6ALZLnlQZXI(-Up*
z8tDgk0)ywCnA!dA&#YrwydRS&IQNU$vF7}0HlD?(m&`ku2REa3v`<jW_j6Q3uHXf{
zftrMee>0QwH&hRm{oM?~c<itB{}vH-VY;X0<<cK@!5GwXnTWdK8>p5iqgs9twZ(pB
z%deu=|L>^fnv4E>l?Ii=NYaN~pZBr7qR;2OQ(C6-Is5hgAD!CgY@<T0XMElc_&us6
zIn(&O^_&lNqjIQq-NdGQS);8}tgl%&TaQ>TSbxNfTqj*xpOcCEJ2{D{#l=x?!Rn~4
ztBW%*2K5g371a}k_|C2i)JFA43sg^a!BjXLwW?k~U3WcdKiPxr@U*pXI-e7)Pev4x
z+Ny}Ecpd%tJ8Fw9l-}p<>7A`3Q5)70Oo#8H=EgQuPwhcX-czU@@eHc|byN>NM!iKd
zXYd8Rmrd>rW{f)FSqgUHdd6;HMxQsy8fWr(Z@<>~JLS(|CCdBouZ^dYo}I<#{Y;-d
ztIvDcOhygiK~&FughlZ-YD><{mkIS;`D{UxQJV~HAU#l@ToREttFsjk;gsy=gtj?-
z-Z!Hjs7V%!>hkHR7R|y+xCpge4`W%pj&(6xE}yr>cR)Q*c#w!bQcXdP=|Wqu(s~Fr
zwl`5NNuAqtaY@v9^-;^P9cn1LqPqNfYcv)oJpuLkVGV}jF7#vYBO-d~+(b>TUs01L
zXCBj{5~vGTM9q!bHor6Kyk}829B$L&QFCBEYBH}y&5aGH@043nJ#hj#FX&{<>+{xa
z0c=b`4b%-^MD@r-R14>#9xM^n^0laaV7o0pfEv?}Q8zw=qwqYc<z4dmyqDELRQX=?
z{{HVE5w+wD>IOHgk5M-W$!|^w!zRpyJa~uvJ_XFIZd1_Ap+2ZdHwM*!AnJi;pc=Bs
zrdOeQXd@QU`v1^oe2aS0->?j3Eo6qI9%^Unj+%7QHh(f|SuI0-soaFc@HpzD+yh&l
z-*2u{0oC$Ws2=QqLCxCdh^VClQBU>)`f(a+Us#7V@iOXzNZ!I`%$uSnQ&-f5Bk*|~
zjJn<t)Z93Qs&@s|kRMPzlD-J*U&|*~5wqjvLp@m+)T|Fjb>Udl<eZM03#)KFzJtxM
zM^T^mS1zw(9O=s#q5NV#?*q*)RDSB>W|_yMJ|FBX9`t!X3g0K=HW{5tnAuvdq?wFO
zQ8%7~Rd6|~YfquZ`e#&+JVgyfsZyq8bx?DvC6>l#QLA7wszI+{aZC)_g1xAn=|j|K
zw9BZ^0ewsRypK+MP#eZg)Eo#cV_H@O)s@4rAI4)lJcm`WWLeWgy-_V*ftq7yu@MIE
z5Yde*l=C^4upPdR<;(lLuTDp?Dd}t#%zn@vwTJh`OE?O(Y<pBRJLeMXcGN2P9991U
zYHmG1&AIfI7!p2zI$=a^k}<uqc@4)@@j1g-W~Hh!R=B8|&-(|7XR7<WUo7g^K=Q|+
zR!MSAGy5-N3({^apZCK<D^w3o#kADFf@<jP+CJ~s@N{+56Rf{CiKvCisImG5HFm}8
z8f#%2(rvLTE=JAn+vvxiP-B{lUoW&p7e&qX7N{}qiV1pP>`6LP1G57TLT~-QNu&}5
zhp{p~QUNEFZfIt4yGB0m-*CN$%_)D1df?`becs<4%|MOm9c+(o6F%W!N7N(@qUOwG
z)SOs?CGZ$}zyCcT(vBOZYszfL?#;{?jc9IK7>_z}DXImZp_XUK7N&=qpf;dxsO1=k
zTK79q4|)_+VWyU5`DR0{hP*9V|60$5$<Py)Mzy2?>SfUdb)zWMB${E<D^SaFH~R1l
zY88BiT87t9lkE}e`k}4N>o^ChN2;TSxK1n9zh-HBG74i4T#oUm8|G<k-U*eEj&W9V
zx0eZRNz5V?r&+IKDCSZHd)(GjaSSp1@u$z`D}(PS&Nx1}IFW=4Wbj?X`6l6onqk2~
zTu$wIn-aDzCzKLD#u2Jewu7`bT$YBzvhaQ>WcoY&JmP(FWCnYG`Ti_*b&MxJ<={)7
z!>1AN=uMoDSPow{yx&t#ntFOE@#TnwzLeFs7g64J(t0E0#7Jbba9R@o^U;+0Z;?NW
z{0|5t3Cjt8qf#e(;|!$32q{Nd;xQ!lP@YAr=?IAmgeD2IYvl?ZKz4vCiwGqWHrEOZ
zy7of(ajd=2E#e0_CkttQ81jx}^1dfl-Zo-4`Ogxz*>Y3M{7YiRFWP*5+4BA&XiE7w
zB1|Ul6U8uXG~d}0EwmQ)q;A|~0P#rdPktIsC`DLB-nTfDyiZX_Pdt!NnWj7;Rh=`=
zQcJ7whOH4!ybxud6P6LLL(rr?PSEiIVJ3A~VFqlCI|&O2$EbS`b&MfilF*QQ=-5k`
zM}5uv3EF{&lbA&KS*09&*7cV80!~^-nvK)x%E@05KTLeQDsiyyIne|iuUXS`PF+G}
zdo#UCsu7Q{>BW?3>Fdy@Sx-9~uMnpk1v(xRZ$-Q)Az-qc-^kMr%&&P)Mth<Cq=%5-
zhrIfPoaA37osf{VepvPM<TSBoi!TWLh~aFc#(Lt~JPMNDO8N<5JYiu%<+@?*(-YHi
z9<>>l<GQH`jfnTKW&9Z6eGTDP1@Cx3{w5Rk{(O=A)P%bU^XrBM-y`-pp%GVk26eQ?
zZ6^B1pZu!BKW1ey+PkQr19|)GIVlyJbDfbSGTC~KN$0S2YUxSI&rJDZ!f|$Z?^pG=
zNbIqdhES=GJ$bTK@1Fz2!zj~{7PHy<{BGqeqHG3XIbjOvwfGJ7cv(BM3H_-53TfUT
z&fn~Ly3XHyL)ntZ97=`ysN)JDnlO-xo$yQYc`JLzdh+zT?m%j*$#U|OzDiuL1|2Vv
z*0I-~Gm&&Z;=Qz<68!a32l-^-G_$q%3g>)Jc-7X<%#*yx*<TVSQ|BV)An!Wm`pqXF
zJ|&bO-jQ&DI6vb!V=?78Nqh^5BG`^|w^Dx5mWQj)7udw7RH{LRL@Ma$M*d4C>iw&P
z73A-;b!!vn)$bi|64#rrtR9T`&*XO^J^?dfUBV~C_14r;h<GnTd+K)8r<!+(JVQnZ
z6^~NkIn+^;{5j<FyO8%$dk*F&KOK3)iR;*7a6TZf9(gNmS~MlC4-ZwjUIWy(WF6IT
zEuJCV^mAetLN65%nozj_A(l$tkbgVjK!dQL&z>4jPAh8Z*hzdX`7=z?8A3eTK6+8|
z{Dh^{(Z`g|<PS!N^b*N2hR~UGkaR8L%ZR5OpWAp($_ks`^LQ*W&!yDBBnoSD;SlX3
z!Mv2_BWIvJ^$<0>5})v=Gb&NL2z53PQjQZu_&n=<V_t`iD7#PI8T^rSal*&8vOc8t
z<{A%d`XkD|CEiZ+Xc#B#BJl}f0G0l3D>Wm&k+Pvw?uIGHL*jEtyib10k&e2*kX}Z{
zY0AeC??v8^q;q3ooM*2w*Pb_tyd|1PIz|w({^^3sdzlm7&`Dfil`X4GIt^(Z1Fd%`
z8%=nhvTQbwPxj7z!q=v%GmWwzbuD`gw6+gY=^o)08S@BV5I;plekOLlBWxm_a_~LH
ziQ)$N2yavNJ0Y2na`YuX2XzjU@f!K72@Py{H}VeJYpucFgy$%$K8%xQQJ9AezPNZt
zUh*>86SLz&a`mCJG38B2KT6ovxKO(Ow#IJ>7aHg4wUSg4<qbIZd0P@@ulE_}j<9*}
z5dWI|p48J(5!X@ntF7xN-kki`NoS$#1-)Us9j_lH6K$=1)QBLRhZ<RI-bC`gBroO2
zM&v2s70REGzr~hS!e-<ZBpk7M`pBGeq#|z(iGp1Fpe>)wdUHnGL{)4<7(~cLrIe#1
z7u4aB|1ws=F19?8G`~Clam=FbDZ&-<rV}y~mXJPcYy5;~Ne2kwTw}Jrp0p>@j)KR3
zy3kuTUY3f9gx-|bqh5UsO<2^lQ2PXO`;(KE@R_ZBjXWJwt+`FonM-+JLL2JpNNqJK
zu9M(43-kU(RZ31dBCYLJvT|kx&S*tAN8VD>c?mkEknT#n81e4d0~^~izr9N<>NF((
zu<F^exukUrw)e=Mijinx6J;pqOT0A~(6^~bPHL*!_9#kOaeE<UJxjVf;j+yuOne&Q
z3ZV<-{RkftKT2pz&~b+_){F6_iSzclyzf(v=cx1*VLPFtZAE6CXm8M#=s4mvDQjuV
zXV|hc)LTvYG1cd2OgK%vJU+5{ZzPOsUNo57rmA!1F2Z(dj3n<i>L^d%3DP@=7v?U7
z2tDlG)=;Knzcn{zuw`9{Z{|E7>8ZpYQtzbd+WY-Le1rDrBV?>345wmI!e|Q4*$Wc&
zjvk~p5p?aR*b-CQ3;jyEB<UA$qgR{ng0`$Qc~i)H)20iMF3m-r(S<nD`j`@riF`}J
z3M%QB2OTdE4v~InPfUd+3DML$M%iZ6u{+^Hi+sTmlngK#&U?h)A?&0^I>IpW?-E`i
zzK#6n2?cH4>BPGeFJ!N#?DT{;2oZ#~JZ1&T)>H2WzDn3Zd;?`MsN<HtgJh)OSrUW1
zEOriCxCJ{=cAoqjgiE9^<9mcJ$WJ*A{VD!CbrMMTrSNUS^E|}+Scbe`FqUx7)_<3}
zoAqU_3Yj&?97IM%{EBdu_}>UqDT~67a5+IoX98KyV*aRQFE$$&k@pE6Cj^P>6;>VJ
zN$AxoU$70Sj-=-6)IS}uqzC^gt!M}GLb%Fxn_r3aFQki*E@ks#NY5nbC_^*z6E2XB
zvU$o6kk_1ZJ7{nCnu6cRY)>ezQV#Y`Cq0$!QWinQWYU94k0Smn@ec{j?FCDd_c5U}
z=>p_8#Lr0Um`}VR@$U$`2z|IlPV&nTPeYlTDihl}884ABiHwBCUGpaN>kyi>wsn@0
zN&7~mN!xL7AkH6%j2aN|j|z|S!-$yZ{(%7_V*>u6WDE(AHzwc@504rZ6COUu9~X#8
z@3+UOKuqMo$o}DRkpX{Hcz6u86E@$-l`S@o)1xZ*n*~y;Dm!9K_%Pkzk4tg-sOVvX
z0#UL4p(CTB0#Pa&5gr>$ED)7)s-K6845&0Ba){1v(Y$NZ@-2H*@YjooY2by}xR~gu
zK@B=INtk~vdq~QOx@W?vYlSilj}F9f`k2Te=@UY)H_p|Drj3k>^G8Jw@{bM-`=fr$
z^@=s3BI%FFD4OXXHFDT6P8$^+t%h;ul#2gofqAsJ3Q7A%=Pf@pCNL^8mad2hj0%tQ
z4+?N{WEA~1DiB2vMbpPIW1<5?%c&1XM-K5iBRVE>P-IkK*q^#(04MWU<}wwWW&!{I
zyl_J0<Jp7%FD~Sd3m+PY`j4J%P~2ZU+<)3&uiw3n`yUrgsB}EXztz_N<r;DSK|B9^
zx!|8hfnjA9{>8uz4n#yy7!io1{9lj$aIF+?Q86Q<{N8Oe-2yR#0>dJQFdVF$$T<Jd
z=;3kx0n9!ogm=r7X`oAoYc_c&X~t>kY9SAdju}33SY#lE*%uKrGIHpDAEJNz$?f#|
zPo7kL^B+HGTx1**pXIKd<c&3%k{+zCks;~GCciIjTuk_oK>xUe37c}2VT#Z{Hpd?s
z%W@esC@?rYeAod0NJ{?k2ni#Sawa|AvMDra_x|xklRA96%}uI&b6=XI;`e+7vPA@<
zqX$trHZD9Sj$R%)Jh@P)TQ-evNFcdwnA<aL;<3E$H_7|*xnq6FO$)jor%C32+Lg(e
z9A4SYk|*tu@N!XsK)K`*ZQQnQNE}OgU|^V&I3a^uIr-PN?(xFOpAUB*r%6os#x0z-
zKSRXEmRPxjFK=Sbi*E7639)YKuzzf!(F}Xn!E|0?=bdiR#0D4LsKgx?-T8@aF1eA(
zpTxO!%GIT*rf;K}5Yd5HwlM8h?4qLrf7)v(jS0jC!ejamF6SRTn28b|n;6{a=ILzC
zij3+%Y$WZD8yp#1!RgAM|96*d{>L-?TUU$=j~%Kz{?!w<PI*GproXzLZEx(q)8K}G
zbkje#^N*`UN5ry4^A7u$y;l4Ge3AdHN%{Zf=`3PzSc3kD=(xdubmBku(Es*G5hI!N
z8msWw5v&A1GfKlB5%Bkq9zG&GCNRKGAn!HAsUu^VA>sb0z-TrECR(hT7(I}S1iYPs
z2$Paje!H865Buj{`WH|5*M0W??*aX3%yyf&bfvp2`HhusuJnmDHoBP;m#=qoB+ppy
z=Jfr|ZU@mZ@&3`_w0ppSzyP|`bXm%(vF-b(x-o&_(WCyNcH*9mZtmnw8{I~s$-X`A
z{36Lom)sxR<S#F~!8FOUZ@NSC=jsp`?M+1X;{j$P@w1Zzk{><e8xWc}KFoI^IXb&9
t+?RYdr>{ZU<e~+AOEM;ZUB>rr?zHiN*m6<P<&vj1^%Zv$w>I<r_+J@=QaS(t

delta 19511
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
M(;=;6ThCwr4;UllU;qFB

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c13119c5c..7bfd49009 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-07 10:34+0100\n"
+"POT-Creation-Date: 2023-11-08 15:47+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -38,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
 #: faqs/menus.py:17 main/templates/base/menu.html:134
 #: main/templates/main/index.html:209
+#: proposals/templates/proposals/proposal_pdf.html:430
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
-#: proposals/utils/pdf_diff_logic.py:859
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -109,8 +109,9 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:58
+#: proposals/templates/proposals/proposal_diff.html:294
 #: proposals/templates/proposals/proposal_update_attachments.html:26
+#: proposals/templates/proposals/proposal_update_date_start.html:29
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
 #: reviews/templates/reviews/review_assign_form.html:46
@@ -239,8 +240,9 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
+#: proposals/templates/proposals/diff/intervention.html:4
+#: proposals/templates/proposals/proposal_pdf.html:285
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
-#: proposals/utils/pdf_diff_logic.py:586
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -282,7 +284,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
+#: proposals/forms.py:561 proposals/forms.py:635 proposals/forms.py:650
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -301,11 +303,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
+#: main/models.py:10 main/utils.py:15
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
+#: main/models.py:11 main/utils.py:15
 msgid "nee"
 msgstr "no"
 
@@ -358,7 +360,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:119
+#: proposals/templates/proposals/proposal_pdf.html:79
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
 msgid "E-mail"
 msgstr "E-mail"
@@ -397,7 +399,7 @@ msgstr "Phase"
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
-#: reviews/templates/reviews/vue_templates/review_list.html:151
+#: reviews/templates/reviews/vue_templates/review_list.html:157
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
@@ -405,7 +407,7 @@ msgstr "Date submitted"
 #: reviews/templates/reviews/committee_members_workload.html:27
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
-#: reviews/templates/reviews/vue_templates/review_list.html:161
+#: reviews/templates/reviews/vue_templates/review_list.html:167
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
@@ -417,7 +419,7 @@ msgstr "My decision"
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
-#: reviews/templates/reviews/vue_templates/review_list.html:131
+#: reviews/templates/reviews/vue_templates/review_list.html:137
 msgid "Afhandeling"
 msgstr "Conclusion"
 
@@ -468,7 +470,7 @@ msgstr "Website export text"
 #: proposals/templates/proposals/proposal_confirmation.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:88
-#: reviews/utils/review_actions.py:244
+#: reviews/utils/review_actions.py:245
 msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
@@ -1154,7 +1156,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1238,8 +1240,9 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
+#: proposals/templates/proposals/diff/observation.html:4
+#: proposals/templates/proposals/proposal_pdf.html:297
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
-#: proposals/utils/pdf_diff_logic.py:642
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1265,6 +1268,7 @@ msgstr "Recording behaviour"
 #: proposals/templates/proposals/proposal_update_attachments.html:7
 #: proposals/templates/proposals/proposal_update_attachments.html:14
 #: proposals/templates/proposals/proposal_update_attachments.html:25
+#: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
 #: studies/templates/studies/study_update_attachments.html:14
 #: studies/templates/studies/study_update_attachments.html:25
@@ -1307,7 +1311,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:42 proposals/models.py:221
+#: proposals/forms.py:43 proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1316,19 +1320,19 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
+#: proposals/forms.py:64 proposals/forms.py:271 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:133
+#: proposals/forms.py:135
 msgid "Selecteer..."
 msgstr "Select..."
 
-#: proposals/forms.py:140
+#: proposals/forms.py:141
 msgid "Docent"
 msgstr "Professor"
 
-#: proposals/forms.py:141
+#: proposals/forms.py:142
 msgid ""
 "Vul hier de docent van de cursus in waarbinnen je deze portal moet "
 "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De "
@@ -1339,23 +1343,19 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:192
-msgid "Je dient een promotor/begeleider op te geven."
-msgstr "You are required to specify a promotor/supervisor."
-
-#: proposals/forms.py:199
-msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
-msgstr "You cannot submit yourself as the promotor/supervisor."
+#: proposals/forms.py:190
+msgid "Je dient een eindverantwoordelijke op te geven."
+msgstr "You are required to specify the researcher with final responsibility."
 
-#: proposals/forms.py:213
+#: proposals/forms.py:205
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:218
+#: proposals/forms.py:210
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:228
+#: proposals/forms.py:220
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1363,7 +1363,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:238
+#: proposals/forms.py:230
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1376,23 +1376,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:265
+#: proposals/forms.py:257
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:285 proposals/models.py:538
+#: proposals/forms.py:277 proposals/models.py:536
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:287 proposals/models.py:540
+#: proposals/forms.py:279 proposals/models.py:538
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:327 proposals/forms.py:362
+#: proposals/forms.py:319 proposals/forms.py:354
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:329 proposals/forms.py:364
+#: proposals/forms.py:321 proposals/forms.py:356
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1402,11 +1402,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:336
+#: proposals/forms.py:328
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:337
+#: proposals/forms.py:329
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1414,69 +1414,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:371
+#: proposals/forms.py:363
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:372
+#: proposals/forms.py:364
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
+#: proposals/forms.py:419 proposals/forms.py:549 proposals/forms.py:683
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:435
+#: proposals/forms.py:427
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:493
+#: proposals/forms.py:485
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:501
+#: proposals/forms.py:493
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:503
+#: proposals/forms.py:495
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:505
+#: proposals/forms.py:497
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:507
+#: proposals/forms.py:499
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:509
+#: proposals/forms.py:501
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:511
+#: proposals/forms.py:503
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:513
+#: proposals/forms.py:505
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:515
+#: proposals/forms.py:507
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:517
+#: proposals/forms.py:509
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:519
+#: proposals/forms.py:511
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:563
+#: proposals/forms.py:555
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1484,15 +1484,19 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:640
+#: proposals/forms.py:579
+msgid "Nieuwe beoogde startdatum"
+msgstr "New intended start date"
+
+#: proposals/forms.py:642
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:644
+#: proposals/forms.py:646
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:656
+#: proposals/forms.py:658
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1500,7 +1504,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:687
+#: proposals/forms.py:689
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1788,8 +1792,7 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980
-#: reviews/models.py:184
+#: proposals/models.py:422 reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -1856,86 +1859,78 @@ msgstr ""
 #: proposals/models.py:517
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Promotor/Begeleider"
-msgstr "Promotor/Supervisor"
+msgid "Eindverantwoordelijke onderzoeker"
+msgstr "Researcher with final responsibility"
 
 #: proposals/models.py:520
 msgid ""
-"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
-"                    naar je promotor of begeleider gestuurd worden. Deze "
-"persoon \n"
-"                    is de eindverantwoordelijk onderzoeker, en zal de "
-"aanvraag \n"
-"                    vervolgens waar nodig kunnen aanpassen en indienen bij "
-"de FETC-GW.\n"
-"                    <br><br><strong>Belangrijk</strong>: als je je promotor "
-"of \n"
-"                    begeleider niet kunt vinden met dit veld, dan moeten "
-"zij \n"
-"                    waarschijnlijk eerst één keer inloggen in deze portal. \n"
-"                    Je kunt nog wel verder met de aanvraag, maar vergeet dit "
-"veld \n"
-"                    niet in te vullen voor je de aanvraag indient. Je "
-"aanvraag \n"
-"                    zal dan namelijk niet in behandeling kunnen worden "
-"genomen."
-msgstr ""
-"At the end of the procedure, you need to send this application to your "
-"promotor or supervisor for verification. this person is the researcher with "
-"final responsibility and can then make adjustments and submit the study to "
-"the FEtC-H. <strong>Note</strong>: if you cannot find your promotor or "
-"supervisor using this field, they may have to log into this portal at least "
-"once with their Solis-ID. You can continue filling in the application, while "
-"you wait for them to do this, but remember to come back and fill in this "
-"field before submitting."
-
-#: proposals/models.py:547
+"Aan het einde van de procedure kan je deze aanvraag ter\n"
+"        verificatie naar je eindverantwoordelijke sturen. De\n"
+"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
+"en\n"
+"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
+"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
+"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
+"wel\n"
+"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
+"je de\n"
+"        aanvraag indient."
+msgstr ""
+"At the end of the procedure, you can send this application to the researcher "
+"with final responsibility for verification. The researcher with final "
+"responsibility can then make adjustments and submit the study to the FEtC-H. "
+"<strong>Note</strong>: if you cannot find your supervisor using this field, "
+"they may have to log into this portal at least once with their Solis-ID. You "
+"can continue filling in the application while you wait for them to do this, "
+"but remember to come back and fill in this field before submitting."
+
+#: proposals/models.py:545
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:619
+#: proposals/models.py:617
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:625
+#: proposals/models.py:623
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:630
+#: proposals/models.py:628
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:632
+#: proposals/models.py:630
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:634
+#: proposals/models.py:632
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:732
+#: proposals/models.py:730
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:733
+#: proposals/models.py:731
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:734
+#: proposals/models.py:732
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:738
+#: proposals/models.py:736
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1943,11 +1938,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:752
+#: proposals/models.py:750
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:758
+#: proposals/models.py:756
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1955,7 +1950,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:760
+#: proposals/models.py:758
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1976,7 +1971,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:776
+#: proposals/models.py:774
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1985,15 +1980,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:783
+#: proposals/models.py:781
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:788
+#: proposals/models.py:786
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:826
+#: proposals/models.py:824
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2057,6 +2052,298 @@ msgstr "Old"
 msgid "Nieuw"
 msgstr "New"
 
+#: proposals/templates/proposals/diff/intervention.html:8
+msgid ""
+"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
+"niet bevat."
+msgstr ""
+"This revision involves intervention research, whereas the original "
+"application does not."
+
+#: proposals/templates/proposals/diff/intervention.html:12
+msgid ""
+"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
+"dat wel bevat."
+msgstr ""
+"This revision does not involve intervention research, whereas the original "
+"application does include this."
+
+#: proposals/templates/proposals/diff/intervention.html:28
+msgid ""
+"De revisie en de originele aanvraag hebben beide een interventieonderzoek, "
+"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
+"versie van het formulier gebruikt."
+msgstr ""
+"This revision and the original application both involve intervention "
+"research, but this aspect cannot be compared. The revision uses a newer "
+"version of the form than the original."
+
+#: proposals/templates/proposals/diff/intervention_v1.html:8
+#: proposals/templates/proposals/diff/intervention_v2.html:8
+#: proposals/templates/proposals/diff/observation_v1.html:9
+#: proposals/templates/proposals/diff/observation_v2.html:9
+#: proposals/templates/proposals/diff/sessions.html:23
+#: proposals/templates/proposals/diff/sessions.html:42
+#: proposals/templates/proposals/diff/sessions.html:103
+#: proposals/templates/proposals/diff/sessions.html:174
+#: proposals/templates/proposals/diff/study.html:25
+#: proposals/templates/proposals/diff/study.html:151
+#: proposals/templates/proposals/diff/study.html:215
+#: proposals/templates/proposals/proposal_diff.html:53
+#: proposals/templates/proposals/proposal_diff.html:178
+#: proposals/templates/proposals/proposal_diff.html:211
+#: proposals/templates/proposals/proposal_diff.html:244
+#: proposals/templates/proposals/proposal_diff.html:268
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/diff/intervention_v1.html:9
+#: proposals/templates/proposals/diff/intervention_v2.html:9
+#: proposals/templates/proposals/diff/observation_v1.html:10
+#: proposals/templates/proposals/diff/observation_v2.html:10
+#: proposals/templates/proposals/diff/sessions.html:24
+#: proposals/templates/proposals/diff/sessions.html:43
+#: proposals/templates/proposals/diff/sessions.html:104
+#: proposals/templates/proposals/diff/sessions.html:175
+#: proposals/templates/proposals/diff/study.html:26
+#: proposals/templates/proposals/diff/study.html:152
+#: proposals/templates/proposals/diff/study.html:216
+#: proposals/templates/proposals/proposal_diff.html:54
+#: proposals/templates/proposals/proposal_diff.html:179
+#: proposals/templates/proposals/proposal_diff.html:212
+#: proposals/templates/proposals/proposal_diff.html:245
+#: proposals/templates/proposals/proposal_diff.html:269
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
+#: proposals/templates/proposals/diff/intervention_v1.html:28
+#: proposals/templates/proposals/diff/intervention_v1.html:33
+#: proposals/templates/proposals/diff/intervention_v1.html:42
+#: proposals/templates/proposals/diff/intervention_v1.html:47
+#: proposals/templates/proposals/diff/intervention_v2.html:28
+#: proposals/templates/proposals/diff/intervention_v2.html:33
+#: proposals/templates/proposals/diff/intervention_v2.html:42
+#: proposals/templates/proposals/diff/intervention_v2.html:47
+#: proposals/templates/proposals/diff/intervention_v2.html:62
+#: proposals/templates/proposals/diff/intervention_v2.html:67
+#: proposals/templates/proposals/diff/observation_v1.html:43
+#: proposals/templates/proposals/diff/observation_v1.html:48
+#: proposals/templates/proposals/diff/observation_v2.html:43
+#: proposals/templates/proposals/diff/observation_v2.html:48
+#: proposals/templates/proposals/diff/sessions.html:62
+#: proposals/templates/proposals/diff/sessions.html:67
+#: proposals/templates/proposals/diff/sessions.html:76
+#: proposals/templates/proposals/diff/sessions.html:81
+msgid "ja,nee,"
+msgstr "yes,no,"
+
+#: proposals/templates/proposals/diff/intervention_v1.html:87
+#: proposals/templates/proposals/diff/intervention_v1.html:92
+#: proposals/templates/proposals/diff/intervention_v2.html:102
+#: proposals/templates/proposals/diff/intervention_v2.html:107
+#: proposals/templates/proposals/diff/observation_v1.html:29
+#: proposals/templates/proposals/diff/observation_v1.html:34
+#: proposals/templates/proposals/diff/observation_v1.html:68
+#: proposals/templates/proposals/diff/observation_v1.html:73
+#: proposals/templates/proposals/diff/observation_v1.html:81
+#: proposals/templates/proposals/diff/observation_v1.html:86
+#: proposals/templates/proposals/diff/observation_v1.html:94
+#: proposals/templates/proposals/diff/observation_v1.html:99
+#: proposals/templates/proposals/diff/observation_v1.html:108
+#: proposals/templates/proposals/diff/observation_v1.html:113
+#: proposals/templates/proposals/diff/observation_v1.html:122
+#: proposals/templates/proposals/diff/observation_v1.html:127
+#: proposals/templates/proposals/diff/observation_v2.html:29
+#: proposals/templates/proposals/diff/observation_v2.html:34
+#: proposals/templates/proposals/diff/observation_v2.html:73
+#: proposals/templates/proposals/diff/observation_v2.html:78
+#: proposals/templates/proposals/diff/observation_v2.html:93
+#: proposals/templates/proposals/diff/observation_v2.html:98
+#: proposals/templates/proposals/diff/observation_v2.html:113
+#: proposals/templates/proposals/diff/observation_v2.html:118
+#: proposals/templates/proposals/diff/observation_v2.html:132
+#: proposals/templates/proposals/diff/observation_v2.html:137
+#: proposals/templates/proposals/diff/observation_v2.html:146
+#: proposals/templates/proposals/diff/observation_v2.html:151
+#: proposals/templates/proposals/diff/sessions.html:151
+#: proposals/templates/proposals/diff/sessions.html:156
+#: proposals/templates/proposals/diff/study.html:43
+#: proposals/templates/proposals/diff/study.html:48
+#: proposals/templates/proposals/diff/study.html:63
+#: proposals/templates/proposals/diff/study.html:64
+#: proposals/templates/proposals/diff/study.html:220
+#: proposals/templates/proposals/diff/study.html:221
+#: proposals/templates/proposals/diff/study.html:262
+#: proposals/templates/proposals/diff/study.html:267
+#: proposals/templates/proposals/pdf/intervention_v1.html:16
+#: proposals/templates/proposals/pdf/intervention_v1.html:20
+#: proposals/templates/proposals/pdf/intervention_v1.html:43
+#: proposals/templates/proposals/pdf/intervention_v2.html:16
+#: proposals/templates/proposals/pdf/intervention_v2.html:20
+#: proposals/templates/proposals/pdf/intervention_v2.html:28
+#: proposals/templates/proposals/pdf/intervention_v2.html:48
+#: proposals/templates/proposals/pdf/intervention_v2.html:57
+#: proposals/templates/proposals/pdf/observation_v1.html:16
+#: proposals/templates/proposals/pdf/observation_v1.html:20
+#: proposals/templates/proposals/pdf/observation_v1.html:31
+#: proposals/templates/proposals/pdf/observation_v1.html:34
+#: proposals/templates/proposals/pdf/observation_v1.html:37
+#: proposals/templates/proposals/pdf/observation_v1.html:41
+#: proposals/templates/proposals/pdf/observation_v1.html:45
+#: proposals/templates/proposals/pdf/observation_v2.html:16
+#: proposals/templates/proposals/pdf/observation_v2.html:20
+#: proposals/templates/proposals/pdf/observation_v2.html:34
+#: proposals/templates/proposals/pdf/observation_v2.html:42
+#: proposals/templates/proposals/pdf/observation_v2.html:50
+#: proposals/templates/proposals/pdf/observation_v2.html:57
+#: proposals/templates/proposals/pdf/observation_v2.html:67
+#: proposals/templates/proposals/proposal_diff.html:95
+#: proposals/templates/proposals/proposal_diff.html:96
+#: proposals/templates/proposals/proposal_diff.html:121
+#: proposals/templates/proposals/proposal_diff.html:122
+#: proposals/templates/proposals/proposal_diff.html:216
+#: proposals/templates/proposals/proposal_diff.html:217
+#: proposals/templates/proposals/proposal_diff.html:221
+#: proposals/templates/proposals/proposal_diff.html:222
+#: proposals/templates/proposals/proposal_diff.html:249
+#: proposals/templates/proposals/proposal_diff.html:250
+#: proposals/templates/proposals/proposal_diff.html:273
+#: proposals/templates/proposals/proposal_diff.html:274
+#: proposals/templates/proposals/proposal_pdf.html:109
+#: proposals/templates/proposals/proposal_pdf.html:125
+#: proposals/templates/proposals/proposal_pdf.html:182
+#: proposals/templates/proposals/proposal_pdf.html:185
+#: proposals/templates/proposals/proposal_pdf.html:204
+#: proposals/templates/proposals/proposal_pdf.html:223
+#: proposals/templates/proposals/proposal_pdf.html:232
+#: proposals/templates/proposals/proposal_pdf.html:274
+#: proposals/templates/proposals/proposal_pdf.html:329
+#: proposals/templates/proposals/proposal_pdf.html:333
+#: proposals/templates/proposals/proposal_pdf.html:369
+#: proposals/templates/proposals/proposal_pdf.html:435
+#: proposals/templates/proposals/proposal_pdf.html:452
+#: proposals/templates/proposals/proposal_pdf.html:516
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
+#: proposals/templates/proposals/diff/observation.html:8
+msgid ""
+"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet "
+"bevat."
+msgstr ""
+"This revision involves observation research, whereas the original "
+"application does not."
+
+#: proposals/templates/proposals/diff/observation.html:12
+msgid ""
+"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat "
+"wel bevat."
+msgstr ""
+"This revision does not involve intervention research, whereas the original "
+"application involve this."
+
+#: proposals/templates/proposals/diff/observation.html:28
+msgid ""
+"De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
+"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
+"versie van het formulier gebruikt."
+msgstr ""
+"This revision and the original application both involve observation "
+"research, but this aspect cannot be compared. The revision uses a newer "
+"version of the form than the original."
+
+#: proposals/templates/proposals/diff/observation_v1.html:139
+#: proposals/templates/proposals/diff/observation_v1.html:140
+#: proposals/templates/proposals/diff/study.html:233
+#: proposals/templates/proposals/diff/study.html:239
+#: proposals/templates/proposals/diff/study.html:247
+#: proposals/templates/proposals/diff/study.html:253
+#: proposals/templates/proposals/pdf/observation_v1.html:53
+#: proposals/templates/proposals/proposal_diff.html:228
+#: proposals/templates/proposals/proposal_diff.html:232
+#: proposals/templates/proposals/proposal_pdf.html:189
+#: proposals/templates/proposals/proposal_pdf.html:444
+#: proposals/templates/proposals/proposal_pdf.html:447
+#: proposals/templates/proposals/proposal_pdf.html:462
+#: proposals/templates/proposals/proposal_pdf.html:467
+#: proposals/templates/proposals/proposal_pdf.html:472
+#: proposals/templates/proposals/proposal_pdf.html:486
+#: proposals/templates/proposals/proposal_pdf.html:491
+#: proposals/templates/proposals/proposal_pdf.html:507
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
+msgid "Download"
+msgstr "Download"
+
+#: proposals/templates/proposals/diff/sessions.html:7
+#: proposals/templates/proposals/proposal_pdf.html:308
+#: proposals/templates/proposals/proposal_pdf_empty.html:279
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
+#: proposals/templates/proposals/diff/sessions.html:11
+msgid ""
+"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
+"bevat."
+msgstr ""
+"This revision involves tasks research, whereas the original application does "
+"not."
+
+#: proposals/templates/proposals/diff/sessions.html:15
+msgid ""
+"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel "
+"bevat."
+msgstr ""
+"This revision does not involve tasks research, whereas the original "
+"application does involve this."
+
+#: proposals/templates/proposals/diff/sessions.html:170
+#: proposals/templates/proposals/proposal_pdf.html:381
+#: proposals/templates/proposals/proposal_pdf_empty.html:335
+#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
+#: proposals/templates/proposals/diff/study.html:9
+#: proposals/templates/proposals/proposal_pdf.html:215
+#: proposals/templates/proposals/proposal_pdf_empty.html:145
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/templates/proposals/diff/study.html:14
+msgid "Dit traject is nieuw in de revisie."
+msgstr "This trajectory was added in this revision."
+
+#: proposals/templates/proposals/diff/study.html:18
+msgid "Dit traject is weggehaald uit de revisie"
+msgstr "This trajectory was removed in this revision."
+
+#: proposals/templates/proposals/diff/study.html:144
+#: proposals/templates/proposals/proposal_pdf.html:391
+#: proposals/templates/proposals/proposal_pdf_empty.html:343
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/templates/proposals/diff/study.html:206
+#: proposals/templates/proposals/proposal_pdf_empty.html:372
+msgid "Informed consent formulieren voor het onderzoek"
+msgstr "Informed consent forms for the study"
+
 #: proposals/templates/proposals/proposal_confirm_delete.html:6
 #: proposals/templates/proposals/proposal_confirm_delete.html:12
 msgid "Aanvraag verwijderen"
@@ -2222,7 +2509,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/utils/pdf_diff_logic.py:954
+#: proposals/templates/proposals/proposal_pdf.html:499
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2352,14 +2639,11 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
+#: proposals/templates/proposals/proposal_diff.html:37
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:38
-msgid "Overzicht van wijzigingen bij aanmelding "
-msgstr "Summary of changes of application "
-
-#: proposals/templates/proposals/proposal_diff.html:42
+#: proposals/templates/proposals/proposal_diff.html:39
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2367,28 +2651,72 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
+#: proposals/templates/proposals/proposal_diff.html:49
 #: proposals/templates/proposals/proposal_form.html:7
-#: proposals/templates/proposals/proposal_form.html:76
+#: proposals/templates/proposals/proposal_form.html:92
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
+#: proposals/templates/proposals/proposal_pdf.html:82
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40
-#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
+#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55
+#: proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_form.html:56
+#: proposals/templates/proposals/proposal_diff.html:133
+#: proposals/templates/proposals/proposal_diff.html:134
+#: proposals/templates/proposals/proposal_pdf.html:133
+#: proposals/templates/proposals/proposal_pdf.html:520
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
+msgid "onbekend"
+msgstr "unknown"
+
+#: proposals/templates/proposals/proposal_diff.html:174
+#: proposals/templates/proposals/proposal_pdf.html:159
+#: proposals/templates/proposals/proposal_pdf_empty.html:104
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
+#: proposals/templates/proposals/proposal_diff.html:207
+#: proposals/templates/proposals/proposal_pdf.html:179
+#: proposals/templates/proposals/proposal_pdf_empty.html:120
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
+#: proposals/templates/proposals/proposal_diff.html:240
+#: proposals/templates/proposals/proposal_pdf.html:201
+#: proposals/templates/proposals/proposal_pdf_empty.html:134
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
+#: proposals/templates/proposals/proposal_diff.html:264
+#: proposals/templates/proposals/proposal_submit.html:179
+msgid "Concept-aanmelding versturen"
+msgstr "Submit draft application"
+
+#: proposals/templates/proposals/proposal_form.html:72
 #: proposals/templates/proposals/proposal_form_pre_approved.html:72
 #: proposals/templates/proposals/proposal_submit.html:33
 msgid "Aantal woorden:"
 msgstr "Number of words:"
 
-#: proposals/templates/proposals/proposal_form.html:73
+#: proposals/templates/proposals/proposal_form.html:89
 #: proposals/templates/proposals/proposal_submit.html:168
 msgid ""
 "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling "
@@ -2397,7 +2725,7 @@ msgstr ""
 "You are currently editing a practice application. These can not be submitted "
 "to the FETC-H for review."
 
-#: proposals/templates/proposals/proposal_form.html:78
+#: proposals/templates/proposals/proposal_form.html:94
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2407,7 +2735,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form.html:105
+#: proposals/templates/proposals/proposal_form.html:121
 msgid ""
 "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag "
 "ligt, kan de FETC geen officiële goedkeuring meer geven."
@@ -2515,7 +2843,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:87
+#: proposals/templates/proposals/proposal_pdf.html:44
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
@@ -2524,31 +2852,47 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:93
+#: proposals/templates/proposals/proposal_pdf.html:50
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:109
+#: proposals/templates/proposals/proposal_pdf.html:66
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:113
+#: proposals/templates/proposals/proposal_pdf.html:70
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:116
+#: proposals/templates/proposals/proposal_pdf.html:73
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:118
+#: proposals/templates/proposals/proposal_pdf.html:76
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
 
+#: proposals/templates/proposals/proposal_pdf.html:194
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/templates/proposals/proposal_pdf.html:481
+#: proposals/templates/proposals/study_consent.html:138
+msgid "Extra formulieren"
+msgstr "Additional forms"
+
+#: proposals/templates/proposals/proposal_pdf.html:513
+#: proposals/templates/proposals/proposal_pdf_empty.html:389
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
+#: proposals/templates/proposals/proposal_submit.html:181
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_pdf_empty.html:42
 msgid ""
 "\n"
@@ -2571,49 +2915,6 @@ msgstr ""
 "            Reference number <em>reference number</em>\n"
 "            "
 
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-#: proposals/utils/pdf_diff_logic.py:478
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-#: proposals/utils/pdf_diff_logic.py:503
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/pdf_diff_logic.py:511
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: proposals/utils/pdf_diff_logic.py:529
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: proposals/utils/pdf_diff_logic.py:733
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
 #: proposals/templates/proposals/proposal_pdf_empty.html:286
 #: proposals/templates/proposals/proposal_start.html:62
 #: proposals/templates/proposals/proposal_start_practice.html:63
@@ -2628,30 +2929,6 @@ msgstr "Session"
 msgid "Taak"
 msgstr "Task"
 
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
-#: tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: proposals/utils/pdf_diff_logic.py:821
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-#: proposals/utils/pdf_diff_logic.py:962
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
 #, python-format
 msgid ""
@@ -2677,25 +2954,6 @@ msgstr ""
 "            Reference number %(reference_number)s\n"
 "            "
 
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-#: proposals/utils/pdf_diff_logic.py:281
-msgid "Download"
-msgstr "Download"
-
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
 #, python-format
 msgid ""
@@ -2801,7 +3059,6 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
-#: proposals/utils/pdf_diff_logic.py:328
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3107,10 +3364,6 @@ msgstr ""
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
-#: proposals/templates/proposals/proposal_submit.html:179
-msgid "Concept-aanmelding versturen"
-msgstr "Submit draft application"
-
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3160,6 +3413,25 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
+#: proposals/templates/proposals/proposal_update_date_start.html:14
+#: proposals/templates/proposals/proposal_update_date_start.html:28
+msgid "Startdatum aanpassen"
+msgstr "Edit start date"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:17
+msgid ""
+"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
+"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
+"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
+"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
+"met"
+msgstr ""
+"On this page, the start date of proposal %(title)s (reference number "
+"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
+"already been concluded, the new start date will not be displayed in the PDF. "
+"If you would like the PDF to be generated with the new start date, please "
+"reach out to "
+
 #: proposals/templates/proposals/study_consent.html:27
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
@@ -3229,10 +3501,6 @@ msgstr ""
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
-#: proposals/templates/proposals/study_consent.html:138
-msgid "Extra formulieren"
-msgstr "Additional forms"
-
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3254,14 +3522,6 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
-#: proposals/templates/proposals/table_with_header_diff.html:13
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/table_with_header_diff.html:14
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
 #: proposals/templates/proposals/translated_consent_forms.html:25
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
@@ -3323,7 +3583,7 @@ msgstr "Route:"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:187
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
-#: reviews/templates/reviews/vue_templates/review_list.html:184
+#: reviews/templates/reviews/vue_templates/review_list.html:190
 msgid "Indieners"
 msgstr "Applicants"
 
@@ -3344,7 +3604,7 @@ msgstr "Hide"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:139
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
-#: reviews/templates/reviews/vue_templates/review_list.html:139
+#: reviews/templates/reviews/vue_templates/review_list.html:145
 msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
@@ -3365,50 +3625,6 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
-#: proposals/utils/pdf_diff_logic.py:93
-msgid ""
-"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
-"aanvraag."
-msgstr ""
-"This section was added in the revision, and did not feature in the original "
-"application."
-
-#: proposals/utils/pdf_diff_logic.py:100
-msgid ""
-"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
-msgstr ""
-"This section was present in the original application, but was removed for "
-"the revision."
-
-#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126
-msgid "Onbekend"
-msgstr "Unknown"
-
-#: proposals/utils/pdf_diff_logic.py:284
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348
-#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381
-msgid "Traject "
-msgstr "Trajectory "
-
-#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384
-msgid "sessie "
-msgstr "session "
-
-#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392
-msgid "Sessie "
-msgstr "Session "
-
-#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394
-msgid ", taak "
-msgstr ", task "
-
-#: proposals/utils/pdf_diff_logic.py:930
-msgid "Extra formulieren "
-msgstr "Additional forms "
-
 #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
 #: proposals/utils/validate_proposal.py:76
 msgid "Ethische toetsing nodig door een METC?"
@@ -3442,11 +3658,11 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:415
+#: proposals/utils/proposal_utils.py:416
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:417
+#: proposals/utils/proposal_utils.py:418
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
@@ -3540,11 +3756,11 @@ msgstr ""
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:385
+#: proposals/views/proposal_views.py:397
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:486
+#: proposals/views/proposal_views.py:498
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3585,7 +3801,7 @@ msgstr "Stage"
 #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
-#: reviews/templates/reviews/vue_templates/review_list.html:177
+#: reviews/templates/reviews/vue_templates/review_list.html:183
 msgid "Route"
 msgstr "Route"
 
@@ -3702,6 +3918,10 @@ msgstr "Not to be assessed further"
 msgid "Beslissing"
 msgstr "Decision"
 
+#: reviews/models.py:126
+msgid "Onbekend"
+msgstr "Unknown"
+
 #: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
@@ -4314,7 +4534,7 @@ msgid "Verplaats naar andere kamer"
 msgstr "Move study to different reviewing chamber"
 
 #: reviews/templates/reviews/vue_templates/review_list.html:95
-#: reviews/utils/review_actions.py:281
+#: reviews/utils/review_actions.py:282
 msgid "Verberg aanvraag uit het archief"
 msgstr "Remove this application from the archive"
 
@@ -4322,6 +4542,10 @@ msgstr "Remove this application from the archive"
 msgid "Plaats aanvraag in archief"
 msgstr "Add this application to the archive"
 
+#: reviews/templates/reviews/vue_templates/review_list.html:122
+msgid "Reviewronde beëindigd: "
+msgstr "Reviewing round ended: "
+
 #: reviews/templatetags/documents_list.py:145
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
@@ -4378,30 +4602,34 @@ msgstr "Information letter for the parents"
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
-#: reviews/utils/review_actions.py:129
+#: reviews/utils/review_actions.py:130
 msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
-#: reviews/utils/review_actions.py:155
+#: reviews/utils/review_actions.py:156
 msgid "Deze aanvraag afsluiten"
 msgstr "Conclude this application"
 
-#: reviews/utils/review_actions.py:185
+#: reviews/utils/review_actions.py:186
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
 msgstr "Discontinue assessment of this application"
 
-#: reviews/utils/review_actions.py:215
+#: reviews/utils/review_actions.py:216
 msgid "Verander aangestelde commissieleden"
 msgstr "Change appointment of committee members"
 
-#: reviews/utils/review_actions.py:245
+#: reviews/utils/review_actions.py:246
 msgid "Datum van bevestigingsbrief aanpassen"
 msgstr "Change date of confirmation letter"
 
-#: reviews/utils/review_actions.py:283
+#: reviews/utils/review_actions.py:284
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
+#: reviews/utils/review_actions.py:304
+msgid "Startdatum wijzigen"
+msgstr "Edit start date"
+
 #: reviews/utils/review_utils.py:54
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
@@ -5703,116 +5931,79 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
-#: proposals/forms.py:189
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
+#~ msgid "Je dient een promotor/begeleider op te geven."
+#~ msgstr "You are required to specify a promotor/supervisor."
 
-#: proposals/models.py:517
-#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
-#: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
+#~ msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
+#~ msgstr "You cannot submit yourself as the promotor/supervisor."
 
-#: proposals/templates/proposals/proposal_update_date_start.html:14
-#: proposals/templates/proposals/proposal_update_date_start.html:31
-msgid "Startdatum aanpassen"
-msgstr "Edit start date"
-
-#: proposals/templates/proposals/proposal_update_date_start.html:17
-msgid ""
-"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
-"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
-"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
-"PDF. Mocht u de PDF opnieuw willen genereren, neem hierover dan contact op "
-"met"
-msgstr ""
-"On this page, the start date of proposal %(title)s (reference number "
-"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
-"already been concluded, the new start date will not be displayed in the PDF. "
-"If you would like the PDF to be generated with the new start date, please "
-"reach out to "
-
-#: proposals/templates/proposals/proposal_update_date_start.html:26
-msgid "Vul de datum in als 'DD-MM-YYYY'."
-msgstr "Enter the date as 'YYYY-MM-DD'."
-
-#: reviews/templates/reviews/documents_list.html:44
-#: reviews/templates/reviews/documents_list.html:46
-msgid "Startdatum wijzigen"
-msgstr "Edit start date"
-
-#: reviews/templates/reviews/vue_templates/review_list.html:125
-msgid "Reviewronde beëindigd: "
-msgstr "Reviewing round ended: "
+#~ msgid "Promotor/Begeleider"
+#~ msgstr "Promotor/Supervisor"
 
 #~ msgid ""
-#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-#~ "niet bevat."
+#~ "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
+#~ "                    naar je promotor of begeleider gestuurd worden. Deze "
+#~ "persoon \n"
+#~ "                    is de eindverantwoordelijk onderzoeker, en zal de "
+#~ "aanvraag \n"
+#~ "                    vervolgens waar nodig kunnen aanpassen en indienen "
+#~ "bij de FETC-GW.\n"
+#~ "                    <br><br><strong>Belangrijk</strong>: als je je "
+#~ "promotor of \n"
+#~ "                    begeleider niet kunt vinden met dit veld, dan moeten "
+#~ "zij \n"
+#~ "                    waarschijnlijk eerst één keer inloggen in deze "
+#~ "portal. \n"
+#~ "                    Je kunt nog wel verder met de aanvraag, maar vergeet "
+#~ "dit veld \n"
+#~ "                    niet in te vullen voor je de aanvraag indient. Je "
+#~ "aanvraag \n"
+#~ "                    zal dan namelijk niet in behandeling kunnen worden "
+#~ "genomen."
 #~ msgstr ""
-#~ "This revision involves intervention research, whereas the original "
-#~ "application does not."
+#~ "At the end of the procedure, you need to send this application to your "
+#~ "promotor or supervisor for verification. this person is the researcher "
+#~ "with final responsibility and can then make adjustments and submit the "
+#~ "study to the FEtC-H. <strong>Note</strong>: if you cannot find your "
+#~ "promotor or supervisor using this field, they may have to log into this "
+#~ "portal at least once with their Solis-ID. You can continue filling in the "
+#~ "application, while you wait for them to do this, but remember to come "
+#~ "back and fill in this field before submitting."
+
+#~ msgid "Overzicht van wijzigingen bij aanmelding "
+#~ msgstr "Summary of changes of application "
 
 #~ msgid ""
-#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-#~ "dat wel bevat."
+#~ "Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
+#~ "aanvraag."
 #~ msgstr ""
-#~ "This revision does not involve intervention research, whereas the "
-#~ "original application does include this."
+#~ "This section was added in the revision, and did not feature in the "
+#~ "original application."
 
 #~ msgid ""
-#~ "De revisie en de originele aanvraag hebben beide een "
-#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
-#~ "doordat de revisie een andere versie van het formulier gebruikt."
+#~ "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de "
+#~ "revisie."
 #~ msgstr ""
-#~ "This revision and the original application both involve intervention "
-#~ "research, but this aspect cannot be compared. The revision uses a newer "
-#~ "version of the form than the original."
+#~ "This section was present in the original application, but was removed for "
+#~ "the revision."
 
-#~ msgid "ja,nee,"
-#~ msgstr "yes,no,"
-
-#~ msgid ""
-#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
-#~ "niet bevat."
-#~ msgstr ""
-#~ "This revision involves observation research, whereas the original "
-#~ "application does not."
-
-#~ msgid ""
-#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
-#~ "dat wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve intervention research, whereas the "
-#~ "original application involve this."
+#~ msgid "Traject "
+#~ msgstr "Trajectory "
 
-#~ msgid ""
-#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
-#~ "andere versie van het formulier gebruikt."
-#~ msgstr ""
-#~ "This revision and the original application both involve observation "
-#~ "research, but this aspect cannot be compared. The revision uses a newer "
-#~ "version of the form than the original."
+#~ msgid "sessie "
+#~ msgstr "session "
 
-#~ msgid ""
-#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
-#~ "bevat."
-#~ msgstr ""
-#~ "This revision involves tasks research, whereas the original application "
-#~ "does not."
+#~ msgid "Sessie "
+#~ msgstr "Session "
 
-#~ msgid ""
-#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
-#~ "wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve tasks research, whereas the original "
-#~ "application does involve this."
+#~ msgid ", taak "
+#~ msgstr ", task "
 
-#~ msgid "Dit traject is nieuw in de revisie."
-#~ msgstr "This trajectory was added in this revision."
+#~ msgid "Extra formulieren "
+#~ msgstr "Additional forms "
 
-#~ msgid "Dit traject is weggehaald uit de revisie"
-#~ msgstr "This trajectory was removed in this revision."
+#~ msgid "Vul de datum in als 'DD-MM-YYYY'."
+#~ msgstr "Enter the date as 'YYYY-MM-DD'."
 
 #, python-format
 #~ msgid ""
@@ -5822,27 +6013,5 @@ msgstr "Reviewing round ended: "
 #~ "Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-"
 #~ "ID."
 
-#~ msgid ""
-#~ "Aan het einde van de procedure kan je deze aanvraag ter\n"
-#~ "        verificatie naar je eindverantwoordelijke sturen. De\n"
-#~ "        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-#~ "en\n"
-#~ "        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-#~ "        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-#~ "        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt "
-#~ "nog wel\n"
-#~ "        verder met de aanvraag, maar vergeet dit veld niet in te vullen "
-#~ "voor je de\n"
-#~ "        aanvraag indient."
-#~ msgstr ""
-#~ "At the end of the procedure, you can send this application to the "
-#~ "researcher with final responsibility for verification. The researcher "
-#~ "with final responsibility can then make adjustments and submit the study "
-#~ "to the FEtC-H. <strong>Note</strong>: if you cannot find your supervisor "
-#~ "using this field, they may have to log into this portal at least once "
-#~ "with their Solis-ID. You can continue filling in the application while "
-#~ "you wait for them to do this, but remember to come back and fill in this "
-#~ "field before submitting."
-
 #~ msgid "Werkverdeling overzicht van afgelopen jaar"
 #~ msgstr "Workload overview of past year"
diff --git a/proposals/forms.py b/proposals/forms.py
index 75ea839aa..b912d8637 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -21,6 +21,7 @@
 from .validators import UniqueTitleValidator
 from .widgets import SelectMultipleUser, SelectUser
 
+from cdh.core.forms import DateField
 
 class ProposalForm(UserKwargModelFormMixin, SoftValidationMixin,
                    ConditionalModelForm):
@@ -575,6 +576,8 @@ class Meta:
         ]
 
 class ProposalUpdateDateStartForm(forms.ModelForm):
+    date_start = DateField(label=_('Nieuwe beoogde startdatum'))
+
     class Meta:
         model = Proposal
         fields = [
diff --git a/proposals/templates/proposals/proposal_update_date_start.html b/proposals/templates/proposals/proposal_update_date_start.html
index 4c7dabc3c..389eceac6 100644
--- a/proposals/templates/proposals/proposal_update_date_start.html
+++ b/proposals/templates/proposals/proposal_update_date_start.html
@@ -17,14 +17,11 @@ <h2>
                 {% blocktrans trimmed with title=proposal.title ref_number=proposal.reference_number %}
                 Op deze pagina kan de startdatum worden aangepast van de aanvraag {{ title }}
                 (referentienummer <em>{{ ref_number }}</em>). <b>Let op!</b> Als de review al is afgerond,
-                wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht u de PDF 
+                wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht je de PDF 
                 opnieuw willen genereren, neem hierover dan contact op met 
                 {% endblocktrans %}
                 <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.
             </p>
-            <p>
-                {% trans "Vul de datum in als 'DD-MM-YYYY'." %}
-            </p>
             <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
                 <table>{{ form.as_table }}</table>
                 <input type="hidden" name="next" value="{{ request.META.HTTP_REFERER }}">
diff --git a/reviews/api/views.py b/reviews/api/views.py
index 9d8953025..37d5aa0a8 100644
--- a/reviews/api/views.py
+++ b/reviews/api/views.py
@@ -360,6 +360,8 @@ def get_context(self):
             'CLOSED': Review.CLOSED,
             'GO': Review.GO,
             'GO_POST_HOC': Review.GO_POST_HOC,
+            'REVISION': Review.REVISION,
+
         }
         context['current_user_pk'] = self.request.user.pk
 
diff --git a/reviews/templates/reviews/documents_list.html b/reviews/templates/reviews/documents_list.html
index b02a54113..42c683277 100644
--- a/reviews/templates/reviews/documents_list.html
+++ b/reviews/templates/reviews/documents_list.html
@@ -39,14 +39,6 @@ <h5>
     </a>
 {% endif %}
 
-{% if container.date_start_edit_link %}
-    <a href="{{ container.date_start_edit_link }}" class="d-block mb-3">
-        {% trans "Startdatum wijzigen" %}
-        <img src="{% static 'proposals/images/pencil.png' %}"
-            title="{% trans 'Startdatum wijzigen' %}" />
-    </a>
-{% endif %}
-
 {% if container.edit_link %}
 <a href="{{ container.edit_link }}" class="d-block mb-3">
     {% trans "Documenten wijzigen" %}
diff --git a/reviews/templates/reviews/vue_templates/review_list.html b/reviews/templates/reviews/vue_templates/review_list.html
index 8eafa24eb..b9f90fcea 100644
--- a/reviews/templates/reviews/vue_templates/review_list.html
+++ b/reviews/templates/reviews/vue_templates/review_list.html
@@ -118,10 +118,7 @@ <h4>
                 {{ review.get_stage_display }}
                 {% endverbatim %}
             </div>
-            {# For some reason context.review.REVISION and other class variables of continuation are None?#}
-            {# Only context.review.GO returns 0 for me, as it should #}
-            {# Which is why I've hardcoded the 1 here ... #}
-            <div class="ufl-undertitle-line" v-if="review.stage === context.review.CLOSED && review.continuation === 1">
+            <div class="ufl-undertitle-line" v-if="review.stage === context.review.CLOSED && review.continuation === context.review.REVISION">
                 {% trans "Reviewronde beëindigd: " %}
                 {% verbatim %}
                 {{ review.date_end | date("DD-MM-YYYY") }}
diff --git a/reviews/templatetags/documents_list.py b/reviews/templatetags/documents_list.py
index 38611afac..19b5972b4 100644
--- a/reviews/templatetags/documents_list.py
+++ b/reviews/templatetags/documents_list.py
@@ -165,7 +165,6 @@ def __init__(self, header, **kwargs):
 
         self.edit_link = False
         self.dmp_edit_link = False
-        self.date_start_edit_link = False
         self.header = header
         self.items = []
 
@@ -223,10 +222,6 @@ def documents_list(review, user):
 
     pdf_container.items.append(proposal_pdf)
 
-    if is_secretary(user):
-        pdf_container.date_start_edit_link = reverse('proposals:update_date_start',
-                                                     args=[proposal.pk])
-
     # Pre-approval
     if proposal.pre_approval_pdf:
 
diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py
index a9d61bc2c..41801ca66 100644
--- a/reviews/utils/review_actions.py
+++ b/reviews/utils/review_actions.py
@@ -22,6 +22,7 @@ def __init__(self, review, user):
                                DiscontinueReview(review, user),
                                SendConfirmation(review, user),
                                ChangeArchiveStatus(review, user),
+                               ChangeDateStart(review, user),
         ]
         self.ufl_actions = []
 
@@ -281,4 +282,24 @@ def description(self):
             return _('Verberg aanvraag uit het archief')
         else:
             return _('Plaats aanvraag in het archief.')
+        
+class ChangeDateStart(ReviewAction):
+
+    def is_available(self):
+
+        user = self.user
+
+        user_groups = user.groups.values_list("name", flat=True)
+        if not settings.GROUP_SECRETARY in user_groups:
+            return False
+        
+        return True
+    
+    def action_url(self):
+
+        return reverse('proposals:update_date_start', args=(self.review.proposal.pk,))
+
+    def description(self):
+
+        return _('Startdatum wijzigen')
 

From f8e57cbf33c6cdf7da3470bd25c4d050c915ca55 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 8 Nov 2023 16:41:53 +0100
Subject: [PATCH 065/148] msgcat again ...

---
 locale/en/LC_MESSAGES/django.mo | Bin 149824 -> 148888 bytes
 locale/en/LC_MESSAGES/django.po | 975 +++++++++++++-------------------
 2 files changed, 404 insertions(+), 571 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 41f2784f491f506863bab211539321cea43c0095..7f7aaf9ee8ba9bd0b2971da546689db7d244d140 100644
GIT binary patch
delta 19315
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
VJG7IhvYp473XE=M*9gy@{{uS@$ZG%q

delta 20334
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

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 7bfd49009..53741844f 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-08 15:47+0100\n"
+"POT-Creation-Date: 2023-11-07 10:34+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -38,9 +38,9 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
 #: faqs/menus.py:17 main/templates/base/menu.html:134
 #: main/templates/main/index.html:209
-#: proposals/templates/proposals/proposal_pdf.html:430
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
+#: proposals/utils/pdf_diff_logic.py:859
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -109,9 +109,8 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: feedback/templates/feedback/feedback_form.html:23
 #: observations/templates/observations/observation_update_attachments.html:39
 #: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:294
+#: proposals/templates/proposals/proposal_diff.html:58
 #: proposals/templates/proposals/proposal_update_attachments.html:26
-#: proposals/templates/proposals/proposal_update_date_start.html:29
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
 #: reviews/templates/reviews/review_assign_form.html:46
@@ -240,9 +239,8 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
-#: proposals/templates/proposals/diff/intervention.html:4
-#: proposals/templates/proposals/proposal_pdf.html:285
 #: proposals/templates/proposals/proposal_pdf_empty.html:186
+#: proposals/utils/pdf_diff_logic.py:586
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -284,7 +282,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:561 proposals/forms.py:635 proposals/forms.py:650
+#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -303,11 +301,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:15
+#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:15
+#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "nee"
 msgstr "no"
 
@@ -360,7 +358,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:79
+#: proposals/templates/proposals/proposal_pdf.html:119
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
 msgid "E-mail"
 msgstr "E-mail"
@@ -399,7 +397,7 @@ msgstr "Phase"
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
-#: reviews/templates/reviews/vue_templates/review_list.html:157
+#: reviews/templates/reviews/vue_templates/review_list.html:151
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
@@ -407,7 +405,7 @@ msgstr "Date submitted"
 #: reviews/templates/reviews/committee_members_workload.html:27
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
-#: reviews/templates/reviews/vue_templates/review_list.html:167
+#: reviews/templates/reviews/vue_templates/review_list.html:161
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
@@ -419,7 +417,7 @@ msgstr "My decision"
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
-#: reviews/templates/reviews/vue_templates/review_list.html:137
+#: reviews/templates/reviews/vue_templates/review_list.html:131
 msgid "Afhandeling"
 msgstr "Conclusion"
 
@@ -470,7 +468,7 @@ msgstr "Website export text"
 #: proposals/templates/proposals/proposal_confirmation.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:88
-#: reviews/utils/review_actions.py:245
+#: reviews/utils/review_actions.py:244
 msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
@@ -1156,7 +1154,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1240,9 +1238,8 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
-#: proposals/templates/proposals/diff/observation.html:4
-#: proposals/templates/proposals/proposal_pdf.html:297
 #: proposals/templates/proposals/proposal_pdf_empty.html:229
+#: proposals/utils/pdf_diff_logic.py:642
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1268,7 +1265,6 @@ msgstr "Recording behaviour"
 #: proposals/templates/proposals/proposal_update_attachments.html:7
 #: proposals/templates/proposals/proposal_update_attachments.html:14
 #: proposals/templates/proposals/proposal_update_attachments.html:25
-#: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
 #: studies/templates/studies/study_update_attachments.html:14
 #: studies/templates/studies/study_update_attachments.html:25
@@ -1311,7 +1307,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:43 proposals/models.py:221
+#: proposals/forms.py:42 proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1320,19 +1316,19 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:64 proposals/forms.py:271 proposals/validators.py:25
+#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:135
+#: proposals/forms.py:133
 msgid "Selecteer..."
 msgstr "Select..."
 
-#: proposals/forms.py:141
+#: proposals/forms.py:140
 msgid "Docent"
 msgstr "Professor"
 
-#: proposals/forms.py:142
+#: proposals/forms.py:141
 msgid ""
 "Vul hier de docent van de cursus in waarbinnen je deze portal moet "
 "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De "
@@ -1343,19 +1339,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:190
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
+#: proposals/forms.py:192
+msgid "Je dient een promotor/begeleider op te geven."
+msgstr "You are required to specify a promotor/supervisor."
 
-#: proposals/forms.py:205
+#: proposals/forms.py:199
+msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
+msgstr "You cannot submit yourself as the promotor/supervisor."
+
+#: proposals/forms.py:213
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:210
+#: proposals/forms.py:218
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:220
+#: proposals/forms.py:228
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1363,7 +1363,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:230
+#: proposals/forms.py:238
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1376,23 +1376,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:257
+#: proposals/forms.py:265
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:277 proposals/models.py:536
+#: proposals/forms.py:285 proposals/models.py:538
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:279 proposals/models.py:538
+#: proposals/forms.py:287 proposals/models.py:540
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:319 proposals/forms.py:354
+#: proposals/forms.py:327 proposals/forms.py:362
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:321 proposals/forms.py:356
+#: proposals/forms.py:329 proposals/forms.py:364
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1402,11 +1402,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:328
+#: proposals/forms.py:336
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:329
+#: proposals/forms.py:337
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1414,69 +1414,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:363
+#: proposals/forms.py:371
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:364
+#: proposals/forms.py:372
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:419 proposals/forms.py:549 proposals/forms.py:683
+#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:427
+#: proposals/forms.py:435
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:485
+#: proposals/forms.py:493
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:493
+#: proposals/forms.py:501
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:495
+#: proposals/forms.py:503
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:497
+#: proposals/forms.py:505
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:499
+#: proposals/forms.py:507
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:501
+#: proposals/forms.py:509
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:503
+#: proposals/forms.py:511
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:505
+#: proposals/forms.py:513
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:507
+#: proposals/forms.py:515
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:509
+#: proposals/forms.py:517
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:511
+#: proposals/forms.py:519
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:555
+#: proposals/forms.py:563
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1484,19 +1484,15 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:579
-msgid "Nieuwe beoogde startdatum"
-msgstr "New intended start date"
-
-#: proposals/forms.py:642
+#: proposals/forms.py:640
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:646
+#: proposals/forms.py:644
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:658
+#: proposals/forms.py:656
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1504,7 +1500,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:689
+#: proposals/forms.py:687
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1792,7 +1788,8 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 reviews/models.py:184
+#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980
+#: reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -1859,78 +1856,86 @@ msgstr ""
 #: proposals/models.py:517
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
+msgid "Promotor/Begeleider"
+msgstr "Promotor/Supervisor"
 
 #: proposals/models.py:520
 msgid ""
-"Aan het einde van de procedure kan je deze aanvraag ter\n"
-"        verificatie naar je eindverantwoordelijke sturen. De\n"
-"        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-"en\n"
-"        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-"        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-"        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog "
-"wel\n"
-"        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor "
-"je de\n"
-"        aanvraag indient."
-msgstr ""
-"At the end of the procedure, you can send this application to the researcher "
-"with final responsibility for verification. The researcher with final "
-"responsibility can then make adjustments and submit the study to the FEtC-H. "
-"<strong>Note</strong>: if you cannot find your supervisor using this field, "
-"they may have to log into this portal at least once with their Solis-ID. You "
-"can continue filling in the application while you wait for them to do this, "
-"but remember to come back and fill in this field before submitting."
-
-#: proposals/models.py:545
+"Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
+"                    naar je promotor of begeleider gestuurd worden. Deze "
+"persoon \n"
+"                    is de eindverantwoordelijk onderzoeker, en zal de "
+"aanvraag \n"
+"                    vervolgens waar nodig kunnen aanpassen en indienen bij "
+"de FETC-GW.\n"
+"                    <br><br><strong>Belangrijk</strong>: als je je promotor "
+"of \n"
+"                    begeleider niet kunt vinden met dit veld, dan moeten "
+"zij \n"
+"                    waarschijnlijk eerst één keer inloggen in deze portal. \n"
+"                    Je kunt nog wel verder met de aanvraag, maar vergeet dit "
+"veld \n"
+"                    niet in te vullen voor je de aanvraag indient. Je "
+"aanvraag \n"
+"                    zal dan namelijk niet in behandeling kunnen worden "
+"genomen."
+msgstr ""
+"At the end of the procedure, you need to send this application to your "
+"promotor or supervisor for verification. this person is the researcher with "
+"final responsibility and can then make adjustments and submit the study to "
+"the FEtC-H. <strong>Note</strong>: if you cannot find your promotor or "
+"supervisor using this field, they may have to log into this portal at least "
+"once with their Solis-ID. You can continue filling in the application, while "
+"you wait for them to do this, but remember to come back and fill in this "
+"field before submitting."
+
+#: proposals/models.py:547
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:617
+#: proposals/models.py:619
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:617 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:623
+#: proposals/models.py:625
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:628
+#: proposals/models.py:630
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:630
+#: proposals/models.py:632
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:632
+#: proposals/models.py:634
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:730
+#: proposals/models.py:732
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:731
+#: proposals/models.py:733
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:732
+#: proposals/models.py:734
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:736
+#: proposals/models.py:738
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1938,11 +1943,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:750
+#: proposals/models.py:752
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:756
+#: proposals/models.py:758
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1950,7 +1955,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:758
+#: proposals/models.py:760
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1971,7 +1976,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:774
+#: proposals/models.py:776
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1980,15 +1985,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:781
+#: proposals/models.py:783
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:786
+#: proposals/models.py:788
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:824
+#: proposals/models.py:826
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2052,298 +2057,6 @@ msgstr "Old"
 msgid "Nieuw"
 msgstr "New"
 
-#: proposals/templates/proposals/diff/intervention.html:8
-msgid ""
-"De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-"niet bevat."
-msgstr ""
-"This revision involves intervention research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/intervention.html:12
-msgid ""
-"De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-"dat wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application does include this."
-
-#: proposals/templates/proposals/diff/intervention.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een interventieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve intervention "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/intervention_v1.html:8
-#: proposals/templates/proposals/diff/intervention_v2.html:8
-#: proposals/templates/proposals/diff/observation_v1.html:9
-#: proposals/templates/proposals/diff/observation_v2.html:9
-#: proposals/templates/proposals/diff/sessions.html:23
-#: proposals/templates/proposals/diff/sessions.html:42
-#: proposals/templates/proposals/diff/sessions.html:103
-#: proposals/templates/proposals/diff/sessions.html:174
-#: proposals/templates/proposals/diff/study.html:25
-#: proposals/templates/proposals/diff/study.html:151
-#: proposals/templates/proposals/diff/study.html:215
-#: proposals/templates/proposals/proposal_diff.html:53
-#: proposals/templates/proposals/proposal_diff.html:178
-#: proposals/templates/proposals/proposal_diff.html:211
-#: proposals/templates/proposals/proposal_diff.html:244
-#: proposals/templates/proposals/proposal_diff.html:268
-msgid "Originele aanvraag"
-msgstr "Original application"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:9
-#: proposals/templates/proposals/diff/intervention_v2.html:9
-#: proposals/templates/proposals/diff/observation_v1.html:10
-#: proposals/templates/proposals/diff/observation_v2.html:10
-#: proposals/templates/proposals/diff/sessions.html:24
-#: proposals/templates/proposals/diff/sessions.html:43
-#: proposals/templates/proposals/diff/sessions.html:104
-#: proposals/templates/proposals/diff/sessions.html:175
-#: proposals/templates/proposals/diff/study.html:26
-#: proposals/templates/proposals/diff/study.html:152
-#: proposals/templates/proposals/diff/study.html:216
-#: proposals/templates/proposals/proposal_diff.html:54
-#: proposals/templates/proposals/proposal_diff.html:179
-#: proposals/templates/proposals/proposal_diff.html:212
-#: proposals/templates/proposals/proposal_diff.html:245
-#: proposals/templates/proposals/proposal_diff.html:269
-msgid "Revisie/amendement"
-msgstr "Revision/amendment"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:28
-#: proposals/templates/proposals/diff/intervention_v1.html:33
-#: proposals/templates/proposals/diff/intervention_v1.html:42
-#: proposals/templates/proposals/diff/intervention_v1.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:28
-#: proposals/templates/proposals/diff/intervention_v2.html:33
-#: proposals/templates/proposals/diff/intervention_v2.html:42
-#: proposals/templates/proposals/diff/intervention_v2.html:47
-#: proposals/templates/proposals/diff/intervention_v2.html:62
-#: proposals/templates/proposals/diff/intervention_v2.html:67
-#: proposals/templates/proposals/diff/observation_v1.html:43
-#: proposals/templates/proposals/diff/observation_v1.html:48
-#: proposals/templates/proposals/diff/observation_v2.html:43
-#: proposals/templates/proposals/diff/observation_v2.html:48
-#: proposals/templates/proposals/diff/sessions.html:62
-#: proposals/templates/proposals/diff/sessions.html:67
-#: proposals/templates/proposals/diff/sessions.html:76
-#: proposals/templates/proposals/diff/sessions.html:81
-msgid "ja,nee,"
-msgstr "yes,no,"
-
-#: proposals/templates/proposals/diff/intervention_v1.html:87
-#: proposals/templates/proposals/diff/intervention_v1.html:92
-#: proposals/templates/proposals/diff/intervention_v2.html:102
-#: proposals/templates/proposals/diff/intervention_v2.html:107
-#: proposals/templates/proposals/diff/observation_v1.html:29
-#: proposals/templates/proposals/diff/observation_v1.html:34
-#: proposals/templates/proposals/diff/observation_v1.html:68
-#: proposals/templates/proposals/diff/observation_v1.html:73
-#: proposals/templates/proposals/diff/observation_v1.html:81
-#: proposals/templates/proposals/diff/observation_v1.html:86
-#: proposals/templates/proposals/diff/observation_v1.html:94
-#: proposals/templates/proposals/diff/observation_v1.html:99
-#: proposals/templates/proposals/diff/observation_v1.html:108
-#: proposals/templates/proposals/diff/observation_v1.html:113
-#: proposals/templates/proposals/diff/observation_v1.html:122
-#: proposals/templates/proposals/diff/observation_v1.html:127
-#: proposals/templates/proposals/diff/observation_v2.html:29
-#: proposals/templates/proposals/diff/observation_v2.html:34
-#: proposals/templates/proposals/diff/observation_v2.html:73
-#: proposals/templates/proposals/diff/observation_v2.html:78
-#: proposals/templates/proposals/diff/observation_v2.html:93
-#: proposals/templates/proposals/diff/observation_v2.html:98
-#: proposals/templates/proposals/diff/observation_v2.html:113
-#: proposals/templates/proposals/diff/observation_v2.html:118
-#: proposals/templates/proposals/diff/observation_v2.html:132
-#: proposals/templates/proposals/diff/observation_v2.html:137
-#: proposals/templates/proposals/diff/observation_v2.html:146
-#: proposals/templates/proposals/diff/observation_v2.html:151
-#: proposals/templates/proposals/diff/sessions.html:151
-#: proposals/templates/proposals/diff/sessions.html:156
-#: proposals/templates/proposals/diff/study.html:43
-#: proposals/templates/proposals/diff/study.html:48
-#: proposals/templates/proposals/diff/study.html:63
-#: proposals/templates/proposals/diff/study.html:64
-#: proposals/templates/proposals/diff/study.html:220
-#: proposals/templates/proposals/diff/study.html:221
-#: proposals/templates/proposals/diff/study.html:262
-#: proposals/templates/proposals/diff/study.html:267
-#: proposals/templates/proposals/pdf/intervention_v1.html:16
-#: proposals/templates/proposals/pdf/intervention_v1.html:20
-#: proposals/templates/proposals/pdf/intervention_v1.html:43
-#: proposals/templates/proposals/pdf/intervention_v2.html:16
-#: proposals/templates/proposals/pdf/intervention_v2.html:20
-#: proposals/templates/proposals/pdf/intervention_v2.html:28
-#: proposals/templates/proposals/pdf/intervention_v2.html:48
-#: proposals/templates/proposals/pdf/intervention_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v1.html:16
-#: proposals/templates/proposals/pdf/observation_v1.html:20
-#: proposals/templates/proposals/pdf/observation_v1.html:31
-#: proposals/templates/proposals/pdf/observation_v1.html:34
-#: proposals/templates/proposals/pdf/observation_v1.html:37
-#: proposals/templates/proposals/pdf/observation_v1.html:41
-#: proposals/templates/proposals/pdf/observation_v1.html:45
-#: proposals/templates/proposals/pdf/observation_v2.html:16
-#: proposals/templates/proposals/pdf/observation_v2.html:20
-#: proposals/templates/proposals/pdf/observation_v2.html:34
-#: proposals/templates/proposals/pdf/observation_v2.html:42
-#: proposals/templates/proposals/pdf/observation_v2.html:50
-#: proposals/templates/proposals/pdf/observation_v2.html:57
-#: proposals/templates/proposals/pdf/observation_v2.html:67
-#: proposals/templates/proposals/proposal_diff.html:95
-#: proposals/templates/proposals/proposal_diff.html:96
-#: proposals/templates/proposals/proposal_diff.html:121
-#: proposals/templates/proposals/proposal_diff.html:122
-#: proposals/templates/proposals/proposal_diff.html:216
-#: proposals/templates/proposals/proposal_diff.html:217
-#: proposals/templates/proposals/proposal_diff.html:221
-#: proposals/templates/proposals/proposal_diff.html:222
-#: proposals/templates/proposals/proposal_diff.html:249
-#: proposals/templates/proposals/proposal_diff.html:250
-#: proposals/templates/proposals/proposal_diff.html:273
-#: proposals/templates/proposals/proposal_diff.html:274
-#: proposals/templates/proposals/proposal_pdf.html:109
-#: proposals/templates/proposals/proposal_pdf.html:125
-#: proposals/templates/proposals/proposal_pdf.html:182
-#: proposals/templates/proposals/proposal_pdf.html:185
-#: proposals/templates/proposals/proposal_pdf.html:204
-#: proposals/templates/proposals/proposal_pdf.html:223
-#: proposals/templates/proposals/proposal_pdf.html:232
-#: proposals/templates/proposals/proposal_pdf.html:274
-#: proposals/templates/proposals/proposal_pdf.html:329
-#: proposals/templates/proposals/proposal_pdf.html:333
-#: proposals/templates/proposals/proposal_pdf.html:369
-#: proposals/templates/proposals/proposal_pdf.html:435
-#: proposals/templates/proposals/proposal_pdf.html:452
-#: proposals/templates/proposals/proposal_pdf.html:516
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/diff/observation.html:8
-msgid ""
-"De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves observation research, whereas the original "
-"application does not."
-
-#: proposals/templates/proposals/diff/observation.html:12
-msgid ""
-"De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat "
-"wel bevat."
-msgstr ""
-"This revision does not involve intervention research, whereas the original "
-"application involve this."
-
-#: proposals/templates/proposals/diff/observation.html:28
-msgid ""
-"De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-"maar deze zijn niet te vergelijken. Dit komt doordat de revisie een andere "
-"versie van het formulier gebruikt."
-msgstr ""
-"This revision and the original application both involve observation "
-"research, but this aspect cannot be compared. The revision uses a newer "
-"version of the form than the original."
-
-#: proposals/templates/proposals/diff/observation_v1.html:139
-#: proposals/templates/proposals/diff/observation_v1.html:140
-#: proposals/templates/proposals/diff/study.html:233
-#: proposals/templates/proposals/diff/study.html:239
-#: proposals/templates/proposals/diff/study.html:247
-#: proposals/templates/proposals/diff/study.html:253
-#: proposals/templates/proposals/pdf/observation_v1.html:53
-#: proposals/templates/proposals/proposal_diff.html:228
-#: proposals/templates/proposals/proposal_diff.html:232
-#: proposals/templates/proposals/proposal_pdf.html:189
-#: proposals/templates/proposals/proposal_pdf.html:444
-#: proposals/templates/proposals/proposal_pdf.html:447
-#: proposals/templates/proposals/proposal_pdf.html:462
-#: proposals/templates/proposals/proposal_pdf.html:467
-#: proposals/templates/proposals/proposal_pdf.html:472
-#: proposals/templates/proposals/proposal_pdf.html:486
-#: proposals/templates/proposals/proposal_pdf.html:491
-#: proposals/templates/proposals/proposal_pdf.html:507
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-msgid "Download"
-msgstr "Download"
-
-#: proposals/templates/proposals/diff/sessions.html:7
-#: proposals/templates/proposals/proposal_pdf.html:308
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
-#: proposals/templates/proposals/diff/sessions.html:11
-msgid ""
-"De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
-"bevat."
-msgstr ""
-"This revision involves tasks research, whereas the original application does "
-"not."
-
-#: proposals/templates/proposals/diff/sessions.html:15
-msgid ""
-"De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel "
-"bevat."
-msgstr ""
-"This revision does not involve tasks research, whereas the original "
-"application does involve this."
-
-#: proposals/templates/proposals/diff/sessions.html:170
-#: proposals/templates/proposals/proposal_pdf.html:381
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: tasks/templates/tasks/task_end.html:7 tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/diff/study.html:9
-#: proposals/templates/proposals/proposal_pdf.html:215
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/diff/study.html:14
-msgid "Dit traject is nieuw in de revisie."
-msgstr "This trajectory was added in this revision."
-
-#: proposals/templates/proposals/diff/study.html:18
-msgid "Dit traject is weggehaald uit de revisie"
-msgstr "This trajectory was removed in this revision."
-
-#: proposals/templates/proposals/diff/study.html:144
-#: proposals/templates/proposals/proposal_pdf.html:391
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/diff/study.html:206
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
 #: proposals/templates/proposals/proposal_confirm_delete.html:6
 #: proposals/templates/proposals/proposal_confirm_delete.html:12
 msgid "Aanvraag verwijderen"
@@ -2509,7 +2222,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/templates/proposals/proposal_pdf.html:499
+#: proposals/utils/pdf_diff_logic.py:954
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2639,11 +2352,14 @@ msgstr ""
 "gw@uu.nl</a>."
 
 #: proposals/templates/proposals/proposal_diff.html:11
-#: proposals/templates/proposals/proposal_diff.html:37
 msgid "Overzicht van wijzigingen"
 msgstr "Summary of changes"
 
-#: proposals/templates/proposals/proposal_diff.html:39
+#: proposals/templates/proposals/proposal_diff.html:38
+msgid "Overzicht van wijzigingen bij aanmelding "
+msgstr "Summary of changes of application "
+
+#: proposals/templates/proposals/proposal_diff.html:42
 msgid ""
 "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten "
 "opzichte van de originele aanvraag."
@@ -2651,72 +2367,28 @@ msgstr ""
 "This overview shows the changes made in the revision/amendment with respect "
 "to the original application."
 
-#: proposals/templates/proposals/proposal_diff.html:49
 #: proposals/templates/proposals/proposal_form.html:7
-#: proposals/templates/proposals/proposal_form.html:92
+#: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
-#: proposals/templates/proposals/proposal_pdf.html:82
 #: proposals/templates/proposals/proposal_pdf_empty.html:60
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
-#: proposals/utils/proposal_utils.py:40 proposals/utils/proposal_utils.py:55
-#: proposals/utils/validate_proposal.py:33
+#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40
+#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_diff.html:133
-#: proposals/templates/proposals/proposal_diff.html:134
-#: proposals/templates/proposals/proposal_pdf.html:133
-#: proposals/templates/proposals/proposal_pdf.html:520
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_diff.html:174
-#: proposals/templates/proposals/proposal_pdf.html:159
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_diff.html:207
-#: proposals/templates/proposals/proposal_pdf.html:179
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_diff.html:240
-#: proposals/templates/proposals/proposal_pdf.html:201
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_diff.html:264
-#: proposals/templates/proposals/proposal_submit.html:179
-msgid "Concept-aanmelding versturen"
-msgstr "Submit draft application"
-
-#: proposals/templates/proposals/proposal_form.html:72
+#: proposals/templates/proposals/proposal_form.html:56
 #: proposals/templates/proposals/proposal_form_pre_approved.html:72
 #: proposals/templates/proposals/proposal_submit.html:33
 msgid "Aantal woorden:"
 msgstr "Number of words:"
 
-#: proposals/templates/proposals/proposal_form.html:89
+#: proposals/templates/proposals/proposal_form.html:73
 #: proposals/templates/proposals/proposal_submit.html:168
 msgid ""
 "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling "
@@ -2725,7 +2397,7 @@ msgstr ""
 "You are currently editing a practice application. These can not be submitted "
 "to the FETC-H for review."
 
-#: proposals/templates/proposals/proposal_form.html:94
+#: proposals/templates/proposals/proposal_form.html:78
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2735,7 +2407,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form.html:121
+#: proposals/templates/proposals/proposal_form.html:105
 msgid ""
 "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag "
 "ligt, kan de FETC geen officiële goedkeuring meer geven."
@@ -2843,7 +2515,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:44
+#: proposals/templates/proposals/proposal_pdf.html:87
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
@@ -2852,47 +2524,31 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:50
+#: proposals/templates/proposals/proposal_pdf.html:93
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:66
+#: proposals/templates/proposals/proposal_pdf.html:109
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:70
+#: proposals/templates/proposals/proposal_pdf.html:113
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:73
+#: proposals/templates/proposals/proposal_pdf.html:116
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:76
+#: proposals/templates/proposals/proposal_pdf.html:118
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
 
-#: proposals/templates/proposals/proposal_pdf.html:194
-msgid "Niet aangeleverd"
-msgstr "Not provided"
-
-#: proposals/templates/proposals/proposal_pdf.html:481
-#: proposals/templates/proposals/study_consent.html:138
-msgid "Extra formulieren"
-msgstr "Additional forms"
-
-#: proposals/templates/proposals/proposal_pdf.html:513
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
 #: proposals/templates/proposals/proposal_pdf_empty.html:42
 msgid ""
 "\n"
@@ -2915,6 +2571,49 @@ msgstr ""
 "            Reference number <em>reference number</em>\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:104
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+#: proposals/utils/pdf_diff_logic.py:478
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:120
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+#: proposals/utils/pdf_diff_logic.py:503
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:134
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/pdf_diff_logic.py:511
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:145
+#: proposals/utils/pdf_diff_logic.py:529
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:279
+#: proposals/utils/pdf_diff_logic.py:733
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
 #: proposals/templates/proposals/proposal_pdf_empty.html:286
 #: proposals/templates/proposals/proposal_start.html:62
 #: proposals/templates/proposals/proposal_start_practice.html:63
@@ -2929,6 +2628,30 @@ msgstr "Session"
 msgid "Taak"
 msgstr "Task"
 
+#: proposals/templates/proposals/proposal_pdf_empty.html:335
+#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
+#: tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:343
+#: proposals/utils/pdf_diff_logic.py:821
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:372
+msgid "Informed consent formulieren voor het onderzoek"
+msgstr "Informed consent forms for the study"
+
+#: proposals/templates/proposals/proposal_pdf_empty.html:389
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
+#: proposals/templates/proposals/proposal_submit.html:181
+#: proposals/utils/pdf_diff_logic.py:962
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
 #, python-format
 msgid ""
@@ -2954,6 +2677,25 @@ msgstr ""
 "            Reference number %(reference_number)s\n"
 "            "
 
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
+msgid "onbekend"
+msgstr "unknown"
+
+#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
+#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
+#: proposals/utils/pdf_diff_logic.py:281
+msgid "Download"
+msgstr "Download"
+
 #: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
 #, python-format
 msgid ""
@@ -3059,6 +2801,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
+#: proposals/utils/pdf_diff_logic.py:328
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -3364,6 +3107,10 @@ msgstr ""
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
+#: proposals/templates/proposals/proposal_submit.html:179
+msgid "Concept-aanmelding versturen"
+msgstr "Submit draft application"
+
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3413,25 +3160,6 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
-#: proposals/templates/proposals/proposal_update_date_start.html:14
-#: proposals/templates/proposals/proposal_update_date_start.html:28
-msgid "Startdatum aanpassen"
-msgstr "Edit start date"
-
-#: proposals/templates/proposals/proposal_update_date_start.html:17
-msgid ""
-"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
-"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
-"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
-"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
-"met"
-msgstr ""
-"On this page, the start date of proposal %(title)s (reference number "
-"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
-"already been concluded, the new start date will not be displayed in the PDF. "
-"If you would like the PDF to be generated with the new start date, please "
-"reach out to "
-
 #: proposals/templates/proposals/study_consent.html:27
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
@@ -3501,6 +3229,10 @@ msgstr ""
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
+#: proposals/templates/proposals/study_consent.html:138
+msgid "Extra formulieren"
+msgstr "Additional forms"
+
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3522,6 +3254,14 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
+#: proposals/templates/proposals/table_with_header_diff.html:13
+msgid "Originele aanvraag"
+msgstr "Original application"
+
+#: proposals/templates/proposals/table_with_header_diff.html:14
+msgid "Revisie/amendement"
+msgstr "Revision/amendment"
+
 #: proposals/templates/proposals/translated_consent_forms.html:25
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
@@ -3583,7 +3323,7 @@ msgstr "Route:"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:187
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
-#: reviews/templates/reviews/vue_templates/review_list.html:190
+#: reviews/templates/reviews/vue_templates/review_list.html:184
 msgid "Indieners"
 msgstr "Applicants"
 
@@ -3604,7 +3344,7 @@ msgstr "Hide"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:139
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
-#: reviews/templates/reviews/vue_templates/review_list.html:145
+#: reviews/templates/reviews/vue_templates/review_list.html:139
 msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
@@ -3625,6 +3365,50 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
+#: proposals/utils/pdf_diff_logic.py:93
+msgid ""
+"Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
+"aanvraag."
+msgstr ""
+"This section was added in the revision, and did not feature in the original "
+"application."
+
+#: proposals/utils/pdf_diff_logic.py:100
+msgid ""
+"Dit onderdeel bestond in de originele aanvraag, maar niet meer in de revisie."
+msgstr ""
+"This section was present in the original application, but was removed for "
+"the revision."
+
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126
+msgid "Onbekend"
+msgstr "Unknown"
+
+#: proposals/utils/pdf_diff_logic.py:284
+msgid "Niet aangeleverd"
+msgstr "Not provided"
+
+#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348
+#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381
+msgid "Traject "
+msgstr "Trajectory "
+
+#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384
+msgid "sessie "
+msgstr "session "
+
+#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392
+msgid "Sessie "
+msgstr "Session "
+
+#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394
+msgid ", taak "
+msgstr ", task "
+
+#: proposals/utils/pdf_diff_logic.py:930
+msgid "Extra formulieren "
+msgstr "Additional forms "
+
 #: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
 #: proposals/utils/validate_proposal.py:76
 msgid "Ethische toetsing nodig door een METC?"
@@ -3658,11 +3442,11 @@ msgstr "Forms"
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:416
+#: proposals/utils/proposal_utils.py:415
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:418
+#: proposals/utils/proposal_utils.py:417
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
@@ -3756,11 +3540,11 @@ msgstr ""
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:397
+#: proposals/views/proposal_views.py:385
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:498
+#: proposals/views/proposal_views.py:486
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3801,7 +3585,7 @@ msgstr "Stage"
 #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
-#: reviews/templates/reviews/vue_templates/review_list.html:183
+#: reviews/templates/reviews/vue_templates/review_list.html:177
 msgid "Route"
 msgstr "Route"
 
@@ -3918,10 +3702,6 @@ msgstr "Not to be assessed further"
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:126
-msgid "Onbekend"
-msgstr "Unknown"
-
 #: reviews/models.py:143
 msgid "nog geen route"
 msgstr "no route assigned"
@@ -4534,7 +4314,7 @@ msgid "Verplaats naar andere kamer"
 msgstr "Move study to different reviewing chamber"
 
 #: reviews/templates/reviews/vue_templates/review_list.html:95
-#: reviews/utils/review_actions.py:282
+#: reviews/utils/review_actions.py:281
 msgid "Verberg aanvraag uit het archief"
 msgstr "Remove this application from the archive"
 
@@ -4542,10 +4322,6 @@ msgstr "Remove this application from the archive"
 msgid "Plaats aanvraag in archief"
 msgstr "Add this application to the archive"
 
-#: reviews/templates/reviews/vue_templates/review_list.html:122
-msgid "Reviewronde beëindigd: "
-msgstr "Reviewing round ended: "
-
 #: reviews/templatetags/documents_list.py:145
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
@@ -4602,34 +4378,30 @@ msgstr "Information letter for the parents"
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
-#: reviews/utils/review_actions.py:130
+#: reviews/utils/review_actions.py:129
 msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
-#: reviews/utils/review_actions.py:156
+#: reviews/utils/review_actions.py:155
 msgid "Deze aanvraag afsluiten"
 msgstr "Conclude this application"
 
-#: reviews/utils/review_actions.py:186
+#: reviews/utils/review_actions.py:185
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
 msgstr "Discontinue assessment of this application"
 
-#: reviews/utils/review_actions.py:216
+#: reviews/utils/review_actions.py:215
 msgid "Verander aangestelde commissieleden"
 msgstr "Change appointment of committee members"
 
-#: reviews/utils/review_actions.py:246
+#: reviews/utils/review_actions.py:245
 msgid "Datum van bevestigingsbrief aanpassen"
 msgstr "Change date of confirmation letter"
 
-#: reviews/utils/review_actions.py:284
+#: reviews/utils/review_actions.py:283
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_actions.py:304
-msgid "Startdatum wijzigen"
-msgstr "Edit start date"
-
 #: reviews/utils/review_utils.py:54
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
@@ -5931,79 +5703,115 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
-#~ msgid "Je dient een promotor/begeleider op te geven."
-#~ msgstr "You are required to specify a promotor/supervisor."
+#: proposals/forms.py:190
+msgid "Je dient een eindverantwoordelijke op te geven."
+msgstr "You are required to specify the researcher with final responsibility."
+
+#: proposals/forms.py:579
+msgid "Nieuwe beoogde startdatum"
+msgstr "New intended start date"
+
+#: proposals/models.py:517
+#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
+#: proposals/templates/proposals/vue_templates/proposal_list.html:166
+msgid "Eindverantwoordelijke onderzoeker"
+msgstr "Researcher with final responsibility"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:14
+#: proposals/templates/proposals/proposal_update_date_start.html:28
+msgid "Startdatum aanpassen"
+msgstr "Edit start date"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:17
+msgid ""
+"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
+"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
+"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
+"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
+"met"
+msgstr ""
+"On this page, the start date of proposal %(title)s (reference number "
+"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
+"already been concluded, the new start date will not be displayed in the PDF. "
+"If you would like the PDF to be generated with the new start date, please "
+"reach out to "
 
-#~ msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
-#~ msgstr "You cannot submit yourself as the promotor/supervisor."
+#: reviews/templates/reviews/vue_templates/review_list.html:122
+msgid "Reviewronde beëindigd: "
+msgstr "Reviewing round ended: "
 
-#~ msgid "Promotor/Begeleider"
-#~ msgstr "Promotor/Supervisor"
+#: reviews/utils/review_actions.py:304
+msgid "Startdatum wijzigen"
+msgstr "Edit start date"
 
 #~ msgid ""
-#~ "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
-#~ "                    naar je promotor of begeleider gestuurd worden. Deze "
-#~ "persoon \n"
-#~ "                    is de eindverantwoordelijk onderzoeker, en zal de "
-#~ "aanvraag \n"
-#~ "                    vervolgens waar nodig kunnen aanpassen en indienen "
-#~ "bij de FETC-GW.\n"
-#~ "                    <br><br><strong>Belangrijk</strong>: als je je "
-#~ "promotor of \n"
-#~ "                    begeleider niet kunt vinden met dit veld, dan moeten "
-#~ "zij \n"
-#~ "                    waarschijnlijk eerst één keer inloggen in deze "
-#~ "portal. \n"
-#~ "                    Je kunt nog wel verder met de aanvraag, maar vergeet "
-#~ "dit veld \n"
-#~ "                    niet in te vullen voor je de aanvraag indient. Je "
-#~ "aanvraag \n"
-#~ "                    zal dan namelijk niet in behandeling kunnen worden "
-#~ "genomen."
+#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
 #~ msgstr ""
-#~ "At the end of the procedure, you need to send this application to your "
-#~ "promotor or supervisor for verification. this person is the researcher "
-#~ "with final responsibility and can then make adjustments and submit the "
-#~ "study to the FEtC-H. <strong>Note</strong>: if you cannot find your "
-#~ "promotor or supervisor using this field, they may have to log into this "
-#~ "portal at least once with their Solis-ID. You can continue filling in the "
-#~ "application, while you wait for them to do this, but remember to come "
-#~ "back and fill in this field before submitting."
-
-#~ msgid "Overzicht van wijzigingen bij aanmelding "
-#~ msgstr "Summary of changes of application "
+#~ "This revision involves intervention research, whereas the original "
+#~ "application does not."
 
 #~ msgid ""
-#~ "Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
-#~ "aanvraag."
+#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
 #~ msgstr ""
-#~ "This section was added in the revision, and did not feature in the "
-#~ "original application."
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application does include this."
 
 #~ msgid ""
-#~ "Dit onderdeel bestond in de originele aanvraag, maar niet meer in de "
-#~ "revisie."
+#~ "De revisie en de originele aanvraag hebben beide een "
+#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
+#~ "doordat de revisie een andere versie van het formulier gebruikt."
 #~ msgstr ""
-#~ "This section was present in the original application, but was removed for "
-#~ "the revision."
+#~ "This revision and the original application both involve intervention "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
 
-#~ msgid "Traject "
-#~ msgstr "Trajectory "
+#~ msgid "ja,nee,"
+#~ msgstr "yes,no,"
 
-#~ msgid "sessie "
-#~ msgstr "session "
+#~ msgid ""
+#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
+#~ "niet bevat."
+#~ msgstr ""
+#~ "This revision involves observation research, whereas the original "
+#~ "application does not."
 
-#~ msgid "Sessie "
-#~ msgstr "Session "
+#~ msgid ""
+#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
+#~ "dat wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve intervention research, whereas the "
+#~ "original application involve this."
 
-#~ msgid ", taak "
-#~ msgstr ", task "
+#~ msgid ""
+#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
+#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
+#~ "andere versie van het formulier gebruikt."
+#~ msgstr ""
+#~ "This revision and the original application both involve observation "
+#~ "research, but this aspect cannot be compared. The revision uses a newer "
+#~ "version of the form than the original."
 
-#~ msgid "Extra formulieren "
-#~ msgstr "Additional forms "
+#~ msgid ""
+#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
+#~ "bevat."
+#~ msgstr ""
+#~ "This revision involves tasks research, whereas the original application "
+#~ "does not."
 
-#~ msgid "Vul de datum in als 'DD-MM-YYYY'."
-#~ msgstr "Enter the date as 'YYYY-MM-DD'."
+#~ msgid ""
+#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
+#~ "wel bevat."
+#~ msgstr ""
+#~ "This revision does not involve tasks research, whereas the original "
+#~ "application does involve this."
+
+#~ msgid "Dit traject is nieuw in de revisie."
+#~ msgstr "This trajectory was added in this revision."
+
+#~ msgid "Dit traject is weggehaald uit de revisie"
+#~ msgstr "This trajectory was removed in this revision."
 
 #, python-format
 #~ msgid ""
@@ -6013,5 +5821,30 @@ msgstr "Task deleted"
 #~ "Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-"
 #~ "ID."
 
+#~ msgid ""
+#~ "Aan het einde van de procedure kan je deze aanvraag ter\n"
+#~ "        verificatie naar je eindverantwoordelijke sturen. De\n"
+#~ "        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
+#~ "en\n"
+#~ "        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
+#~ "        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
+#~ "        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt "
+#~ "nog wel\n"
+#~ "        verder met de aanvraag, maar vergeet dit veld niet in te vullen "
+#~ "voor je de\n"
+#~ "        aanvraag indient."
+#~ msgstr ""
+#~ "At the end of the procedure, you can send this application to the "
+#~ "researcher with final responsibility for verification. The researcher "
+#~ "with final responsibility can then make adjustments and submit the study "
+#~ "to the FEtC-H. <strong>Note</strong>: if you cannot find your supervisor "
+#~ "using this field, they may have to log into this portal at least once "
+#~ "with their Solis-ID. You can continue filling in the application while "
+#~ "you wait for them to do this, but remember to come back and fill in this "
+#~ "field before submitting."
+
 #~ msgid "Werkverdeling overzicht van afgelopen jaar"
 #~ msgstr "Workload overview of past year"
+
+#~ msgid "Vul de datum in als 'DD-MM-YYYY'."
+#~ msgstr "Enter the date as 'YYYY-MM-DD'."

From 78786854cfacd48fd8685089596aab6b142640fd Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Wed, 8 Nov 2023 17:33:40 +0100
Subject: [PATCH 066/148] chore: update deps

---
 requirements.in  |   4 +-
 requirements.txt | 105 +++++++++++++++++++++++++++--------------------
 2 files changed, 62 insertions(+), 47 deletions(-)

diff --git a/requirements.in b/requirements.in
index e3cd60377..6b368808a 100644
--- a/requirements.in
+++ b/requirements.in
@@ -7,7 +7,7 @@ django-impersonate
 django-simple-menu
 django-debug-toolbar
 djangorestframework
-djangosaml2<1.7  # 1.7 adds a logout bug...
+djangosaml2
 mysqlclient<2
 xhtml2pdf
 sphinx
@@ -21,7 +21,7 @@ pygments
 requests
 -e git+https://github.com/UiL-OTS-labs/django-shared-core.git@v2.0.10#egg=uil-django-core
 -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt
-cdh-django-core[federated-auth] @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0-alpha-4
+cdh-django-core[federated-auth] @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0
 python-magic
 pdftotext
 bpython
diff --git a/requirements.txt b/requirements.txt
index e789af82c..9618b7f20 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,6 @@
 #
-# This file is autogenerated by pip-compile with python 3.9
-# To update, run:
+# This file is autogenerated by pip-compile with Python 3.9
+# by the following command:
 #
 #    pip-compile --resolver=backtracking
 #
@@ -19,25 +19,25 @@ asn1crypto==1.5.1
     #   oscrypto
     #   pyhanko
     #   pyhanko-certvalidator
-babel==2.12.1
+babel==2.13.1
     # via sphinx
 blessed==1.20.0
     # via curtsies
 bpython==0.24
     # via -r requirements.in
-cdh-django-core @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0-alpha-4
+cdh-django-core @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0
     # via -r requirements.in
 certifi==2023.7.22
     # via requests
-cffi==1.15.1
+cffi==1.16.0
     # via cryptography
-charset-normalizer==3.2.0
+charset-normalizer==3.3.2
     # via requests
-click==8.1.6
+click==8.1.7
     # via pyhanko
 closure==20191111
     # via uil-django-core
-cryptography==41.0.2
+cryptography==41.0.5
     # via
     #   pyhanko
     #   pyhanko-certvalidator
@@ -45,9 +45,9 @@ cryptography==41.0.2
     #   pysaml2
 cssselect2==0.7.0
     # via svglib
-curtsies==0.4.1
+curtsies==0.4.2
     # via bpython
-cwcwidth==0.1.8
+cwcwidth==0.1.9
     # via
     #   bpython
     #   curtsies
@@ -57,7 +57,7 @@ defusedxml==0.7.1
     #   pysaml2
 deprecated==1.2.14
     # via cdh-django-core
-django==3.2.20
+django==3.2.23
     # via
     #   -r requirements.in
     #   cdh-django-core
@@ -72,11 +72,11 @@ django==3.2.20
     #   djangosaml2
     #   sphinxcontrib-django
     #   uil-django-core
-django-auth-ldap==4.4.0
+django-auth-ldap==4.6.0
     # via -r requirements.in
 django-braces==1.15.0
     # via -r requirements.in
-django-debug-toolbar==4.1.0
+django-debug-toolbar==4.2.0
     # via -r requirements.in
 django-extensions==3.2.3
     # via -r requirements.in
@@ -84,7 +84,7 @@ django-impersonate==1.9.1
     # via -r requirements.in
 django-modeltranslation==0.18.11
     # via -r requirements.in
-django-simple-menu==2.1.2.post1
+django-simple-menu==2.1.3
     # via -r requirements.in
 django-user-agents==0.4.0
     # via -r requirements.in
@@ -93,14 +93,20 @@ djangorestframework==3.14.0
     #   -r requirements.in
     #   uil-django-core
 djangosaml2==1.6.0
-    # via cdh-django-core
+    # via
+    #   -r requirements.in
+    #   cdh-django-core
 docutils==0.18.1
     # via
     #   sphinx
     #   sphinx-rtd-theme
-elementpath==4.1.4
+elementpath==4.1.5
     # via xmlschema
-greenlet==2.0.2
+freetype-py==2.3.0
+    # via
+    #   reportlab
+    #   rlpycairo
+greenlet==3.0.1
     # via bpython
 html5lib==1.1
     # via
@@ -124,13 +130,13 @@ mysqlclient==1.4.6
     # via -r requirements.in
 oscrypto==1.3.0
     # via pyhanko-certvalidator
-packaging==23.1
+packaging==23.2
     # via sphinx
-pbr==5.11.1
+pbr==6.0.0
     # via sphinxcontrib-apidoc
 pdftotext==2.2.2
     # via -r requirements.in
-pillow==10.0.0
+pillow==10.1.0
     # via
     #   -r requirements.in
     #   reportlab
@@ -147,24 +153,26 @@ pyasn1==0.5.0
     #   python-ldap
 pyasn1-modules==0.3.0
     # via python-ldap
+pycairo==1.25.1
+    # via rlpycairo
 pycparser==2.21
     # via cffi
-pygments==2.15.1
+pygments==2.16.1
     # via
     #   -r requirements.in
     #   bpython
     #   sphinx
-pyhanko==0.19.0
+pyhanko==0.20.1
     # via xhtml2pdf
-pyhanko-certvalidator==0.23.0
+pyhanko-certvalidator==0.24.1
     # via
     #   pyhanko
     #   xhtml2pdf
 pyjwt==2.8.0
     # via uil-django-core
-pyopenssl==23.2.0
+pyopenssl==23.3.0
     # via pysaml2
-pypdf==3.13.0
+pypdf==3.17.0
     # via xhtml2pdf
 pypng==0.20220715.0
     # via qrcode
@@ -180,7 +188,7 @@ python-ldap==3.4.3
     # via django-auth-ldap
 python-magic==0.4.27
     # via -r requirements.in
-pytz==2023.3
+pytz==2023.3.post1
     # via
     #   django
     #   djangorestframework
@@ -191,7 +199,7 @@ pyyaml==6.0.1
     # via pyhanko
 qrcode==7.4.2
     # via pyhanko
-reportlab==3.6.13
+reportlab[pycairo]==4.0.7
     # via
     #   svglib
     #   xhtml2pdf
@@ -204,6 +212,8 @@ requests==2.31.0
     #   pysaml2
     #   sphinx
     #   uil-django-core
+rlpycairo==0.3.0
+    # via reportlab
 six==1.16.0
     # via
     #   blessed
@@ -213,32 +223,37 @@ six==1.16.0
     #   python-dateutil
 snowballstemmer==2.2.0
     # via sphinx
-sphinx==6.2.1
+sphinx==7.2.6
     # via
     #   -r requirements.in
     #   sphinx-rtd-theme
     #   sphinxcontrib-apidoc
+    #   sphinxcontrib-applehelp
+    #   sphinxcontrib-devhelp
     #   sphinxcontrib-django
+    #   sphinxcontrib-htmlhelp
     #   sphinxcontrib-jquery
-sphinx-rtd-theme==1.2.2
+    #   sphinxcontrib-qthelp
+    #   sphinxcontrib-serializinghtml
+sphinx-rtd-theme==1.3.0
     # via -r requirements.in
-sphinxcontrib-apidoc==0.3.0
+sphinxcontrib-apidoc==0.4.0
     # via -r requirements.in
-sphinxcontrib-applehelp==1.0.4
+sphinxcontrib-applehelp==1.0.7
     # via sphinx
-sphinxcontrib-devhelp==1.0.2
+sphinxcontrib-devhelp==1.0.5
     # via sphinx
-sphinxcontrib-django==2.4
+sphinxcontrib-django==2.5
     # via -r requirements.in
-sphinxcontrib-htmlhelp==2.0.1
+sphinxcontrib-htmlhelp==2.0.4
     # via sphinx
 sphinxcontrib-jquery==4.1
     # via sphinx-rtd-theme
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-qthelp==1.0.3
+sphinxcontrib-qthelp==1.0.6
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.5
+sphinxcontrib-serializinghtml==1.1.9
     # via sphinx
 sqlparse==0.4.4
     # via
@@ -250,25 +265,25 @@ tinycss2==1.2.1
     # via
     #   cssselect2
     #   svglib
-typing-extensions==4.7.1
+typing-extensions==4.8.0
     # via
     #   asgiref
     #   django-modeltranslation
     #   pypdf
     #   qrcode
-tzlocal==5.0.1
+tzlocal==5.2
     # via pyhanko
 ua-parser==0.18.0
     # via user-agents
-uritools==4.0.1
+uritools==4.0.2
     # via pyhanko-certvalidator
-urllib3==2.0.4
+urllib3==2.0.7
     # via requests
 user-agents==2.2.0
     # via django-user-agents
-vbuild==0.8.1
+vbuild==0.8.2
     # via uil-django-core
-wcwidth==0.2.6
+wcwidth==0.2.9
     # via blessed
 webencodings==0.5.1
     # via
@@ -277,9 +292,9 @@ webencodings==0.5.1
     #   tinycss2
 wrapt==1.15.0
     # via deprecated
-xhtml2pdf==0.2.11
+xhtml2pdf==0.2.12
     # via -r requirements.in
-xmlschema==2.3.1
+xmlschema==2.5.0
     # via pysaml2
-zipp==3.16.2
+zipp==3.17.0
     # via importlib-metadata

From dccd42c089886e8e218d4e07196ea7d65223d929 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Thu, 9 Nov 2023 11:10:23 +0100
Subject: [PATCH 067/148] fix: use new DSC repo location

---
 requirements.in  | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.in b/requirements.in
index 6b368808a..1826a6744 100644
--- a/requirements.in
+++ b/requirements.in
@@ -21,7 +21,7 @@ pygments
 requests
 -e git+https://github.com/UiL-OTS-labs/django-shared-core.git@v2.0.10#egg=uil-django-core
 -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt
-cdh-django-core[federated-auth] @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0
+cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0
 python-magic
 pdftotext
 bpython
diff --git a/requirements.txt b/requirements.txt
index 9618b7f20..b1a97c0ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -25,7 +25,7 @@ blessed==1.20.0
     # via curtsies
 bpython==0.24
     # via -r requirements.in
-cdh-django-core @ git+https://github.com/DH-IT-Portal-Development/django-shared-core.git@v3.1.0
+cdh-django-core @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0
     # via -r requirements.in
 certifi==2023.7.22
     # via requests

From 3fecfe480d9e9538403b55efca393eebb51ed61a Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Thu, 9 Nov 2023 11:26:28 +0100
Subject: [PATCH 068/148] docs: added missing syspackages

---
 docs/developing/install/steps.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/developing/install/steps.rst b/docs/developing/install/steps.rst
index c7b17358e..44245a0f3 100644
--- a/docs/developing/install/steps.rst
+++ b/docs/developing/install/steps.rst
@@ -21,6 +21,8 @@ Your host OS needs some packages, below is a list of debian packages:
 + libsasl2-dev
 + libssl-dev
 + gettext
++ libcairo2-dev
++ libpoppler-cpp-dev
 
 Pip might throw errors while installing `mysqlclient` if you do not have a mysql-dev package. That package is not needed
 for development, so you can (temporarily) comment out that dependency if you run into problems. (Or just install the

From 400071fc9a4ca2c7f9255aba4638158f606c5d03 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 9 Nov 2023 16:23:17 +0100
Subject: [PATCH 069/148] fix for issue 572

woops
---
 proposals/models.py                           |   8 +-
 .../proposals/proposal_pdf_empty.html         | 394 ------------------
 .../proposals/proposal_pdf_pre_approved.html  | 157 -------
 .../proposal_pdf_pre_assessment.html          | 137 ------
 proposals/utils/pdf_diff_logic.py             | 242 ++++++-----
 proposals/views/proposal_views.py             |   1 +
 6 files changed, 129 insertions(+), 810 deletions(-)
 delete mode 100644 proposals/templates/proposals/proposal_pdf_empty.html
 delete mode 100644 proposals/templates/proposals/proposal_pdf_pre_approved.html
 delete mode 100644 proposals/templates/proposals/proposal_pdf_pre_assessment.html

diff --git a/proposals/models.py b/proposals/models.py
index df5d9492f..249f7bc12 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -703,13 +703,7 @@ def generate_pdf(self, force_overwrite=False):
 
     @property
     def pdf_template_name(self):
-        """Determine the correct PDf template for this proposal."""
-        template_name = 'proposals/proposal_pdf.html'
-        if self.is_pre_approved:
-            template_name = 'proposals/proposal_pdf_pre_approved.html'
-        elif self.is_pre_assessment:
-            template_name = 'proposals/proposal_pdf_pre_assessment.html'
-        return template_name
+        return 'proposals/proposal_pdf.html'
 
     def use_canonical_pdf(self):
         """Returns False if this proposal should regenerate its PDF
diff --git a/proposals/templates/proposals/proposal_pdf_empty.html b/proposals/templates/proposals/proposal_pdf_empty.html
deleted file mode 100644
index 688ee11d3..000000000
--- a/proposals/templates/proposals/proposal_pdf_empty.html
+++ /dev/null
@@ -1,394 +0,0 @@
-{% extends "easy_pdf/base.html" %}
-
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-
-{% block extra_style %}
-    <style type="text/css">
-        #content table {
-            border-top-width: .5px;
-            border-top-style: solid;
-            border-top-color: #cbcbcb;
-            border-right-width: .5px;
-            border-right-style: solid;
-            border-right-color: #cbcbcb;
-            border-bottom-width: .5px;
-            border-bottom-style: solid;
-            border-bottom-color: #cbcbcb;
-            border-left-width: .5px;
-            border-left-style: solid;
-            border-left-color: #cbcbcb;
-        }
-
-        #content th, td {
-            width: 500px;
-            font-weight: normal;
-            text-align: left;
-            padding-top: 3px;
-            padding-right: 3px;
-            padding-bottom: 3px;
-            padding-left: 3px;
-        }
-
-        #content li {
-            line-height: 10px;
-        }
-    </style>
-{% endblock %}
-
-{% block page_header %}
-<div id="page-header">
-    {% blocktrans %}
-    FETC-GW - <em>naam aanvraag</em> (referentienummer <em>referentienummer</em>)
-    {% endblocktrans %}
-</div>
-{% endblock %}
-
-{% block page_foot %}
-Page <pdf:pagenumber /> of <pdf:pagecount />
-{% endblock %}
-
-{% block content %}
-<div id="content">
-    <div class="main">
-        <h1>
-            {% blocktrans %}
-            Referentienummer <em>referentienummer</em>
-            {% endblocktrans %}
-        </h1>
-        <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "relation" %}</th><td>{% show_all "proposals" "relation" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "supervisor" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "student_program" %}</th><td>{{ proposal.student_program }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "other_applicants" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "applicants" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "other_stakeholders" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "stakeholders" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "date_start" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "title" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "summary" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "funding" %}</th><td>{% show_all "proposals" "funding" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "funding_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "funding_name" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_institution" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "is_medical" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-        </table>
-
-        <h2>{% trans "Aanmelding bij de METC" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_application" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_decision_pdf" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Eén of meerdere trajecten?" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "studies_similar" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "studies_number" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "De deelnemers" %} <em>n</em></h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "age_groups" %}</th><td>{% show_all "studies" "agegroup" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "legally_incapable" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "legally_incapable_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "has_traits" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "traits" %}</th><td>{% show_all "studies" "trait" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "traits_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "necessity" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "necessity_reason" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "recruitment" %}</th><td>{% show_all "studies" "recruitment" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "recruitment_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "compensation" %}</th><td>{% show_all "studies" "compensation" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "compensation_details" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Het interventieonderzoek" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "setting" %}</th><td>{% show_all "main" "setting" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "setting_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "supervision" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "period" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "amount_per_week" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "duration" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "measurement" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "experimenter" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "description" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "has_controls" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            {% if intervention.has_controls %}
-            <tr>
-                <th>{% get_verbose_field_name "interventions" "intervention" "controls_description" %}</th><td></td>
-            </tr>
-            {% endif %}
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Het observatieonderzoek" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "setting" %}</th><td>{% show_all "main" "setting" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "setting_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "supervision" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "days" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "mean_hours" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "is_anonymous" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "needs_approval" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "approval_institution" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "approval_document" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "registrations" %}</th><td>{% show_all "observations" "registration" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "observations" "observation" "registrations_details" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Het takenonderzoek en interviews" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "sessions_number" %}</th><td></td>
-            </tr>
-        </table>
-
-        <h2>{% trans "Sessie" %} <em>n</em></h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "setting" %}</th><td>{% show_all "main" "setting" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "setting_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "supervision" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "leader_has_coc" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "tasks_number" %}</th><td></td>
-            </tr>
-        </table>
-        <h3>{% trans "Taak" %} <em>n</em></h3>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "name" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "description" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "duration" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "registrations" %}</th><td>{% show_all "tasks" "registration" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "registrations_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "registration_kinds" %}</th><td>{% show_all "tasks" "registrationkind" %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "registration_kinds_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "feedback" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "task" "feedback_details" %}</th><td></td>
-            </tr>
-        </table>
-
-        <h3>{% trans "Overzicht van het takenonderzoek" %}</h3>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "tasks" "session" "tasks_duration" 0 %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Overzicht en eigen beoordeling van het gehele onderzoek" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "deception" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "deception_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "negativity" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "negativity_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "stressful" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "stressful_details" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "risk" %}</th><td>{% show_yesnodoubt %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "risk_details" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Informed consent formulieren voor het onderzoek" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "informed_consent" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "documents" "briefing" %}</th><td></td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "passive_consent" %}</th><td>{% show_yesno %}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "studies" "study" "passive_consent_details" %}</th><td></td>
-            </tr>
-        </table>
-
-        <pdf:nextpage />
-        <h2>{% trans "Aanmelding versturen" %}</h2>
-        <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
-
-    </div>
-</div>
-{% endblock %}
diff --git a/proposals/templates/proposals/proposal_pdf_pre_approved.html b/proposals/templates/proposals/proposal_pdf_pre_approved.html
deleted file mode 100644
index 0b39ff35e..000000000
--- a/proposals/templates/proposals/proposal_pdf_pre_approved.html
+++ /dev/null
@@ -1,157 +0,0 @@
-{% extends "easy_pdf/base.html" %}
-
-{% load i18n %}
-{% load proposal_filters %}
-{% load get_field_name %}
-
-{% block extra_style %}
-    <style type="text/css">
-        #content table {
-            border-top-width: .5px;
-            border-top-style: solid;
-            border-top-color: #cbcbcb;
-            border-right-width: .5px;
-            border-right-style: solid;
-            border-right-color: #cbcbcb;
-            border-bottom-width: .5px;
-            border-bottom-style: solid;
-            border-bottom-color: #cbcbcb;
-            border-left-width: .5px;
-            border-left-style: solid;
-            border-left-color: #cbcbcb;
-        }
-
-        #content th, td {
-            width: 500px;
-            font-weight: normal;
-            text-align: left;
-            padding-top: 3px;
-            padding-right: 3px;
-            padding-bottom: 3px;
-            padding-left: 3px;
-        }
-
-        #content li {
-            line-height: 10px;
-        }
-    </style>
-{% endblock %}
-
-{% block page_header %}
-<div id="page-header">
-    {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name %}
-    FETC-GW - Aanvraag elders al goedgekeurde aanvraag <em>{{ title }}</em> (referentienummer {{ reference_number }}, ingediend door {{ submitter }})
-    {% endblocktrans %}
-</div>
-{% endblock %}
-
-{% block page_foot %}
-Page <pdf:pagenumber /> of <pdf:pagecount />
-{% endblock %}
-
-{% block content %}
-<div id="content">
-    <div class="main">
-        <h1>
-            {% blocktrans with reference_number=proposal.reference_number %}
-            Referentienummer {{ reference_number }}
-            {% endblocktrans %}
-        </h1>
-        <h2>{% trans 'Indiener' %}</h2>
-        <table>
-            <tr>
-                <th>{% trans 'Naam' %}</th><td>{{ proposal.created_by.get_full_name }}</td>
-            </tr>
-            <tr>
-                <th>{% trans 'E-mail' %}</th><td>{{ proposal.created_by.email }}</td>
-            </tr>
-        </table>
-        <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "is_pre_approved" %}</th>
-                <td>{{ proposal.is_pre_approved }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "relation" %}</th>
-                <td>{{ proposal.relation }}</td>
-            </tr>
-            {% if proposal.relation.needs_supervisor %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "supervisor" %}</th>
-                <td>{{ proposal.supervisor.get_full_name }}</td>
-            </tr>
-            {% endif %}
-            {% if proposal.relation.check_in_course %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "student_program" %}</th><td>{{ proposal.student_program }}</td>
-            </tr>
-            {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "other_applicants" %}</th>
-                <td>{{ proposal.other_applicants|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if proposal.other_applicants %}
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "proposal" "applicants" %}</th><td>
-                <ul>
-                  {% for applicant in proposal.applicants.all %}
-                    <li>
-                      {{ applicant.get_full_name }}
-                    </li>
-                  {% endfor %}
-                </ul>
-              </td>
-            </tr>
-          {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "other_stakeholders" %}</th>
-                <td>{{ proposal.other_stakeholders|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if proposal.other_stakeholders %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "stakeholders" %}</th>
-                <td>{{ proposal.stakeholders }}</td>
-            </tr>
-            {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "date_start" %}</th>
-                <td>{{ proposal.date_start|default:_("onbekend") }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "title" %}</th>
-                <td>{{ proposal.title }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "funding" %}</th><td>{{ proposal.funding.all|unordered_list }}</td>
-            </tr>
-            {% if proposal.funding.all|needs_details %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "funding_details" %}</th><td>{{ proposal.funding_details }}</td>
-            </tr>
-            {% endif %}
-            {% if proposal.funding.all|needs_details:"needs_name" %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "funding_name" %}</th><td>{{ proposal.funding_name }}</td>
-            </tr>
-            {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "pre_approval_institute" %}</th><td>{{ proposal.pre_approval_institute }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "pre_approval_pdf" %}</th>
-                <td><a href="{{ BASE_URL }}{{ proposal.pre_approval_pdf.url }}" target="_blank">{% trans "Download" %}</a></td>
-            </tr>
-        </table>
-
-        <h3>{% get_verbose_field_name "proposals" "proposal" "summary" %}</h3>
-        <p>{{ proposal.summary|linebreaks }}</p>
-
-        <h2>{% trans "Aanmelding versturen" %}</h2>
-        <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
-        <p>
-            {{ proposal.comments }}
-        </p>
-    </div>
-</div>
-{% endblock %}
diff --git a/proposals/templates/proposals/proposal_pdf_pre_assessment.html b/proposals/templates/proposals/proposal_pdf_pre_assessment.html
deleted file mode 100644
index dd293ea93..000000000
--- a/proposals/templates/proposals/proposal_pdf_pre_assessment.html
+++ /dev/null
@@ -1,137 +0,0 @@
-{% extends "easy_pdf/base.html" %}
-
-{% load i18n %}
-{% load get_field_name %}
-
-{% block extra_style %}
-    <style type="text/css">
-        #content table {
-            border-top-width: .5px;
-            border-top-style: solid;
-            border-top-color: #cbcbcb;
-            border-right-width: .5px;
-            border-right-style: solid;
-            border-right-color: #cbcbcb;
-            border-bottom-width: .5px;
-            border-bottom-style: solid;
-            border-bottom-color: #cbcbcb;
-            border-left-width: .5px;
-            border-left-style: solid;
-            border-left-color: #cbcbcb;
-        }
-
-        #content th, td {
-            width: 500px;
-            font-weight: normal;
-            text-align: left;
-            padding-top: 3px;
-            padding-right: 3px;
-            padding-bottom: 3px;
-            padding-left: 3px;
-        }
-
-        #content li {
-            line-height: 10px;
-        }
-    </style>
-{% endblock %}
-
-{% block page_header %}
-<div id="page-header">
-    {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name %}
-    FETC-GW - Aanvraag voor voortoetsing <em>{{ title }}</em> (referentienummer {{ reference_number }}, ingediend door {{ submitter }})
-    {% endblocktrans %}
-</div>
-{% endblock %}
-
-{% block page_foot %}
-Page <pdf:pagenumber /> of <pdf:pagecount />
-{% endblock %}
-
-{% block content %}
-<div id="content">
-    <div class="main">
-        <h1>
-            {% blocktrans with reference_number=proposal.reference_number %}
-            Referentienummer {{ reference_number }}
-            {% endblocktrans %}
-        </h1>
-        <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "relation" %}</th><td>{{ proposal.relation }}</td>
-            </tr>
-            {% if proposal.relation.needs_supervisor %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "supervisor" %}</th><td>{{ proposal.supervisor.get_full_name }}</td>
-            </tr>
-            {% endif %}
-            {% if proposal.relation.check_in_course %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "student_program" %}</th><td>{{ proposal.student_program }}</td>
-            </tr>
-            {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "other_applicants" %}</th><td>{{ proposal.other_applicants|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if proposal.other_applicants %}
-            <tr>
-              <th>{% get_verbose_field_name "proposals" "proposal" "applicants" %}</th><td>
-                <ul>
-                  {% for applicant in proposal.applicants.all %}
-                    <li>
-                      {{ applicant.get_full_name }}
-                    </li>
-                  {% endfor %}
-                </ul>
-              </td>
-            </tr>
-          {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "other_stakeholders" %}</th><td>{{ proposal.other_stakeholders|yesno:_("ja,nee") }}</td>
-            </tr>
-            {% if proposal.other_stakeholders %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "stakeholders" %}</th><td>{{ proposal.stakeholders }}</td>
-            </tr>
-            {% endif %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "date_start" %}</th><td>{{ proposal.date_start|default:_("onbekend") }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "title" %}</th><td>{{ proposal.title }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "proposal" "pre_assessment_pdf" %}</th><td><a href="{{ BASE_URL }}{{ proposal.pre_assessment_pdf.url }}" target="_blank">{% trans "Download" %}</a></td>
-            </tr>
-        </table>
-
-        {% with wmo=proposal.wmo %}
-        <h2>{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
-        <table>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc" %}</th><td>{{ wmo.get_metc_display }}</td>
-            </tr>
-            {% if wmo.metc == 'Y' %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_details" %}</th><td>{{ wmo.metc_details }}</td>
-            </tr>
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "metc_institution" %}</th><td>{{ wmo.metc_institution }}</td>
-            </tr>
-            {% else %}
-            <tr>
-                <th>{% get_verbose_field_name "proposals" "wmo" "is_medical" %}</th><td>{{ wmo.get_is_medical_display }}</td>
-            </tr>
-            {% endif %}
-        </table>
-        {% endwith %}
-
-        <h2>{% trans "Aanvraag voor voortoetsing versturen" %}</h2>
-        <h3>{% get_verbose_field_name "proposals" "proposal" "comments" %}</h3>
-        <p>
-            {{ proposal.comments }}
-        </p>
-    </div>
-</div>
-{% endblock %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 8999c631b..f4c5e651d 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -436,6 +436,7 @@ class GeneralSection(BaseSection):
         "funding_name",
         "pre_approval_institute",
         "pre_approval_pdf",
+        "pre_assessment_pdf",
         "self_assessment",
         "summary",
     ]
@@ -448,6 +449,19 @@ def get_row_fields(self):
             rows.remove("is_pre_approved")
             rows.remove("pre_approval_institute")
             rows.remove("pre_approval_pdf")
+
+        if obj.is_pre_assessment:
+            rows.remove("funding")
+            rows.remove("funding_name")
+            rows.remove("funding_details")
+            rows.remove("summary")
+        else:
+            rows.remove("pre_assessment_pdf")
+            if not needs_details(obj.funding.all()):
+                rows.remove("funding_details")
+            if not needs_details(obj.funding.all(), "needs_name"):
+                rows.remove("funding_name")
+
         if not obj.relation.needs_supervisor:
             rows.remove("supervisor")
         if not obj.relation.check_in_course:
@@ -463,10 +477,6 @@ def get_row_fields(self):
             rows.remove("applicants")
         if not obj.other_stakeholders:
             rows.remove("stakeholders")
-        if not needs_details(obj.funding.all()):
-            rows.remove("funding_details")
-        if not needs_details(obj.funding.all(), "needs_name"):
-            rows.remove("funding_name")
 
         return rows
 
@@ -1004,35 +1014,36 @@ def create_context_pdf(context, model):
     if hasattr(model, 'wmo'):
         sections.append(WMOSection(model.wmo))
 
-        if model.wmo.status != model.wmo.NO_WMO:
-            sections.append(METCSection(model.wmo))
-
-        sections.append(TrajectoriesSection(model))
-
-        if model.wmo.status == model.wmo.NO_WMO:
-            for study in model.study_set.all():
-                sections.append(StudySection(study))
-                if study.has_intervention:
-                    sections.append(InterventionSection(study.intervention))
-                if study.has_observation:
-                    sections.append(ObservationSection(study.observation))
-                if study.has_sessions:
-                    sections.append(SessionsOverviewSection(study))
-                    for session in study.session_set.all():
-                        sections.append(SessionSection(session))
-                        for task in session.task_set.all():
-                            sections.append(TaskSection(task))
-                    sections.append(TasksOverviewSection(session))
-                sections.append(StudyOverviewSection(study))
-                sections.append(InformedConsentFormsSection(study.documents))
-
-            extra_documents = get_extra_documents(model)
-
-            for num, document in enumerate(extra_documents):
-                sections.append(ExtraDocumentsSection(document, num))
-
-            if model.dmp_file:
-                sections.append(DMPFileSection(model))
+        if not model.is_pre_assessment:
+            if model.wmo.status != model.wmo.NO_WMO:
+                sections.append(METCSection(model.wmo))
+
+            sections.append(TrajectoriesSection(model))
+
+            if model.wmo.status == model.wmo.NO_WMO:
+                for study in model.study_set.all():
+                    sections.append(StudySection(study))
+                    if study.has_intervention:
+                        sections.append(InterventionSection(study.intervention))
+                    if study.has_observation:
+                        sections.append(ObservationSection(study.observation))
+                    if study.has_sessions:
+                        sections.append(SessionsOverviewSection(study))
+                        for session in study.session_set.all():
+                            sections.append(SessionSection(session))
+                            for task in session.task_set.all():
+                                sections.append(TaskSection(task))
+                        sections.append(TasksOverviewSection(session))
+                    sections.append(StudyOverviewSection(study))
+                    sections.append(InformedConsentFormsSection(study.documents))
+
+                extra_documents = get_extra_documents(model)
+
+                for num, document in enumerate(extra_documents):
+                    sections.append(ExtraDocumentsSection(document, num))
+
+                if model.dmp_file:
+                    sections.append(DMPFileSection(model))
 
     sections.append(EmbargoSection(model))
     sections.append(CommentsSection(model))
@@ -1082,121 +1093,122 @@ def create_context_diff(context, old_proposal, new_proposal):
         sections.append(
             DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
         )
+        
+        if new_proposal.is_pre_assessment:
+            if (
+                new_proposal.wmo.status != new_proposal.wmo.NO_WMO
+                or old_proposal.wmo.status != old_proposal.wmo.NO_WMO
+            ):
+                sections.append(
+                    DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
+                )
 
-        if (
-            new_proposal.wmo.status != new_proposal.wmo.NO_WMO
-            or old_proposal.wmo.status != old_proposal.wmo.NO_WMO
-        ):
             sections.append(
-                DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
-            )
-
-        sections.append(
-            DiffSection(
-                TrajectoriesSection(old_proposal), TrajectoriesSection(new_proposal)
+                DiffSection(
+                    TrajectoriesSection(old_proposal), TrajectoriesSection(new_proposal)
+                )
             )
-        )
 
-        if (
-            new_proposal.wmo.status == new_proposal.wmo.NO_WMO
-            or new_proposal.wmo.status == new_proposal.wmo.JUDGED
-        ):
-            for old_study, new_study in zip_equalize_lists(
-                old_proposal.study_set.all(), new_proposal.study_set.all()
+            if (
+                new_proposal.wmo.status == new_proposal.wmo.NO_WMO
+                or new_proposal.wmo.status == new_proposal.wmo.JUDGED
             ):
-                both_studies = [old_study, new_study]
-
-                sections.append(DiffSection(*multi_sections(StudySection, both_studies)))
-
-                if (
-                    old_study is not None
-                    and old_study.has_intervention
-                    or new_study is not None
-                    and new_study.has_intervention
+                for old_study, new_study in zip_equalize_lists(
+                    old_proposal.study_set.all(), new_proposal.study_set.all()
                 ):
-                    interventions = get_all_related(both_studies, "intervention")
+                    both_studies = [old_study, new_study]
 
-                    sections.append(
-                        DiffSection(*multi_sections(InterventionSection, interventions))
-                    )
+                    sections.append(DiffSection(*multi_sections(StudySection, both_studies)))
 
-                if (
-                    old_study is not None
-                    and old_study.has_observation
-                    or new_study is not None
-                    and new_study.has_observation
-                ):
-                    observations = get_all_related(both_studies, "observation")
+                    if (
+                        old_study is not None
+                        and old_study.has_intervention
+                        or new_study is not None
+                        and new_study.has_intervention
+                    ):
+                        interventions = get_all_related(both_studies, "intervention")
 
-                    sections.append(
-                        DiffSection(*multi_sections(ObservationSection, observations))
-                    )
+                        sections.append(
+                            DiffSection(*multi_sections(InterventionSection, interventions))
+                        )
 
-                if (
-                    old_study is not None
-                    and old_study.has_sessions
-                    or new_study is not None
-                    and new_study.has_sessions
-                ):
-                    sections.append(
-                        DiffSection(*multi_sections(SessionsOverviewSection, both_studies))
-                    )
+                    if (
+                        old_study is not None
+                        and old_study.has_observation
+                        or new_study is not None
+                        and new_study.has_observation
+                    ):
+                        observations = get_all_related(both_studies, "observation")
 
-                    old_sessions_set, new_sessions_set = get_all_related_set(
-                        both_studies, "session_set"
-                    )
+                        sections.append(
+                            DiffSection(*multi_sections(ObservationSection, observations))
+                        )
 
-                    for both_sessions in zip_equalize_lists(
-                        old_sessions_set, new_sessions_set
+                    if (
+                        old_study is not None
+                        and old_study.has_sessions
+                        or new_study is not None
+                        and new_study.has_sessions
                     ):
                         sections.append(
-                            DiffSection(*multi_sections(SessionSection, both_sessions))
+                            DiffSection(*multi_sections(SessionsOverviewSection, both_studies))
                         )
 
-                        old_tasks_set, new_tasks_set = get_all_related_set(
-                            both_sessions, "task_set"
+                        old_sessions_set, new_sessions_set = get_all_related_set(
+                            both_studies, "session_set"
                         )
 
-                        for both_tasks in zip_equalize_lists(old_tasks_set, new_tasks_set):
+                        for both_sessions in zip_equalize_lists(
+                            old_sessions_set, new_sessions_set
+                        ):
                             sections.append(
-                                DiffSection(*multi_sections(TaskSection, both_tasks))
+                                DiffSection(*multi_sections(SessionSection, both_sessions))
                             )
 
-                    sections.append(
-                        DiffSection(*multi_sections(TasksOverviewSection, both_sessions))
-                    )
+                            old_tasks_set, new_tasks_set = get_all_related_set(
+                                both_sessions, "task_set"
+                            )
 
-                sections.append(
-                    DiffSection(*multi_sections(StudyOverviewSection, both_studies))
-                )
+                            for both_tasks in zip_equalize_lists(old_tasks_set, new_tasks_set):
+                                sections.append(
+                                    DiffSection(*multi_sections(TaskSection, both_tasks))
+                                )
 
-                both_documents = get_all_related(both_studies, "documents")
+                        sections.append(
+                            DiffSection(*multi_sections(TasksOverviewSection, both_sessions))
+                        )
 
-                sections.append(
-                    DiffSection(
-                        *multi_sections(InformedConsentFormsSection, both_documents)
+                    sections.append(
+                        DiffSection(*multi_sections(StudyOverviewSection, both_studies))
                     )
-                )
 
-            old_extra_docs = get_extra_documents(old_proposal)
-            new_extra_docs = get_extra_documents(new_proposal)
+                    both_documents = get_all_related(both_studies, "documents")
 
-            if old_extra_docs or new_extra_docs:
-                for num, zipped_extra_docs in enumerate(
-                    zip_equalize_lists(old_extra_docs, new_extra_docs)
-                ):
                     sections.append(
                         DiffSection(
-                            *multi_sections(ExtraDocumentsSection, zipped_extra_docs, num)
+                            *multi_sections(InformedConsentFormsSection, both_documents)
                         )
                     )
 
-            if old_proposal.dmp_file or new_proposal.dmp_file:
-                sections.append(
-                    DiffSection(
-                        *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+                old_extra_docs = get_extra_documents(old_proposal)
+                new_extra_docs = get_extra_documents(new_proposal)
+
+                if old_extra_docs or new_extra_docs:
+                    for num, zipped_extra_docs in enumerate(
+                        zip_equalize_lists(old_extra_docs, new_extra_docs)
+                    ):
+                        sections.append(
+                            DiffSection(
+                                *multi_sections(ExtraDocumentsSection, zipped_extra_docs, num)
+                            )
+                        )
+
+                if old_proposal.dmp_file or new_proposal.dmp_file:
+                    sections.append(
+                        DiffSection(
+                            *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+                        )
                     )
-                )
 
     sections.append(
         DiffSection(EmbargoSection(old_proposal), EmbargoSection(new_proposal))
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index ad3fa98ec..23af7d08b 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -568,6 +568,7 @@ class ProposalAsPdf(
     model = Proposal
     # The PDF mixin generates a filename with this factory
     filename_factory = FilenameFactory('Proposal')
+    template_name = 'proposals/proposal_pdf.html'
 
     def get(self, request, *args, **kwargs):
         # First, check if we should use a pregenerated pdf, if we have one

From ae1a5e19f5c8858c09f85bf5f2886f4e69827551 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:15:29 +0100
Subject: [PATCH 070/148] refactor: removed unused template

---
 main/templates/base/menu.html | 180 ----------------------------------
 1 file changed, 180 deletions(-)
 delete mode 100644 main/templates/base/menu.html

diff --git a/main/templates/base/menu.html b/main/templates/base/menu.html
deleted file mode 100644
index 4e9dffd4b..000000000
--- a/main/templates/base/menu.html
+++ /dev/null
@@ -1,180 +0,0 @@
-{% load i18n %}
-{% load fetc_filters %}
-
-<div class="pure-menu pure-menu-horizontal pure-menu-custom">
-    <ul class="pure-menu-list">
-        <li class="pure-menu-item">
-            <a class="pure-menu-link" href="{% url 'main:home' %}">{% trans "Startpagina" %}</a>
-        </li>
-        {% if user.is_authenticated %}
-        <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover">
-            <a href="#" class="pure-menu-link">{% trans "Mijn aanvragen" %}</a>
-            <ul class="pure-menu-children">
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:start' %}">{% trans "Nieuwe aanvraag starten" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:copy' %}">{% trans "Nieuwe studie starten op basis van een kopie van een oude studie" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:start_pre' %}">{% trans "Nieuwe voortoetsing aanvraag starten" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:start_pre_approved' %}">{% trans "Nieuwe aanvraag starten (die al goedgekeurd is door een andere ethische toetsingscommissie)" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:copy_revision' %}">{% trans "Maak een revisie van een bestaande aanvraag" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:copy_amendment' %}">{% trans "Maak een amendement van een al goedgekeurde aanvraag" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:my_concepts' %}">{% trans "Mijn conceptaanvragen" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:my_practice' %}">{% trans "Mijn oefenaanvragen" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:my_submitted' %}">{% trans "Mijn ingediende aanvragen" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:my_completed' %}">{% trans "Mijn afgehandelde aanvragen" %}</a>
-                </li>
-                 <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:my_supervised' %}">{% trans "Mijn aanvragen als eindverantwoordelijke" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:my_archive' %}">{% trans "Al mijn aanvragen" %}</a>
-                </li>
-            </ul>
-        </li>
-        <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover">
-            <a href="#" class="pure-menu-link">{% trans "Archief" %}</a>
-            <ul class="pure-menu-children">
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:archive' 'AK' %}">{% trans "Alle aanvragen bekijken van de Algemene Kamer" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:archive' 'LK' %}">{% trans "Alle aanvragen bekijken van de Linguïstiek Kamer" %}</a>
-                </li>
-                {% if user|is_secretary %}
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'proposals:archive_export' %}">{% trans "Site-export" %}</a>
-                </li>
-                {% endif %}
-            </ul>
-        </li>
-        {% if user|in_general_chamber %}
-        <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover">
-            <a href="#" class="pure-menu-link">{% trans "Algemene Kamer" %}</a>
-            <ul class="pure-menu-children">
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:my_open' 'AK' %}">{% trans "Mijn openstaande besluiten" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:my_archive' 'AK' %}">{% trans "Al mijn besluiten" %}</a>
-                </li>
-                {% if user|is_secretary %}
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:open' 'AK' %}">{% trans "Alle openstaande besluiten commissieleden" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:open_supervisors' 'AK' %}">{% trans "Alle openstaande besluiten eindverantwoordelijken" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:to_conclude' 'AK' %}">{% trans "Nog af te handelen aanvragen" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:archive' 'AK' %}">{% trans "Alle ingezonden aanvragen" %}</a>
-                </li>
-                {% endif %}
-            </ul>
-        </li>
-        {% endif %}
-        {% if user|in_linguistics_chamber %}
-        <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover">
-            <a href="#" class="pure-menu-link">{% trans "Linguïstiek Kamer" %}</a>
-            <ul class="pure-menu-children">
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:my_open' 'LK' %}">{% trans "Mijn openstaande besluiten" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:my_archive' 'LK' %}">{% trans "Al mijn besluiten" %}</a>
-                </li>
-                {% if user|is_secretary %}
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:open' 'LK' %}">{% trans "Alle openstaande besluiten commissieleden" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:open_supervisors' 'LK' %}">{% trans "Alle openstaande besluiten eindverantwoordelijken" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:to_conclude' 'LK' %}">{% trans "Nog af te handelen aanvragen" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'reviews:archive' 'LK' %}">{% trans "Alle ingezonden aanvragen" %}</a>
-                </li>
-                {% endif %}
-            </ul>
-        </li>
-        {% endif %}
-        <li class="pure-menu-item pure-menu-has-children pure-menu-allow-hover">
-            <a href="#" class="pure-menu-link">{% trans "Help" %}</a>
-            <ul class="pure-menu-children">
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="http://fetc-gw.wp.hum.uu.nl/" target="_blank">{% trans "FETC-GW website" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/" target="_blank">{% trans "Reglement Algemene Kamer (AK)" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="http://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/" target="_blank">{% trans " Reglement Linguïstiek Kamer (LK) " %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">{% trans "Informed consent formulieren" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'faqs:list' %}">{% trans "FAQs" %}</a>
-                </li>
-                <li class="pure-menu-item">
-                    <a class="pure-menu-link" href="{% url 'feedback:create' %}">{% trans "Feedback" %}</a>
-                </li>
-            </ul>
-        </li>
-        <li class="pure-menu-item">
-            <a class="pure-menu-link" href="{% url 'logout' %}"><em>{% trans "Uitloggen" %}</em></a>
-        </li>
-        {% else %}
-        <li class="pure-menu-item">
-            <a class="pure-menu-link" href="http://fetc-gw.wp.hum.uu.nl" target="_blank">{% trans "FETC-GW-website" %}</a>
-        </li>
-        <li class="pure-menu-item">
-            <a class="pure-menu-link" href="{% url 'login' %}"><em>{% trans "Inloggen" %}</em></a>
-        </li>
-        {% endif %}
-
-        <li class="pure-menu-item">
-            <form action="{% url 'set_language' %}" method="post">{% csrf_token %}
-                <input name="next" type="hidden" value="{{ redirect_to }}" />
-                <select name="language">
-                    {% get_current_language as LANGUAGE_CODE %}
-                    {% get_available_languages as LANGUAGES %}
-                    {% get_language_info_list for LANGUAGES as languages %}
-                    {% for language in languages %}
-                        <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected="selected"{% endif %}>
-                            {{ language.name_local }}
-                        </option>
-                    {% endfor %}
-                </select>
-            </form>
-        </li>
-    </ul>
-</div>
-
-<script>
-    $(function() {
-        $('select[name="language"]').change(function() {
-            this.form.submit();
-        });
-    });
-</script>

From 7ecb51507f199e7d8695b3102acf0893a3d1a78a Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:16:20 +0100
Subject: [PATCH 071/148] refactor: remove feedback module

Fixes #430

Okay not really a refactor, but honestly none of the other tags really fit
---
 faqs/menus.py                                 |  4 --
 feedback/__init__.py                          |  0
 feedback/admin.py                             | 10 -----
 feedback/forms.py                             | 12 ------
 feedback/migrations/0001_initial.py           | 28 -------------
 feedback/migrations/__init__.py               |  0
 feedback/models.py                            | 27 -------------
 .../templates/feedback/feedback_form.html     | 30 --------------
 .../templates/feedback/feedback_list.html     | 39 -------------------
 .../templates/feedback/feedback_thanks.html   | 23 -----------
 feedback/tests.py                             |  3 --
 feedback/urls.py                              | 11 ------
 feedback/views.py                             | 39 -------------------
 fetc/settings.py                              |  1 -
 fetc/urls.py                                  |  1 -
 main/templates/main/index.html                |  3 --
 16 files changed, 231 deletions(-)
 delete mode 100644 feedback/__init__.py
 delete mode 100644 feedback/admin.py
 delete mode 100644 feedback/forms.py
 delete mode 100644 feedback/migrations/0001_initial.py
 delete mode 100644 feedback/migrations/__init__.py
 delete mode 100644 feedback/models.py
 delete mode 100644 feedback/templates/feedback/feedback_form.html
 delete mode 100644 feedback/templates/feedback/feedback_list.html
 delete mode 100644 feedback/templates/feedback/feedback_thanks.html
 delete mode 100644 feedback/tests.py
 delete mode 100644 feedback/urls.py
 delete mode 100644 feedback/views.py

diff --git a/faqs/menus.py b/faqs/menus.py
index aa4f4845a..e412824ba 100644
--- a/faqs/menus.py
+++ b/faqs/menus.py
@@ -21,10 +21,6 @@
     MenuItem(
         _("FAQs"),
         reverse("faqs:list"),
-    ),
-    MenuItem(
-        _("Feedback"),
-        reverse("feedback:create"),
     )
 )
 
diff --git a/feedback/__init__.py b/feedback/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/feedback/admin.py b/feedback/admin.py
deleted file mode 100644
index e783a64ce..000000000
--- a/feedback/admin.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from django.contrib import admin
-
-from .models import Feedback
-
-
-@admin.register(Feedback)
-class FeedbackAdmin(admin.ModelAdmin):
-    fields = ('url', 'comment', 'submitter', 'priority', 'status')
-    list_display = ['url', 'comment', 'submitter', 'date_created']
-    list_filter = ('priority', 'status')
diff --git a/feedback/forms.py b/feedback/forms.py
deleted file mode 100644
index dc2cdae54..000000000
--- a/feedback/forms.py
+++ /dev/null
@@ -1,12 +0,0 @@
-from django import forms
-
-from .models import Feedback
-
-
-class FeedbackForm(forms.ModelForm):
-    class Meta:
-        model = Feedback
-        fields = ['url', 'comment']
-        widgets = {
-            'url': forms.HiddenInput(),
-        }
diff --git a/feedback/migrations/0001_initial.py b/feedback/migrations/0001_initial.py
deleted file mode 100644
index d178ddff9..000000000
--- a/feedback/migrations/0001_initial.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-from __future__ import unicode_literals
-
-from django.db import migrations, models
-from django.conf import settings
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-    ]
-
-    operations = [
-        migrations.CreateModel(
-            name='Feedback',
-            fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('url', models.URLField()),
-                ('comment', models.TextField(verbose_name='Feedback')),
-                ('priority', models.IntegerField(default=1, choices=[(1, 'Laag'), (2, 'Gemiddeld'), (3, 'Hoog')])),
-                ('status', models.IntegerField(default=1, choices=[(1, 'Open'), (2, 'Opgepakt'), (3, 'Afgehandeld')])),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_modified', models.DateField(auto_now=True)),
-                ('submitter', models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE)),
-            ],
-        ),
-    ]
diff --git a/feedback/migrations/__init__.py b/feedback/migrations/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/feedback/models.py b/feedback/models.py
deleted file mode 100644
index b168b09c9..000000000
--- a/feedback/models.py
+++ /dev/null
@@ -1,27 +0,0 @@
-from django.db import models
-from django.conf import settings
-from django.utils.translation import ugettext_lazy as _
-
-STATUS_CODES = (
-    (1, _('Open')),
-    (2, _('Opgepakt')),
-    (3, _('Afgehandeld')),
-)
-
-PRIORITY_CODES = (
-    (1, _('Laag')),
-    (2, _('Gemiddeld')),
-    (3, _('Hoog')),
-)
-
-
-class Feedback(models.Model):
-    url = models.URLField()
-    comment = models.TextField(_('Feedback'))
-    priority = models.IntegerField(default=1, choices=PRIORITY_CODES)
-    status = models.IntegerField(default=1, choices=STATUS_CODES)
-
-    date_created = models.DateTimeField(auto_now_add=True)
-    date_modified = models.DateField(auto_now=True)
-
-    submitter = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
diff --git a/feedback/templates/feedback/feedback_form.html b/feedback/templates/feedback/feedback_form.html
deleted file mode 100644
index 2a0d9584d..000000000
--- a/feedback/templates/feedback/feedback_form.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% extends "base/base.html" %}
-
-{% load static %}
-{% load i18n %}
-
-{% block header_title %}
-    {% trans "Feedback versturen" %} - {{ block.super }}
-{% endblock %}
-
-{% block content %}
-    <div class="uu-inner-container">
-        <div class="col-12">
-            <h2>
-                {% trans "Feedback versturen" %}
-            </h2>
-            <p>
-                {% trans "Hier kan je feedback achterlaten op het FETC-GW portal." %}
-            </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                <p class="float-right">
-                    <a class="button" href="javascript:history.go(-1);">
-                        {% trans "Terug naar de vorige pagina" %}
-                    </a>
-                    <input type="submit" value="{% trans 'Feedback versturen' %}"/>
-                </p>
-            </form>
-        </div>
-    </div>
-{% endblock %}
diff --git a/feedback/templates/feedback/feedback_list.html b/feedback/templates/feedback/feedback_list.html
deleted file mode 100644
index 2f1947499..000000000
--- a/feedback/templates/feedback/feedback_list.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends "base/base.html" %}
-
-{% load static %}
-{% load i18n %}
-{% load datatables %}
-
-{% block header_title %}
-    {% trans "Feedbackoverzicht" %} - {{ block.super }}
-{% endblock %}
-
-{% block content %}
-    <div class="uu-inner-container">
-        <div class="col-12">
-            <h2>
-                {% trans "Feedbackoverzicht" %}
-            </h2>
-            <table class="dt w-100" data-language="{% datatables_lang %}">
-                <thead>
-                    <tr>
-                        <th>{% trans "Toegevoegd op" %}</th>
-                        <th>{% trans "URL" %}</th>
-                        <th>{% trans "Feedback" %}</th>
-                        <th>{% trans "Gegeven door" %}</th>
-                    </tr>
-                </thead>
-                <tbody>
-                    {% for feedback in feedback_list %}
-                    <tr>
-                        <td data-order="{{ feedback.date_created|date:'c' }}">{{ feedback.date_created|date:"j M Y, G:i" }}</td>
-                        <td>{{ feedback.url }}</td>
-                        <td>{{ feedback.comment }}</td>
-                        <td>{{ feedback.submitter.get_full_name }}</td>
-                    </tr>
-                    {% endfor %}
-                </tbody>
-            </table>
-        </div>
-    </div>
-{% endblock %}
diff --git a/feedback/templates/feedback/feedback_thanks.html b/feedback/templates/feedback/feedback_thanks.html
deleted file mode 100644
index fd9c0e0a3..000000000
--- a/feedback/templates/feedback/feedback_thanks.html
+++ /dev/null
@@ -1,23 +0,0 @@
-{% extends "base/base.html" %}
-
-{% load static %}
-{% load i18n %}
-
-{% block header_title %}
-    {% trans "Bedankt voor je feedback!" %} - {{ block.super }}
-{% endblock %}
-
-{% block content %}
-    <div class="uu-inner-container">
-        <div class="col-12">
-            <h2>
-                {% trans "Bedankt voor je feedback!" %}
-            </h2>
-            <p>
-                {% blocktrans with url=feedback.url %}
-                Klik <a href="{{ url }}">hier</a> om terug te keren naar pagina waar je gebleven was.
-                {% endblocktrans %}
-            </p>
-        </div>
-    </div>
-{% endblock %}
diff --git a/feedback/tests.py b/feedback/tests.py
deleted file mode 100644
index 7ce503c2d..000000000
--- a/feedback/tests.py
+++ /dev/null
@@ -1,3 +0,0 @@
-from django.test import TestCase
-
-# Create your tests here.
diff --git a/feedback/urls.py b/feedback/urls.py
deleted file mode 100644
index 7bccea3aa..000000000
--- a/feedback/urls.py
+++ /dev/null
@@ -1,11 +0,0 @@
-from django.urls import path
-
-from .views import FeedbackCreate, FeedbackListing, FeedbackThanks
-
-app_name = 'feedback'
-
-urlpatterns = [
-    path('', FeedbackListing.as_view(), name='overview'),
-    path('create/', FeedbackCreate.as_view(), name='create'),
-    path('thanks/<int:pk>/', FeedbackThanks.as_view(), name='thanks'),
-]
diff --git a/feedback/views.py b/feedback/views.py
deleted file mode 100644
index 675b02c05..000000000
--- a/feedback/views.py
+++ /dev/null
@@ -1,39 +0,0 @@
-from django.contrib.messages.views import SuccessMessageMixin
-from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
-from django.views import generic
-
-from braces.views import LoginRequiredMixin
-
-from .forms import FeedbackForm
-from .models import Feedback
-
-
-class FeedbackCreate(LoginRequiredMixin, SuccessMessageMixin, generic.CreateView):
-    model = Feedback
-    form_class = FeedbackForm
-    success_message = _('Feedback verstuurd')
-
-    def get_initial(self):
-        """Sets URL to the referrer and submitter to current User"""
-        initial = super(FeedbackCreate, self).get_initial()
-        initial['url'] = self.request.META.get('HTTP_REFERER')
-        return initial
-
-    def form_valid(self, form):
-        """Sets submitter to current User"""
-        form.instance.submitter = self.request.user
-        return super(FeedbackCreate, self).form_valid(form)
-
-    def get_success_url(self):
-        """Redirect to thank-you page"""
-        return reverse('feedback:thanks', args=(self.object.pk,))
-
-
-class FeedbackThanks(LoginRequiredMixin, generic.DetailView):
-    model = Feedback
-    template_name = 'feedback/feedback_thanks.html'
-
-
-class FeedbackListing(LoginRequiredMixin, generic.ListView):
-    model = Feedback
diff --git a/fetc/settings.py b/fetc/settings.py
index 45697d112..3bf40c16d 100644
--- a/fetc/settings.py
+++ b/fetc/settings.py
@@ -50,7 +50,6 @@
     'interventions',
     'observations',
     'reviews',
-    'feedback',
     'faqs',
 
     'modeltranslation',
diff --git a/fetc/urls.py b/fetc/urls.py
index 09b9285ed..aad85bf04 100644
--- a/fetc/urls.py
+++ b/fetc/urls.py
@@ -35,7 +35,6 @@
     path('observations/', include('observations.urls')),
     path('interventions/', include('interventions.urls')),
     path('reviews/', include('reviews.urls')),
-    path('feedback/', include('feedback.urls')),
     path('faqs/', include('faqs.urls')),
 
     path('admin/', admin.site.urls),
diff --git a/main/templates/main/index.html b/main/templates/main/index.html
index 768af10c6..7744adbeb 100644
--- a/main/templates/main/index.html
+++ b/main/templates/main/index.html
@@ -211,9 +211,6 @@ <h6>
                 <li>
                     <a href="{% url 'faqs:list' %}">{% trans "Veelgestelde vragen m.b.t. dit portal" %}</a>
                 </li>
-                <li>
-                    <a href="{% url 'feedback:create' %}">{% trans "Feedback op dit portal geven" %}</a>
-                </li>
             </ul>
 
 

From 20c2e98687fb32dcdee39a9c2b478a9a07e2b346 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:23:48 +0100
Subject: [PATCH 072/148] feat: include submitter in other applicants mail

Fixes #554
---
 .../mail/concept_other_applicants.html        |  4 ++--
 .../mail/concept_other_applicants.txt         |  4 ++--
 .../submitted_longroute_other_applicants.html |  8 ++++----
 .../submitted_longroute_other_applicants.txt  |  8 ++++----
 ...submitted_shortroute_other_applicants.html |  8 ++++----
 .../submitted_shortroute_other_applicants.txt |  8 ++++----
 reviews/utils/review_utils.py                 | 20 +++++++++++++++----
 7 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/reviews/templates/mail/concept_other_applicants.html b/reviews/templates/mail/concept_other_applicants.html
index 5cc6b946e..ffe711064 100644
--- a/reviews/templates/mail/concept_other_applicants.html
+++ b/reviews/templates/mail/concept_other_applicants.html
@@ -3,7 +3,7 @@
 {% block content_nl %}
 Beste collega,<br />
 <br />
-Uw collega {{ creator }} heeft een concept-aanmelding ingediend bij de ethische commissie voor het onderzoek {{ title }}, waar u aan meewerkt.<br />
+Uw collega {{ creator }} (cc) heeft een concept-aanmelding ingediend bij de ethische commissie voor het onderzoek {{ title }}, waar u aan meewerkt.<br />
 De aanmelding wordt door de eindverantwoordelijk onderzoeker {{ supervisor }} van deze aanvraag gecontroleerd.
 Zodra deze de concept-aanmelding, evt. na kleine aanpassingen, heeft goedgekeurd en ter toetsing bij de FETC-GW heeft ingediend, krijgt uw collega {{ creator }} van ons bericht.<br />
 Indien de concept-aanmelding nog aanzienlijke wijzigingen uwerzijds behoeft zal de eindverantwoordelijk onderzoeker zelf contact met uw collega opnemen.<br />
@@ -14,7 +14,7 @@
 {% block content_en %}
 Dear colleague,<br />
 <br />
-Your colleague {{ creator }} has submitted a draft application to the ethics commision for the study {{ title }}, in which you are participating.<b />
+Your colleague {{ creator }} (cc) has submitted a draft application to the ethics commission for the study {{ title }}, in which you are participating.<b />
 The application will be checked by the study's supervisor {{ supervisor }}, the researcher who has the final responsibility of this study.<br />
 Your colleague {{ creator }} will receive a notification as soon as {{ supervisor }} has approved and formally submitted your draft application, possibly after making some minor revisions.<br />
 In case {{ supervisor }} finds it necessary for you to make more substantial revisions in the application, he/she will notify your colleague about this, and meanwhile formally disapprove the study in order for you to be able to revise and resubmit it.<br />
diff --git a/reviews/templates/mail/concept_other_applicants.txt b/reviews/templates/mail/concept_other_applicants.txt
index c40d5a63c..cf23ed1b2 100644
--- a/reviews/templates/mail/concept_other_applicants.txt
+++ b/reviews/templates/mail/concept_other_applicants.txt
@@ -3,7 +3,7 @@
 {% block content_nl %}
 Beste collega,
 
-Uw collega {{ creator }} heeft een concept-aanmelding ingediend bij de ethische commissie voor het onderzoek {{ title }}, waar u aan meewerkt.
+Uw collega {{ creator }} (cc) heeft een concept-aanmelding ingediend bij de ethische commissie voor het onderzoek {{ title }}, waar u aan meewerkt.
 De aanmelding wordt door de eindverantwoordelijk onderzoeker {{ supervisor }} van deze aanvraag gecontroleerd.
 Zodra deze de concept-aanmelding, evt. na kleine aanpassingen, heeft goedgekeurd en ter toetsing bij de FETC-GW heeft ingediend, krijgt uw collega {{ creator }} van ons bericht.
 Indien de concept-aanmelding nog aanzienlijke wijzigingen uwerzijds behoeft zal de eindverantwoordelijk onderzoeker zelf contact met uw collega opnemen.
@@ -14,7 +14,7 @@ U kunt de ingediende aanmelding hier in PDF vorm bekijken:
 {% block content_en %}
 Dear colleague,
 
-Your colleague {{ creator }} has submitted a draft application to the ethics commision for the study {{ title }}, in which you are participating.
+Your colleague {{ creator }} (cc) has submitted a draft application to the ethics commission for the study {{ title }}, in which you are participating.
 The application will be checked by the study's supervisor {{ supervisor }}, the researcher who has the final responsibility of this study.
 Your colleague {{ creator }} will receive a notification as soon as {{ supervisor }} has approved and formally submitted your draft application, possibly after making some minor revisions.
 In case {{ supervisor }} finds it necessary for you to make more substantial revisions in the application, he/she will notify your colleague about this, and meanwhile formally disapprove the study in order for you to be able to revise and resubmit it.
diff --git a/reviews/templates/mail/submitted_longroute_other_applicants.html b/reviews/templates/mail/submitted_longroute_other_applicants.html
index b8f87b052..a2a06cb17 100644
--- a/reviews/templates/mail/submitted_longroute_other_applicants.html
+++ b/reviews/templates/mail/submitted_longroute_other_applicants.html
@@ -4,14 +4,14 @@
 {% if was_revised %}
 Beste collega,<br/>
 <br/>
-Uw collega {{ creator }} heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.<br/>
+Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.<br/>
 <br/>
 Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.<br/>
 U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
 {% else %}
 Beste collega,<br/>
 <br/>
-Uw collega {{ creator }} heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>lange-route onderzoek</em>, zie <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">appendix A van het reglement</a> voor de criteria.<br/>
+Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>lange-route onderzoek</em>, zie <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">appendix A van het reglement</a> voor de criteria.<br/>
 <br/>
 Dit houdt in dat je aanvraag op de eerstvolgende vergadering van de FETC-GW zal worden besproken, wanneer je aanvraag tenminste een week voor die vergadering is ingediend. Zie <a href="https://fetc-gw.wp.hum.uu.nl/category/agenda/">de FETC-GW-agenda</a> voor een overzicht van de komende vergaderingen. Kort na de vergadering zal {{ creator }} de beoordeling ontvangen.<br/>
 U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
@@ -22,14 +22,14 @@
 {% if was_revised %}
 Dear colleague,<br/>
 <br/>
-Your colleague {{ creator }} has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your application.<br/>
+Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your application.<br/>
 <br/>
 This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send your colleague {{ creator }} a review soon.<br/>
 You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
 {% else %}
 Dear colleague,<br/>
 <br/>
-Your colleague {{ creator }} has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>long-route research</em>, see <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"> appendix A in the regulations</a> for the criteria.<br/>
+Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>long-route research</em>, see <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"> appendix A in the regulations</a> for the criteria.<br/>
 <br/>
 This means that your study will be discussed during the next FEtC-H meeting, if your application was submitted at least one week before that meeting. See <a href="https://fetc-gw.wp.hum.uu.nl/en/category/agenda-en/">the FEtC-H agenda</a> for an overview of upcoming meetings. {{ creator }} will receive the assessment shortly after the meeting.<br/>
 You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
diff --git a/reviews/templates/mail/submitted_longroute_other_applicants.txt b/reviews/templates/mail/submitted_longroute_other_applicants.txt
index 1e5026c1b..371b6b471 100644
--- a/reviews/templates/mail/submitted_longroute_other_applicants.txt
+++ b/reviews/templates/mail/submitted_longroute_other_applicants.txt
@@ -4,7 +4,7 @@
 {% if was_revised %}
 Beste collega,
 
-Uw collega {{ creator }} heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.
+Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.
 
 Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.
 U kunt de ingediende aanmelding hier in PDF vorm bekijken:
@@ -12,7 +12,7 @@ U kunt de ingediende aanmelding hier in PDF vorm bekijken:
 {% else %}
 Beste collega,
 
-Uw collega {{ creator }} heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status 'lange-route onderzoek', zie appendix A van het reglement voor de criteria (https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/).
+Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status 'lange-route onderzoek', zie appendix A van het reglement voor de criteria (https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/).
 
 Dit houdt in dat je aanvraag op de eerstvolgende vergadering van de FETC-GW zal worden besproken, wanneer je aanvraag tenminste een week voor die vergadering is ingediend. Zie de FETC-GW-agenda (https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/) voor een overzicht van de komende vergaderingen. Kort na de vergadering zal {{ creator }} de beoordeling ontvangen.
 U kunt de ingediende aanmelding hier in PDF vorm bekijken:
@@ -24,7 +24,7 @@ U kunt de ingediende aanmelding hier in PDF vorm bekijken:
 {% if was_revised %}
 Dear colleague,
 
-Your colleague {{ creator }} has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your application.
+Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your application.
 
 This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send your colleague {{ creator }} a review soon.
 You can find a PDF file of your submission here:
@@ -32,7 +32,7 @@ You can find a PDF file of your submission here:
 {% else %}
 Dear colleague,
 
-Your colleague {{ creator }} has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of long-route research, see appendix A in the regulations for the criteria (https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/).
+Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of long-route research, see appendix A in the regulations for the criteria (https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/).
 
 This means that your study will be discussed during the next FEtC-H meeting, if your application was submitted at least one week before that meeting. See the FEtC-H agenda (https://fetc-gw.wp.hum.uu.nl/en/category/agenda-en/) for an overview of upcoming meetings. {{ creator }} will receive the assessment shortly after the meeting.
 You can find a PDF file of your submission here:
diff --git a/reviews/templates/mail/submitted_shortroute_other_applicants.html b/reviews/templates/mail/submitted_shortroute_other_applicants.html
index 0ff83a5c1..86e8c69d9 100644
--- a/reviews/templates/mail/submitted_shortroute_other_applicants.html
+++ b/reviews/templates/mail/submitted_shortroute_other_applicants.html
@@ -4,14 +4,14 @@
 {% if was_revised %}
 Beste collega,<br/>
 <br/>
-Uw collega {{ creator }} heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.<br/>
+Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.<br/>
 <br/>
 Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.<br/>
 U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
 {% else %}
 Beste collega,<br/>
 <br/>
-Uw collega {{ creator }} heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>korte-route onderzoek</em> gekregen.<br/>
+Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>korte-route onderzoek</em> gekregen.<br/>
 <br/>
 Dit houdt in dat wij ernaar streven om uw collega binnen twee werkweken een eerste beoordeling van de FETC-GW te sturen.<br/>
 U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
@@ -24,14 +24,14 @@
 {% if was_revised %}
 Dear colleague,<br/>
 <br/>
-Your colleague {{ creator }} has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your revised application.<br/>
+Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your revised application.<br/>
 <br/>
 This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.<br/>
 You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
 {% else %}
 Dear colleague,<br/>
 <br/>
-Your colleague {{ creator }} has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>short-route research</em>. This means that your colleague will receive an assessment within two working weeks.<br/>
+Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>short-route research</em>. This means that your colleague will receive an assessment within two working weeks.<br/>
 You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
 <br/>
 Note: It is possible that your application may still be classified as a 'long-route research', in which case the asssessment procedure may take longer, see the <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">regulations</a> for information. If the latter case, see <a href="http://fetc-gw.wp.hum.uu.nl/regulations/">section 2.8, p. 14</a> for the possible time paths.<br/>
diff --git a/reviews/templates/mail/submitted_shortroute_other_applicants.txt b/reviews/templates/mail/submitted_shortroute_other_applicants.txt
index d7d3d5683..5bb882d67 100644
--- a/reviews/templates/mail/submitted_shortroute_other_applicants.txt
+++ b/reviews/templates/mail/submitted_shortroute_other_applicants.txt
@@ -4,7 +4,7 @@
 {% if was_revised %}
 Beste collega,
 
-Uw collega {{ creator }} heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.
+Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.
 
 Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.
 U kunt de ingediende aanmelding hier in PDF vorm bekijken:
@@ -12,7 +12,7 @@ U kunt de ingediende aanmelding hier in PDF vorm bekijken:
 {% else %}
 Beste collega,
 
-Uw collega {{ creator }} heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status 'korte-route onderzoek' gekregen.
+Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status 'korte-route onderzoek' gekregen.
 
 Dit houdt in dat wij ernaar streven om uw collega binnen twee werkweken een eerste beoordeling van de FETC-GW te sturen.
 U kunt de ingediende aanmelding hier in PDF vorm bekijken:
@@ -26,7 +26,7 @@ NB: Het is mogelijk dat de aanvraag alsnog als 'lange-route onderzoek' wordt aan
 {% if was_revised %}
 Dear colleague,
 
-Your colleague {{ creator }} has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your revised application.
+Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your revised application.
 
 This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send your colleague {{ creator }} a review soon.
 You can find a PDF file of your submission here:
@@ -34,7 +34,7 @@ You can find a PDF file of your submission here:
 {% else %}
 Dear colleague,
 
-Your colleague {{ creator }} has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of 'short-route research'.
+Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of 'short-route research'.
 
 This means that we aim to send your colleague an initial assessment of the FETC-GW within two working weeks.
 You can find a PDF file of your submission here:
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 772ed176f..dbf9c8da9 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -67,8 +67,15 @@ def start_supervisor_phase(proposal):
         params['creator'] = proposal.created_by.get_full_name()
         msg_plain = render_to_string('mail/concept_other_applicants.txt', params)
         msg_html = render_to_string('mail/concept_other_applicants.html', params)
-        applicants_to_remove = [proposal.created_by, proposal.supervisor]
+
+        # Note: the original applicant gets the email as well as primary
+        # recipient
+        # They should be regarded as CC'd, but the currently used mail API
+        # doesn't support that. When moving to cdh.core mailing this should
+        # be corrected
+        applicants_to_remove = [proposal.supervisor]
         other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
+
         send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
 
     subject = _('FETC-GW {}: beoordelen als eindverantwoordelijke'.format(reference))
@@ -147,10 +154,15 @@ def start_assignment_phase(proposal):
         else:
             msg_plain = render_to_string('mail/submitted_longroute_other_applicants.txt', params)
             msg_html = render_to_string('mail/submitted_longroute_other_applicants.html', params)
-        applicants_to_remove = [proposal.created_by]
-        other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
 
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
+        # Note: the original applicant gets the email as well as primary
+        # recipient
+        # They should be regarded as CC'd, but the currently used mail API
+        # doesn't support that. When moving to cdh.core mailing this should
+        # be corrected
+        applicants_emails = [applicant.email for applicant in
+                             proposal.applicants.all()]
+        send_mail(subject, msg_plain, settings.EMAIL_FROM, applicants_emails, html_message=msg_html)
 
     if proposal.inform_local_staff:
         notify_local_staff(proposal)

From 9bae35b766d5af34003c262428d6658f71dd526d Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:24:51 +0100
Subject: [PATCH 073/148] fix: remove E-prime from fixture

Fixes #549
---
 tasks/fixtures/registrations.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/tasks/fixtures/registrations.json b/tasks/fixtures/registrations.json
index 7acbf8c3d..6d796ae4b 100644
--- a/tasks/fixtures/registrations.json
+++ b/tasks/fixtures/registrations.json
@@ -49,9 +49,9 @@
     "pk": 4,
     "fields": {
         "order": 4,
-        "description": "gedrags- en/of reactietijd-registratie via experimentsoftware zoals jsPsych, Zep, Presentation, E-prime, etc",
-        "description_nl": "gedrags- en/of reactietijd-registratie via experimentsoftware zoals jsPsych, Zep, Presentation, E-prime, etc",
-        "description_en": "behavioral- and/or reaction time registration using experiment software such as jsPsych, Zep, Presentation, E-prime, etc.",
+        "description": "gedrags- en/of reactietijd-registratie via experimentsoftware zoals jsPsych, Zep, Presentation, etc",
+        "description_nl": "gedrags- en/of reactietijd-registratie via experimentsoftware zoals jsPsych, Zep, Presentation, etc",
+        "description_en": "behavioral- and/or reaction time registration using experiment software such as jsPsych, Zep, Presentation, etc.",
         "is_local": true,
         "needs_details": false,
         "needs_kind": false,

From 6364f3151a75755f31050076873c3167dbed330c Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:29:29 +0100
Subject: [PATCH 074/148] feature: add help text for other_applicants

Fixes #550
---
 locale/en/LC_MESSAGES/django.mo | Bin 148888 -> 147284 bytes
 locale/en/LC_MESSAGES/django.po | 810 +++++++++++++++-----------------
 proposals/models.py             |   9 +
 3 files changed, 395 insertions(+), 424 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 7f7aaf9ee8ba9bd0b2971da546689db7d244d140..d1d22016cf74818ef34ce87791e257ab18dba617 100644
GIT binary patch
delta 19169
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
JD*N6G{(pH9?|1+J

delta 20116
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
H&-woViL%Z}

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 705dc97c8..37add6149 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -2,12 +2,11 @@
 # Copyright (C) 2016
 # This file is distributed under the same license as the fetc-h package.
 # Martijn van der Klis <M.H.vanderKlis@uu.nl>, 2016.
-#, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-07 10:34+0100\n"
+"POT-Creation-Date: 2023-11-10 15:28+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -18,8 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
-#: faqs/menus.py:7 main/templates/base/menu.html:125
-#: main/templates/main/index.html:201
+#: faqs/menus.py:7 main/templates/main/index.html:201
 msgid "FETC-GW website"
 msgstr "FEtC-H website"
 
@@ -36,8 +34,7 @@ msgstr "Regulations FEtC-H"
 msgid "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/"
 msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
-#: faqs/menus.py:17 main/templates/base/menu.html:134
-#: main/templates/main/index.html:209
+#: faqs/menus.py:17 main/templates/main/index.html:209
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
 #: proposals/utils/pdf_diff_logic.py:859
@@ -50,17 +47,11 @@ msgstr ""
 "https://intranet.uu.nl/en/knowledgebase/documents-ethics-assessment-"
 "committee-humanities"
 
-#: faqs/menus.py:22 main/templates/base/menu.html:137
+#: faqs/menus.py:22
 msgid "FAQs"
 msgstr "FAQs"
 
-#: faqs/menus.py:26 feedback/models.py:20
-#: feedback/templates/feedback/feedback_list.html:22
-#: main/templates/base/menu.html:140
-msgid "Feedback"
-msgstr "Feedback"
-
-#: faqs/menus.py:31 main/templates/base/menu.html:122
+#: faqs/menus.py:27
 msgid "Help"
 msgstr "Help"
 
@@ -72,97 +63,11 @@ msgstr "FAQ"
 msgid "Frequently Asked Questions"
 msgstr "Frequently Asked Questions"
 
-#: feedback/models.py:6
-msgid "Open"
-msgstr "Open"
-
-#: feedback/models.py:7
-msgid "Opgepakt"
-msgstr "In progress"
-
-#: feedback/models.py:8
-msgid "Afgehandeld"
-msgstr "Processed"
-
-#: feedback/models.py:12
-msgid "Laag"
-msgstr "Low"
-
-#: feedback/models.py:13
-msgid "Gemiddeld"
-msgstr "Average"
-
-#: feedback/models.py:14
-msgid "Hoog"
-msgstr "High"
-
-#: feedback/templates/feedback/feedback_form.html:7
-#: feedback/templates/feedback/feedback_form.html:14
-#: feedback/templates/feedback/feedback_form.html:25
-msgid "Feedback versturen"
-msgstr "Send feedback"
-
-#: feedback/templates/feedback/feedback_form.html:17
-msgid "Hier kan je feedback achterlaten op het FETC-GW portal."
-msgstr "You can leave feedback on the FEtC-H portal here."
-
-#: feedback/templates/feedback/feedback_form.html:23
-#: observations/templates/observations/observation_update_attachments.html:39
-#: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:58
-#: proposals/templates/proposals/proposal_update_attachments.html:26
-#: reviews/templates/reviews/change_chamber_form.html:19
-#: reviews/templates/reviews/decision_form.html:90
-#: reviews/templates/reviews/review_assign_form.html:46
-#: reviews/templates/reviews/review_close_form.html:41
-#: reviews/templates/reviews/review_discontinue_form.html:72
-#: studies/templates/studies/study_update_attachments.html:26
-msgid "Terug naar de vorige pagina"
-msgstr "Back to the previous page"
-
-#: feedback/templates/feedback/feedback_list.html:8
-#: feedback/templates/feedback/feedback_list.html:15
-msgid "Feedbackoverzicht"
-msgstr "Feedback overview"
-
-#: feedback/templates/feedback/feedback_list.html:20
-msgid "Toegevoegd op"
-msgstr "Added on"
-
-#: feedback/templates/feedback/feedback_list.html:21
-msgid "URL"
-msgstr "URL"
-
-#: feedback/templates/feedback/feedback_list.html:23
-msgid "Gegeven door"
-msgstr "Given by"
-
-#: feedback/templates/feedback/feedback_thanks.html:7
-#: feedback/templates/feedback/feedback_thanks.html:14
-msgid "Bedankt voor je feedback!"
-msgstr "Thanks for your feedback!"
-
-#: feedback/templates/feedback/feedback_thanks.html:17
-#, python-format
-msgid ""
-"\n"
-"                Klik <a href=\"%(url)s\">hier</a> om terug te keren naar "
-"pagina waar je gebleven was.\n"
-"                "
-msgstr ""
-"\n"
-"Click <a href=\"%(url)s\">here</a> to return to where you left off.\n"
-"   "
-
-#: feedback/views.py:15
-msgid "Feedback verstuurd"
-msgstr "Feedback sent"
-
-#: fetc/settings.py:133
+#: fetc/settings.py:132
 msgid "Nederlands"
 msgstr "Dutch"
 
-#: fetc/settings.py:134
+#: fetc/settings.py:133
 msgid "Engels"
 msgstr "English"
 
@@ -282,14 +187,13 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
+#: proposals/forms.py:570 proposals/forms.py:643 proposals/forms.py:658
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
 
-#: main/menus.py:6 main/templates/base/menu.html:7
-#: main/templates/main/index.html:7 main/templates/main/index.html:56
-#: main/templates/main/landing.html:34
+#: main/menus.py:6 main/templates/main/index.html:7
+#: main/templates/main/index.html:56 main/templates/main/landing.html:34
 msgid "Startpagina"
 msgstr "Start page"
 
@@ -317,7 +221,7 @@ msgstr "uncertain"
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:70 observations/models.py:129 proposals/models.py:255
+#: main/models.py:70 observations/models.py:129 proposals/models.py:264
 #: studies/models.py:208 studies/models.py:244 tasks/models.py:157
 #: tasks/models.py:169
 msgid "Namelijk"
@@ -397,7 +301,7 @@ msgstr "Phase"
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
-#: reviews/templates/reviews/vue_templates/review_list.html:151
+#: reviews/templates/reviews/vue_templates/review_list.html:157
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
@@ -405,7 +309,7 @@ msgstr "Date submitted"
 #: reviews/templates/reviews/committee_members_workload.html:27
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
-#: reviews/templates/reviews/vue_templates/review_list.html:161
+#: reviews/templates/reviews/vue_templates/review_list.html:167
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
@@ -417,7 +321,7 @@ msgstr "My decision"
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
-#: reviews/templates/reviews/vue_templates/review_list.html:131
+#: reviews/templates/reviews/vue_templates/review_list.html:137
 msgid "Afhandeling"
 msgstr "Conclusion"
 
@@ -468,7 +372,7 @@ msgstr "Website export text"
 #: proposals/templates/proposals/proposal_confirmation.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:88
-#: reviews/utils/review_actions.py:244
+#: reviews/utils/review_actions.py:245
 msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
@@ -505,147 +409,6 @@ msgstr "Save and go to next step >>"
 msgid "Welkom {}"
 msgstr "Welcome {}"
 
-#: main/templates/base/menu.html:11 proposals/menus.py:80
-msgid "Mijn aanvragen"
-msgstr "My applications"
-
-#: main/templates/base/menu.html:14 proposals/menus.py:9
-msgid "Nieuwe aanvraag starten"
-msgstr "Start a new application"
-
-#: main/templates/base/menu.html:17
-msgid "Nieuwe studie starten op basis van een kopie van een oude studie"
-msgstr "Start a new study based on a copy of an old study"
-
-#: main/templates/base/menu.html:20
-msgid "Nieuwe voortoetsing aanvraag starten"
-msgstr "Start a new preliminary application"
-
-#: main/templates/base/menu.html:23
-msgid ""
-"Nieuwe aanvraag starten (die al goedgekeurd is door een andere ethische "
-"toetsingscommissie)"
-msgstr ""
-"Start a new application (that has been approved by another ethics committee)"
-
-#: main/templates/base/menu.html:26 proposals/menus.py:30
-msgid "Maak een revisie van een bestaande aanvraag"
-msgstr "Create a revision for an existing application"
-
-#: main/templates/base/menu.html:29 proposals/menus.py:34
-msgid "Maak een amendement van een al goedgekeurde aanvraag"
-msgstr "Create an amendment to an already approved application"
-
-#: main/templates/base/menu.html:32 proposals/menus.py:56
-#: proposals/views/proposal_views.py:77
-msgid "Mijn conceptaanvragen"
-msgstr "My draft applications"
-
-#: main/templates/base/menu.html:35 proposals/menus.py:60
-#: proposals/views/proposal_views.py:127
-msgid "Mijn oefenaanvragen"
-msgstr "My practice applications"
-
-#: main/templates/base/menu.html:38 proposals/menus.py:64
-#: proposals/views/proposal_views.py:89
-msgid "Mijn ingediende aanvragen"
-msgstr "My submitted applications"
-
-#: main/templates/base/menu.html:41 proposals/menus.py:68
-#: proposals/views/proposal_views.py:101
-msgid "Mijn afgehandelde aanvragen"
-msgstr "My processed applications"
-
-#: main/templates/base/menu.html:44 proposals/menus.py:72
-#: proposals/views/proposal_views.py:113
-msgid "Mijn aanvragen als eindverantwoordelijke"
-msgstr "My supervised applications"
-
-#: main/templates/base/menu.html:47 proposals/menus.py:52
-msgid "Al mijn aanvragen"
-msgstr "All my applications"
-
-#: main/templates/base/menu.html:52 proposals/menus.py:110
-#: proposals/views/proposal_views.py:154
-msgid "Archief"
-msgstr "Archive"
-
-#: main/templates/base/menu.html:55
-msgid "Alle aanvragen bekijken van de Algemene Kamer"
-msgstr "View all applications of the General Chamber"
-
-#: main/templates/base/menu.html:58
-msgid "Alle aanvragen bekijken van de Linguïstiek Kamer"
-msgstr ""
-"View all processed and approved applications of the Linguistics Chamber"
-
-#: main/templates/base/menu.html:62 proposals/menus.py:100
-msgid "Site-export"
-msgstr "Site-export"
-
-#: main/templates/base/menu.html:69 reviews/forms.py:31 reviews/menus.py:60
-#: reviews/mixins.py:127
-msgid "Algemene Kamer"
-msgstr "General Chamber"
-
-#: main/templates/base/menu.html:72 main/templates/base/menu.html:99
-#: reviews/menus.py:14 reviews/views.py:70
-msgid "Mijn openstaande besluiten"
-msgstr "My pending decisions"
-
-#: main/templates/base/menu.html:75 main/templates/base/menu.html:102
-#: reviews/menus.py:18
-msgid "Al mijn besluiten"
-msgstr "All my decisions"
-
-#: main/templates/base/menu.html:79 main/templates/base/menu.html:106
-#: reviews/menus.py:22
-msgid "Alle openstaande besluiten commissieleden"
-msgstr "All pending decisions committee members"
-
-#: main/templates/base/menu.html:82 main/templates/base/menu.html:109
-#: reviews/menus.py:27
-msgid "Alle openstaande besluiten eindverantwoordelijken"
-msgstr "All pending decisions supervisors"
-
-#: main/templates/base/menu.html:85 main/templates/base/menu.html:112
-#: reviews/menus.py:32 reviews/views.py:229
-msgid "Nog af te handelen aanvragen"
-msgstr "Applications waiting for conclusion"
-
-#: main/templates/base/menu.html:88 main/templates/base/menu.html:115
-#: reviews/menus.py:47 reviews/views.py:275
-msgid "Alle ingezonden aanvragen"
-msgstr "All submitted applications"
-
-#: main/templates/base/menu.html:96 reviews/forms.py:32 reviews/menus.py:67
-#: reviews/mixins.py:130
-msgid "Linguïstiek Kamer"
-msgstr "Linguistics Chamber"
-
-#: main/templates/base/menu.html:128
-msgid "Reglement Algemene Kamer (AK)"
-msgstr "Regulations General Chamber (GC)"
-
-#: main/templates/base/menu.html:131
-msgid " Reglement Linguïstiek Kamer (LK) "
-msgstr " Regulations Linguistics Chamber (LC) "
-
-#: main/templates/base/menu.html:145
-#: main/templates/registration/logged_out.html:9
-msgid "Uitloggen"
-msgstr "Log out"
-
-#: main/templates/base/menu.html:149
-msgid "FETC-GW-website"
-msgstr "FEtC-H website"
-
-#: main/templates/base/menu.html:152 main/templates/main/landing.html:77
-#: main/templates/registration/login.html:15
-#: main/templates/registration/login.html:32
-msgid "Inloggen"
-msgstr "Log in"
-
 #: main/templates/base/sidebar.html:27
 msgid "Toon voortgang"
 msgstr "Show progress"
@@ -1001,11 +764,7 @@ msgstr "Regulations of the FEtC-H"
 msgid "Veelgestelde vragen m.b.t. dit portal"
 msgstr "Frequently asked questions relating to this portal"
 
-#: main/templates/main/index.html:215
-msgid "Feedback op dit portal geven"
-msgstr "Give feedback on this portal"
-
-#: main/templates/main/index.html:225
+#: main/templates/main/index.html:222
 msgid "Bannerfoto door Kim O'leary"
 msgstr "Cover image by Kim O'leary"
 
@@ -1042,6 +801,12 @@ msgstr "Javascript needs to be enabled to see the email address"
 msgid "Technische ondersteuning"
 msgstr "Technical support"
 
+#: main/templates/main/landing.html:77
+#: main/templates/registration/login.html:15
+#: main/templates/registration/login.html:32
+msgid "Inloggen"
+msgstr "Log in"
+
 #: main/templates/main/landing.html:79
 msgid ""
 "Om in te loggen heb je een Solis-ID nodig. Heb je geen Solis-ID, neem dan "
@@ -1054,6 +819,10 @@ msgstr ""
 msgid "Log in met je Solis-ID"
 msgstr "Log in with your Solis-ID"
 
+#: main/templates/registration/logged_out.html:9
+msgid "Uitloggen"
+msgstr "Log out"
+
 #: main/templates/registration/logged_out.html:12
 msgid "Je bent succesvol uitgelogd."
 msgstr "You have successfully logged out."
@@ -1154,7 +923,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:756 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1265,6 +1034,7 @@ msgstr "Recording behaviour"
 #: proposals/templates/proposals/proposal_update_attachments.html:7
 #: proposals/templates/proposals/proposal_update_attachments.html:14
 #: proposals/templates/proposals/proposal_update_attachments.html:25
+#: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
 #: studies/templates/studies/study_update_attachments.html:14
 #: studies/templates/studies/study_update_attachments.html:25
@@ -1281,6 +1051,20 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>), trajectory %(order)s."
 
+#: observations/templates/observations/observation_update_attachments.html:39
+#: proposals/templates/proposals/proposal_confirmation.html:36
+#: proposals/templates/proposals/proposal_diff.html:58
+#: proposals/templates/proposals/proposal_update_attachments.html:26
+#: proposals/templates/proposals/proposal_update_date_start.html:29
+#: reviews/templates/reviews/change_chamber_form.html:19
+#: reviews/templates/reviews/decision_form.html:90
+#: reviews/templates/reviews/review_assign_form.html:46
+#: reviews/templates/reviews/review_close_form.html:41
+#: reviews/templates/reviews/review_discontinue_form.html:72
+#: studies/templates/studies/study_update_attachments.html:26
+msgid "Terug naar de vorige pagina"
+msgstr "Back to the previous page"
+
 #: observations/utils.py:8 studies/models.py:143 studies/models.py:265
 #: studies/templates/studies/study_end.html:89
 msgid "Observatieonderzoek"
@@ -1307,7 +1091,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:42 proposals/models.py:221
+#: proposals/forms.py:43 proposals/models.py:230
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1316,19 +1100,19 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
+#: proposals/forms.py:64 proposals/forms.py:280 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:133
+#: proposals/forms.py:134
 msgid "Selecteer..."
 msgstr "Select..."
 
-#: proposals/forms.py:140
+#: proposals/forms.py:141
 msgid "Docent"
 msgstr "Professor"
 
-#: proposals/forms.py:141
+#: proposals/forms.py:142
 msgid ""
 "Vul hier de docent van de cursus in waarbinnen je deze portal moet "
 "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De "
@@ -1339,23 +1123,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:192
+#: proposals/forms.py:193
 msgid "Je dient een promotor/begeleider op te geven."
 msgstr "You are required to specify a promotor/supervisor."
 
-#: proposals/forms.py:199
+#: proposals/forms.py:200
 msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
 msgstr "You cannot submit yourself as the promotor/supervisor."
 
-#: proposals/forms.py:213
+#: proposals/forms.py:214
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:218
+#: proposals/forms.py:219
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:228
+#: proposals/forms.py:229
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1363,7 +1147,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:238
+#: proposals/forms.py:239
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1376,23 +1160,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:265
+#: proposals/forms.py:266
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:285 proposals/models.py:538
+#: proposals/forms.py:286 proposals/models.py:547
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:287 proposals/models.py:540
+#: proposals/forms.py:288 proposals/models.py:549
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:327 proposals/forms.py:362
+#: proposals/forms.py:328 proposals/forms.py:363
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:329 proposals/forms.py:364
+#: proposals/forms.py:330 proposals/forms.py:365
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1402,11 +1186,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:336
+#: proposals/forms.py:337
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:337
+#: proposals/forms.py:338
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1414,69 +1198,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:371
+#: proposals/forms.py:372
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:372
+#: proposals/forms.py:373
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
+#: proposals/forms.py:428 proposals/forms.py:558 proposals/forms.py:691
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:435
+#: proposals/forms.py:436
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:493
+#: proposals/forms.py:494
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:501
+#: proposals/forms.py:502
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:503
+#: proposals/forms.py:504
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:505
+#: proposals/forms.py:506
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:507
+#: proposals/forms.py:508
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:509
+#: proposals/forms.py:510
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:511
+#: proposals/forms.py:512
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:513
+#: proposals/forms.py:514
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:515
+#: proposals/forms.py:516
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:517
+#: proposals/forms.py:518
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:519
+#: proposals/forms.py:520
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:563
+#: proposals/forms.py:564
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1484,15 +1268,19 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:640
+#: proposals/forms.py:588
+msgid "Nieuwe beoogde startdatum"
+msgstr "New intended start date"
+
+#: proposals/forms.py:650
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:644
+#: proposals/forms.py:654
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:656
+#: proposals/forms.py:666
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1500,10 +1288,14 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:687
+#: proposals/forms.py:697
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
+#: proposals/menus.py:9
+msgid "Nieuwe aanvraag starten"
+msgstr "Start a new application"
+
 #: proposals/menus.py:13
 msgid "Nieuwe aanvraag starten op basis van een kopie van een oude aanvraag"
 msgstr "Start a new application based on a copy of an old application"
@@ -1524,10 +1316,46 @@ msgstr ""
 msgid "Nieuwe oefenaanvraag starten"
 msgstr "Start a new practice application"
 
+#: proposals/menus.py:30
+msgid "Maak een revisie van een bestaande aanvraag"
+msgstr "Create a revision for an existing application"
+
+#: proposals/menus.py:34
+msgid "Maak een amendement van een al goedgekeurde aanvraag"
+msgstr "Create an amendment to an already approved application"
+
 #: proposals/menus.py:42
 msgid "Nieuwe aanvraag"
 msgstr "New application"
 
+#: proposals/menus.py:52
+msgid "Al mijn aanvragen"
+msgstr "All my applications"
+
+#: proposals/menus.py:56 proposals/views/proposal_views.py:78
+msgid "Mijn conceptaanvragen"
+msgstr "My draft applications"
+
+#: proposals/menus.py:60 proposals/views/proposal_views.py:128
+msgid "Mijn oefenaanvragen"
+msgstr "My practice applications"
+
+#: proposals/menus.py:64 proposals/views/proposal_views.py:90
+msgid "Mijn ingediende aanvragen"
+msgstr "My submitted applications"
+
+#: proposals/menus.py:68 proposals/views/proposal_views.py:102
+msgid "Mijn afgehandelde aanvragen"
+msgstr "My processed applications"
+
+#: proposals/menus.py:72 proposals/views/proposal_views.py:114
+msgid "Mijn aanvragen als eindverantwoordelijke"
+msgstr "My supervised applications"
+
+#: proposals/menus.py:80
+msgid "Mijn aanvragen"
+msgstr "My applications"
+
 #: proposals/menus.py:90
 msgid "Bekijk alle goedgekeurde aanvragen van de Algemene Kamer"
 msgstr "View all approved applications of the General Chamber"
@@ -1536,6 +1364,14 @@ msgstr "View all approved applications of the General Chamber"
 msgid "Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"
 msgstr "View all approved applications of the Linguistics Chamber"
 
+#: proposals/menus.py:100
+msgid "Site-export"
+msgstr "Site-export"
+
+#: proposals/menus.py:110 proposals/views/proposal_views.py:155
+msgid "Archief"
+msgstr "Archive"
+
 #: proposals/mixins.py:20
 #, python-format
 msgid "Aanvraag %(title)s bewerkt"
@@ -1628,11 +1464,23 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:229
+#: proposals/models.py:218
+msgid ""
+"Werk je samen met een onderzoeker of organisatie buiten de UU en is je "
+"onderzoek niet strikt anoniem? Neem dan contact op met de <a href=\"mailto:"
+"privacy.gw@uu.nl\">privacy officer</a>. Er moeten dan wellicht afspraken "
+"worden gemaakt over de verwerking van persoonsgegevens."
+msgstr ""
+"Do you work with a researcher or organization outside the UU and is your "
+"research not strictly anonymous? Please contact the <a href=\"mailto:privacy."
+"gw@uu.nl\">privacy officer</a>. Agreements may then have to be made about "
+"the processing of personal data."
+
+#: proposals/models.py:238
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:234
+#: proposals/models.py:243
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
 "Nederlands of Engels?"
@@ -1640,30 +1488,30 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:241
+#: proposals/models.py:250
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:250
+#: proposals/models.py:259
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:261
+#: proposals/models.py:270
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:265
+#: proposals/models.py:274
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:271
+#: proposals/models.py:280
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:277
+#: proposals/models.py:286
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
 "faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS "
@@ -1686,7 +1534,7 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:297
+#: proposals/models.py:306
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
 "ervoor kiezen je applicatie pas later op te laten nemen in het           "
@@ -1698,16 +1546,16 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:308
+#: proposals/models.py:317
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:318
+#: proposals/models.py:327
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:326
+#: proposals/models.py:335
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
 "deze FETC-GW commissie?"
@@ -1715,11 +1563,11 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:334
+#: proposals/models.py:343
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:342
+#: proposals/models.py:351
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
 "doc(x)-formaat)"
@@ -1727,22 +1575,22 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:350
+#: proposals/models.py:359
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:355
+#: proposals/models.py:364
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:367
+#: proposals/models.py:376
 msgid ""
 "Kan voor alle deelnemersgroepen dezelfde informatiebrief en         "
 "toestemmingsverklaring gebruikt worden?"
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:369
+#: proposals/models.py:378
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
 "sprake van in essentie hetzelfde traject, en voldoet één set documenten voor "
@@ -1766,11 +1614,11 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:385
+#: proposals/models.py:394
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:403
+#: proposals/models.py:412
 msgid ""
 "Ik heb kennis genomen van het bovenstaande en begrijp mijn "
 "verantwoordelijkheden ten opzichte van de AVG."
@@ -1778,7 +1626,7 @@ msgstr ""
 "I have read the information above and have considered my responsibilities "
 "with regard to the AVG."
 
-#: proposals/models.py:410
+#: proposals/models.py:419
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
 "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het "
@@ -1788,24 +1636,24 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980
+#: proposals/models.py:431 proposals/utils/pdf_diff_logic.py:980
 #: reviews/models.py:184
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:434
+#: proposals/models.py:443
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:439 reviews/forms.py:110
+#: proposals/models.py:448 reviews/forms.py:110
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:444
+#: proposals/models.py:453
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:450
+#: proposals/models.py:459
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
 "kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden."
@@ -1814,23 +1662,23 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:464
+#: proposals/models.py:473
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:472
+#: proposals/models.py:481
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:479
+#: proposals/models.py:488
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:486
+#: proposals/models.py:495
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:493
+#: proposals/models.py:502
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
 "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met "
@@ -1844,7 +1692,7 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:510
+#: proposals/models.py:519
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
 "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
@@ -1853,13 +1701,13 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:517
+#: proposals/models.py:526
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
 msgid "Promotor/Begeleider"
 msgstr "Promotor/Supervisor"
 
-#: proposals/models.py:520
+#: proposals/models.py:529
 msgid ""
 "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
 "                    naar je promotor of begeleider gestuurd worden. Deze "
@@ -1889,53 +1737,53 @@ msgstr ""
 "you wait for them to do this, but remember to come back and fill in this "
 "field before submitting."
 
-#: proposals/models.py:547
+#: proposals/models.py:556
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:619
+#: proposals/models.py:628
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:628 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:625
+#: proposals/models.py:634
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:630
+#: proposals/models.py:639
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:632
+#: proposals/models.py:641
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:634
+#: proposals/models.py:643
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:732
+#: proposals/models.py:741
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:733
+#: proposals/models.py:742
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:734
+#: proposals/models.py:743
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:738
+#: proposals/models.py:747
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1943,11 +1791,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:752
+#: proposals/models.py:761
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:758
+#: proposals/models.py:767
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1955,7 +1803,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:760
+#: proposals/models.py:769
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1976,7 +1824,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:776
+#: proposals/models.py:785
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1985,15 +1833,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:783
+#: proposals/models.py:792
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:788
+#: proposals/models.py:797
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:826
+#: proposals/models.py:835
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -3160,6 +3008,26 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
+#: proposals/templates/proposals/proposal_update_date_start.html:14
+#: proposals/templates/proposals/proposal_update_date_start.html:28
+msgid "Startdatum aanpassen"
+msgstr "Edit start date"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:17
+#, python-format
+msgid ""
+"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
+"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
+"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
+"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
+"met"
+msgstr ""
+"On this page, the start date of proposal %(title)s (reference number "
+"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
+"already been concluded, the new start date will not be displayed in the PDF. "
+"If you would like the PDF to be generated with the new start date, please "
+"reach out to "
+
 #: proposals/templates/proposals/study_consent.html:27
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
@@ -3323,7 +3191,7 @@ msgstr "Route:"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:187
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
-#: reviews/templates/reviews/vue_templates/review_list.html:184
+#: reviews/templates/reviews/vue_templates/review_list.html:190
 msgid "Indieners"
 msgstr "Applicants"
 
@@ -3344,7 +3212,7 @@ msgstr "Hide"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:139
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
-#: reviews/templates/reviews/vue_templates/review_list.html:139
+#: reviews/templates/reviews/vue_templates/review_list.html:145
 msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
@@ -3495,40 +3363,40 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:44
+#: proposals/views/proposal_views.py:45
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:45
+#: proposals/views/proposal_views.py:46
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:64
+#: proposals/views/proposal_views.py:65
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:65
+#: proposals/views/proposal_views.py:66
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:78
+#: proposals/views/proposal_views.py:79
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:90
+#: proposals/views/proposal_views.py:91
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:102
+#: proposals/views/proposal_views.py:103
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:115
+#: proposals/views/proposal_views.py:116
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:128
+#: proposals/views/proposal_views.py:129
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
 "eindverantwoordelijke bij betrokken bent."
@@ -3536,15 +3404,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:247
+#: proposals/views/proposal_views.py:248
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:385
+#: proposals/views/proposal_views.py:398
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:486
+#: proposals/views/proposal_views.py:499
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3585,7 +3453,7 @@ msgstr "Stage"
 #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
-#: reviews/templates/reviews/vue_templates/review_list.html:177
+#: reviews/templates/reviews/vue_templates/review_list.html:183
 msgid "Route"
 msgstr "Route"
 
@@ -3605,6 +3473,14 @@ msgstr "long (4-week) route"
 msgid "direct naar revisie"
 msgstr "straight to revision"
 
+#: reviews/forms.py:31 reviews/menus.py:60 reviews/mixins.py:127
+msgid "Algemene Kamer"
+msgstr "General Chamber"
+
+#: reviews/forms.py:32 reviews/menus.py:67 reviews/mixins.py:130
+msgid "Linguïstiek Kamer"
+msgstr "Linguistics Chamber"
+
 #: reviews/forms.py:64
 msgid "Selecteer de commissieleden"
 msgstr "Select committee members"
@@ -3633,6 +3509,26 @@ msgstr "Start date period:"
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
+#: reviews/menus.py:14 reviews/views.py:70
+msgid "Mijn openstaande besluiten"
+msgstr "My pending decisions"
+
+#: reviews/menus.py:18
+msgid "Al mijn besluiten"
+msgstr "All my decisions"
+
+#: reviews/menus.py:22
+msgid "Alle openstaande besluiten commissieleden"
+msgstr "All pending decisions committee members"
+
+#: reviews/menus.py:27
+msgid "Alle openstaande besluiten eindverantwoordelijken"
+msgstr "All pending decisions supervisors"
+
+#: reviews/menus.py:32 reviews/views.py:229
+msgid "Nog af te handelen aanvragen"
+msgstr "Applications waiting for conclusion"
+
 #: reviews/menus.py:37 reviews/views.py:241
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
@@ -3641,6 +3537,10 @@ msgstr "Applications in revision"
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
+#: reviews/menus.py:47 reviews/views.py:275
+msgid "Alle ingezonden aanvragen"
+msgstr "All submitted applications"
+
 #: reviews/menus.py:52
 msgid "Overzicht werkverdeling commissieleden"
 msgstr "Overview workload committee members"
@@ -4314,7 +4214,7 @@ msgid "Verplaats naar andere kamer"
 msgstr "Move study to different reviewing chamber"
 
 #: reviews/templates/reviews/vue_templates/review_list.html:95
-#: reviews/utils/review_actions.py:281
+#: reviews/utils/review_actions.py:282
 msgid "Verberg aanvraag uit het archief"
 msgstr "Remove this application from the archive"
 
@@ -4322,6 +4222,10 @@ msgstr "Remove this application from the archive"
 msgid "Plaats aanvraag in archief"
 msgstr "Add this application to the archive"
 
+#: reviews/templates/reviews/vue_templates/review_list.html:122
+msgid "Reviewronde beëindigd: "
+msgstr "Reviewing round ended: "
+
 #: reviews/templatetags/documents_list.py:145
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
@@ -4378,85 +4282,89 @@ msgstr "Information letter for the parents"
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
-#: reviews/utils/review_actions.py:129
+#: reviews/utils/review_actions.py:130
 msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
-#: reviews/utils/review_actions.py:155
+#: reviews/utils/review_actions.py:156
 msgid "Deze aanvraag afsluiten"
 msgstr "Conclude this application"
 
-#: reviews/utils/review_actions.py:185
+#: reviews/utils/review_actions.py:186
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
 msgstr "Discontinue assessment of this application"
 
-#: reviews/utils/review_actions.py:215
+#: reviews/utils/review_actions.py:216
 msgid "Verander aangestelde commissieleden"
 msgstr "Change appointment of committee members"
 
-#: reviews/utils/review_actions.py:245
+#: reviews/utils/review_actions.py:246
 msgid "Datum van bevestigingsbrief aanpassen"
 msgstr "Change date of confirmation letter"
 
-#: reviews/utils/review_actions.py:283
+#: reviews/utils/review_actions.py:284
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
+#: reviews/utils/review_actions.py:304
+msgid "Startdatum wijzigen"
+msgstr "Edit start date"
+
 #: reviews/utils/review_utils.py:54
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:74
+#: reviews/utils/review_utils.py:81
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:124
+#: reviews/utils/review_utils.py:131
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:218
+#: reviews/utils/review_utils.py:230
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:232
+#: reviews/utils/review_utils.py:244
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:281
+#: reviews/utils/review_utils.py:293
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:296
+#: reviews/utils/review_utils.py:308
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:312
+#: reviews/utils/review_utils.py:324
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:338
+#: reviews/utils/review_utils.py:350
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:341
+#: reviews/utils/review_utils.py:353
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:344
+#: reviews/utils/review_utils.py:356
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:347
+#: reviews/utils/review_utils.py:359
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:350
+#: reviews/utils/review_utils.py:362
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4464,7 +4372,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:356
+#: reviews/utils/review_utils.py:368
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4474,7 +4382,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:360
+#: reviews/utils/review_utils.py:372
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4484,7 +4392,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:367
+#: reviews/utils/review_utils.py:379
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4495,14 +4403,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:384
+#: reviews/utils/review_utils.py:396
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:388
+#: reviews/utils/review_utils.py:400
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4510,7 +4418,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:390
+#: reviews/utils/review_utils.py:402
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4520,11 +4428,11 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:395
+#: reviews/utils/review_utils.py:407
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:416
+#: reviews/utils/review_utils.py:428
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""
@@ -5703,46 +5611,100 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
-#: proposals/forms.py:190
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
+#~ msgid "Feedback"
+#~ msgstr "Feedback"
 
-#: proposals/forms.py:579
-msgid "Nieuwe beoogde startdatum"
-msgstr "New intended start date"
+#~ msgid "Open"
+#~ msgstr "Open"
 
-#: proposals/models.py:517
-#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
-#: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
+#~ msgid "Opgepakt"
+#~ msgstr "In progress"
 
-#: proposals/templates/proposals/proposal_update_date_start.html:14
-#: proposals/templates/proposals/proposal_update_date_start.html:28
-msgid "Startdatum aanpassen"
-msgstr "Edit start date"
+#~ msgid "Afgehandeld"
+#~ msgstr "Processed"
 
-#: proposals/templates/proposals/proposal_update_date_start.html:17
-msgid ""
-"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
-"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
-"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
-"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
-"met"
-msgstr ""
-"On this page, the start date of proposal %(title)s (reference number "
-"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
-"already been concluded, the new start date will not be displayed in the PDF. "
-"If you would like the PDF to be generated with the new start date, please "
-"reach out to "
+#~ msgid "Laag"
+#~ msgstr "Low"
 
-#: reviews/templates/reviews/vue_templates/review_list.html:122
-msgid "Reviewronde beëindigd: "
-msgstr "Reviewing round ended: "
+#~ msgid "Gemiddeld"
+#~ msgstr "Average"
 
-#: reviews/utils/review_actions.py:304
-msgid "Startdatum wijzigen"
-msgstr "Edit start date"
+#~ msgid "Hoog"
+#~ msgstr "High"
+
+#~ msgid "Feedback versturen"
+#~ msgstr "Send feedback"
+
+#~ msgid "Hier kan je feedback achterlaten op het FETC-GW portal."
+#~ msgstr "You can leave feedback on the FEtC-H portal here."
+
+#~ msgid "Feedbackoverzicht"
+#~ msgstr "Feedback overview"
+
+#~ msgid "Toegevoegd op"
+#~ msgstr "Added on"
+
+#~ msgid "URL"
+#~ msgstr "URL"
+
+#~ msgid "Gegeven door"
+#~ msgstr "Given by"
+
+#~ msgid "Bedankt voor je feedback!"
+#~ msgstr "Thanks for your feedback!"
+
+#, python-format
+#~ msgid ""
+#~ "\n"
+#~ "                Klik <a href=\"%(url)s\">hier</a> om terug te keren naar "
+#~ "pagina waar je gebleven was.\n"
+#~ "                "
+#~ msgstr ""
+#~ "\n"
+#~ "Click <a href=\"%(url)s\">here</a> to return to where you left off.\n"
+#~ "   "
+
+#~ msgid "Feedback verstuurd"
+#~ msgstr "Feedback sent"
+
+#~ msgid "Nieuwe studie starten op basis van een kopie van een oude studie"
+#~ msgstr "Start a new study based on a copy of an old study"
+
+#~ msgid "Nieuwe voortoetsing aanvraag starten"
+#~ msgstr "Start a new preliminary application"
+
+#~ msgid ""
+#~ "Nieuwe aanvraag starten (die al goedgekeurd is door een andere ethische "
+#~ "toetsingscommissie)"
+#~ msgstr ""
+#~ "Start a new application (that has been approved by another ethics "
+#~ "committee)"
+
+#~ msgid "Alle aanvragen bekijken van de Algemene Kamer"
+#~ msgstr "View all applications of the General Chamber"
+
+#~ msgid "Alle aanvragen bekijken van de Linguïstiek Kamer"
+#~ msgstr ""
+#~ "View all processed and approved applications of the Linguistics Chamber"
+
+#~ msgid "Reglement Algemene Kamer (AK)"
+#~ msgstr "Regulations General Chamber (GC)"
+
+#~ msgid " Reglement Linguïstiek Kamer (LK) "
+#~ msgstr " Regulations Linguistics Chamber (LC) "
+
+#~ msgid "FETC-GW-website"
+#~ msgstr "FEtC-H website"
+
+#~ msgid "Feedback op dit portal geven"
+#~ msgstr "Give feedback on this portal"
+
+#~ msgid "Je dient een eindverantwoordelijke op te geven."
+#~ msgstr ""
+#~ "You are required to specify the researcher with final responsibility."
+
+#~ msgid "Eindverantwoordelijke onderzoeker"
+#~ msgstr "Researcher with final responsibility"
 
 #~ msgid ""
 #~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
diff --git a/proposals/models.py b/proposals/models.py
index df5d9492f..1d6735709 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -215,6 +215,15 @@ class Proposal(models.Model):
             'Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?'
         ),
         default=False,
+        help_text=mark_safe_lazy(_('Werk je samen met een onderzoeker of '
+                                   'organisatie buiten de UU en is je '
+                                   'onderzoek niet strikt anoniem? Neem dan '
+                                   'contact op met de <a '
+                                   'href="mailto:privacy.gw@uu.nl">privacy '
+                                   'officer</a>. '
+                                   'Er moeten dan wellicht afspraken worden '
+                                   'gemaakt over de verwerking van '
+                                   'persoonsgegevens.')),
     )
 
     other_stakeholders = models.BooleanField(

From b2f6404bae14a1b19c993181ae0bd235dd208ee7 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:30:34 +0100
Subject: [PATCH 075/148] chore: remove MO file from tree

Fixes #514
---
 .gitignore                      |   2 +-
 locale/en/LC_MESSAGES/django.mo | Bin 147284 -> 0 bytes
 2 files changed, 1 insertion(+), 1 deletion(-)
 delete mode 100644 locale/en/LC_MESSAGES/django.mo

diff --git a/.gitignore b/.gitignore
index ee1ad8e43..71f2b417a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 *.pyc
 __pycache__/
 .env*
-
+*.mo
 
 ### Project-specific ###
 media/
diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
deleted file mode 100644
index d1d22016cf74818ef34ce87791e257ab18dba617..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 147284
zcmdSC378#4_5R-zc4XgoZUP}QkeNw<09i=Lo&X`N346FRb7yihGxrX6Nk~Ez0c8gT
z^a}!l3d$-w2m-PRD4-&sA|T49vbmrlg7E*m=T!IYSrQ`p{GaD{pLE`?>gwvMQ>RXy
zI(4e%Hyf?`m5ASAt3=T@;KN%*(dSl;qOMVjjiUL}qv#ee4=$`D&5S5|mhc5Lqv*0h
z#P1tLuMu8j7I}bggU^7I4~U|9;1;u^=uq$kkXNH8!NbAL4vZrHMMeHw3f>RC4URh~
zitYt>J~)bw1OEV$RW$PuF7Tp&FN3>Np5bJE2Ju-wo&(<uc+i|EI+gI9ApfFqbED`q
z@B;8;aBB*2ANY0f1n`(6qUgKeFTgv&FB};~SAlyU6-5*wdIh{1+~a63_e<as>ObO`
zD7qfnT}NfPjSg>(qI$}82Y5Z<m)fG}67XyaR|4zXJ^m8#al$h?qNogRGT-ZWIyiyw
z&%r6+M)@e32+jq^fER;`e+Hx~(UuFM=qupypz60qXB5$d(Rtvm;I-h^;EP~0_&zum
zZ0L$2nkveHqT8+DP;krcDB2F30FDQb1$P231C`&y;JV;@;2Pj+1>OPI1&4scz!SlJ
z!A0Ps;J2X1gklsuK=_rOD7p)}U3I*ddtN1q2u6PgHv|6(Hi7F`qiAh#JgE4Y;P&8g
z;3nWn0lxw&-L;_VeLJ`g_%l%DdJ$Y7d=Fd`Tw|f9+W_2{@GhXzO$gy5K;_>J>b;Y}
z9l-O$^E<-xAA_RjOW=;+`czi9JE-@M09B3x*b09v1y?8h(h@K4>)>Yy{{<A?{td1L
zW|n&Sb_O>iJQds!JUU<jR6R}t*8|T0_1%lWG2p$R+U=j9>a{10p?nSk8^HPCNbr1c
zPw-(-?fN131F(4+eF^*%_(kxb&q5>G?^ob?gjYQ&ivAD05LEi%pO2!Oz_&p0|79mf
z(WT%A;CI1`PKhG^Mbl4>qAS41!Dqp)FGLZqM3eYPEBG*|cC3eq)h@e%8-de7@!OH0
z=rbQw{Y#+ew-j6hJT1hZ2X0OHB5*W#8z{QJ1MUU>9UKQXo$l?^3F><%fO_w2aC7i#
za4YbBa3}D2a2h!14Cl|8;4Xwu08fNISAz9~2cPA9x-YmE;RT@TRRP6Mp99q{=Ygu<
zHQ;B!d%&6CW8e_-+vsfC2OM=y6m3d;_qkraQvzNNjw1g1;5_gz;8oy3G|~+4Jy7-8
z=S$w7j|R6OycAS<E(BG+%R!ar8gLEpA#fP@IJgb?Zomz`?DcL0Rqmrfr7wc8O0)>f
zfPV+q12;QAiXNe34+Yg9-nuY~wgv0H;?K7S_1&fro&gRfJQv&$Tnvg{XMqjiC7|Tf
z55X$<Cb%l}$$mA88VR?<lxo)tLG_2Hz**owz&g@Rxrj0oo_4X1C*K0aSAPZ7&e7M9
z0hD)Za1OzvE~P$%Zvn>=e){V!2iCtFnL>CskgTH(ukdl?8c_9|{|&FlGVprBmxF8Z
z{r$g5+Yp}fEgxU52G!2TUFq#{3XMloN9TfSw{5=d^xX>-z4rk(2M+;120Ourh2Qah
zH{xo>Ov2}adjBr)A@Eu7R=#ubHI$j~tn0j7p9cpMZlaJ>F**<wz1{{70LR|obUYIr
zLHI_n8T>7%ezd`NonL2ydVT?@c6k`=0mt0v{oy*Wjqo#|<k0Aw;AQYYa4L8ocrdu?
z%{~sz1;0ai?*&&UK6k6rrwiPN_E-dNO#Jt5_xLBky$Sy^;HG!Dd^iN$hWMjF@!4Wf
z`CR~R27V3v7kD$cG2grXPVy&w|Mvo)-sSqo_TX^hPXbQ^ZvgfEQFlAe1UDso45<9e
zpxR*xcmQ}6I05_{I0oGP`%b?ixGUkS!QH{<!Lz{)?g`^9IE(PZ;QHW3_xksSfEyCt
z0~BA(0M(z50=EX+!BxPM!BxR8g6gMdfi2(#pz`|%xGuQ*eIDKf%n;rY905)R$ASyN
z-N0MG@!;#A`r*(Yc)!~ZRR3HI?g@Si90@)T>ig^7?{a1%@B-+(4fq-2Z+gJ#b`Q7}
z;h%%s@%(M@EyC--yi`4UAB4rDJ7D(pz+->t@~s<GJ?;S2K97Loz;{8Ff5aou2+V>D
zz>B~`!Brl0zC9dNJAD%z20jUH1O6Rc2i)i}r|b5h=)5yn2KNTVKR1Jtr;mZE&+ouz
zz_-Cx@WCJXIJ(o1oermiD#tmX-uovw6x{G}@7H^RI})A^P5>)l2Y4G;1-E&^`Q&`?
z1;USlXM$Hg>EliFPrUtRgWD3{1MUo-3+g*}f#SE96o$?l{nX37*UvoPDc}&EF9wzV
zQg8(LAh-kgE_eXA`BScswu93MUk!?X{{+^9JO141Hw&Cf_()LYxdN0Nx)00~E<r5C
zzW_Fa{{ox9ouBpiBfuln-@!A8f9jW>|53kkemoW2iTLk<qrsOz=_y-2=i}hiU%MQ5
z6I_eue*?DwKLW)!n?LX4_b^cHc?hU_EC4qEF9*dBH-VzZlc37^F1QJ}1C6jIxEHAW
zCxVLK4^)1~h43P9b;4(Z4d4af5#YU`+Gq0@(UrkTp!(T4;KASn;5cxT-$c=u!Gpll
zz*j)gqw^*2?|%n3Sp`1&t=DI#SDb$i24|A)d~h4^1+Wu*AKU@Vz3TjS2G~gWyP(SP
z0=Ne_>@}yyv7pLz0Z12$9tG7-=f3XrxEI`&@Y~?tVCMIfm3BB5Y$trvAAH=~{EseA
z@}TN}6{vha2EPyP_6Bn(@K2!H;gUC9PW}u;<V0(|<?{0}@M6NNyzTPlGH@8-XTh(7
z{|2uBFMS6c6WsexF6XWVkE2}Q14V}||KjrJ3*ZdGmw*R?uY$*dqyFmYE(CiBNALRl
z_IU6zf{%jAC-*nUr@+Gq@BMe@hYP^Z5WWnY4PFDn&e8keVDLk5LvXu)c)Ae*$AN1Q
zKLcD3JP@pc^S}o1S@2x&WAGmE-1q3);C}yfzFX~m`U&;i2E3d2ssHlwL?5^uTN_-R
z_-(<>z#Tz-Z!EYzI2l|OJOqSP(cz%lW5$QhU(3Kl310(>4?Y6-0~`PC<JDqtUBZuo
zD*v;f<ie}q*5JAyxqN5<^?VO-Q*bJ{C3qCLF<1q+0?z<{N`0;b7Za{Tbv9nV1Fk{*
zph0!fbHuN`N?r7G@Kvx8yc6Y6^>__j2Ydt6_ud0l&(&A+@MZyr2HZX1<bVeU%m(ZU
z_&IPR@;Mij9QX#f7I-bVHh3F&5cmV|WN^dP>r9SZ2#W4^gOW2(fhyO_pycmgz}3J_
zsN6JgD^TUlf}4ZKgGYjAfK$L%!I@ygnsr9MGPn)la{^uqs+^C4`rfZWwfCDL{#{Uf
zxjIU!=)M-H_SiOrcLP<w>EIafKyV>=7Wiv$(Ass;V%p(FQ0eBbQ)hgA9QbF#C2&`s
zx2{`fa_p<?)kU8rzJC2W(-*!24ki2&xFfjQ26Z-`?+mJ6&jm+;p93YoZwG%#em?<!
z0)BfVuUB=GI^(Y|f~xN~!BvzVRJ+^-N<VoB%zz(&%72?p>x{prfa1T!p!(Sb;7;JZ
z;3nX!p!)0kp!o7Lo7I^;Vkc1THVsrg@}Sb62a29of@;6-fuj3kp!nlwpz?bjRJ*(l
z>iv&Em4C<0{k=UwrJD|_{zrgHUjjw%Q$W@4?C|`npuTe>sB+v1>ibWC%J&6O{P!nN
ze75=)btVti0S6P_7@P=>0+oIdsD67UI0O7PsQ&b)fFFXACu?o#-`xOIdA9)d{?4Gv
zw|96x9h6+09l}R}ZG>Av^@GPiwf8T>^L4lK^qYdJ&)|T2fTHhy;rTpJ<>&;*!51Y^
z{CVTnUY;|zsWW}!Qc!Z?ZcuXS2cYWnBq%!l8Wers0QJ2OK-GVPZN1%xgDU5AQ2a3m
zRDW3(@B&cfx+aA01=Vg(gW|8ZK=tF*QFax-9jN#{L4D^SQ0>wU>N{mn^g0<7J<kQV
z2fqQT|33hZ1y|p`&g^!RK$SlW>irTZx_ll~yPgh;KYk2~e|`=s-{(Q`<vXD2^FF9{
zTR&50<NB7M=rI?ReCYy}?-`)l`%9qGe-pd}ydInk&KT_FI~yz#ehfSu+>6QYB=E~%
z6?_I%`S#tx`{UW*T*424_k&yR=;i%2IFs-zpvv7i)cegop!Aw{Q1v?#%z)>ED)+6R
z>h~BZ`aBJa-miixceIn^+MwEX6Hs&?3ra3c2bY0eU;%ss+!;J#n5RD#lw7zDRJ%L^
z>N}sQuQPpT8*m!oh2U`TUQqRT0~`(R-r(gdfTF`G;CA2-!Dql%!7ISKcCIr$?MRee
z^~b9~mH!=3eEd)FIdHY%bv7=)1gbyn(&+7$1(p7@py+ZsD1N*Q6n$<7b9GU4Klmo$
zoto>S+rW)R)J5}%e-wO|@Gyk>9B}L1>dYQc0`ok-4y-4B(@{>}@u2E?B)AuNC3qb8
zBKR^meh=sW!F$$4rxP9vs$36)Q^Dszjpy6%<@B5dir<a}CC_`nR`6<2^;%~%=_to$
zpxzrc#`)nea9hI1fRcYpLFIEk_<hn}3APYEZd{$sdmaKs|G$B|f*bGcbesmls?mwy
z_lduJe4XiIM@{he-T?O_e(QZ)u62Oo(<eZ+|4X3Sd#8zBuH!(}cRn}~Tm}vWe*j93
zyat}a_udCL2bWEDzWmA*Z_jUl&7`{z+y{II6kj(_b$PZQD1JK%91orjiZ34pHP8GN
zI0)QgnwMv5aCO2vfRY0{2iym2AUp?D|33*79WMjL_qTzn$4|jkz*j+i=MSLd(EFg$
ztvTKM@eZKcXE-Q%d?cv%=Yi_Km4GLLqW`I&`rn<P@*Oq9`E?q&FLXHw6dznV6FL)C
z<hOz8`_)AcP{DV=s|nw9fY;-Q+0JjLfO`<X&Vh^@;AC(ZcoH}Xyc$$F-vkc@w`6kj
z6j%UH1ot_(F4`Zw7n}^PeTb(&031p9MDRuMyI?zb_My%P?}F+VV-Bmc^{-Pw@q09<
z&gLJ}K*_(Wz+1t8gOZas&#g1N`mn?6%)a;wP;&K@BV2C23+g-dM>^fk1Lsly2f;6Z
zLyoC4JLuJPX7%IMj;pivqxZoU!slgOKK~W05Z<q)F8UUDKX?q-*6RKEK~Vhj0VsJl
zw$1tfBv5kkW^f<y1@H)P+gx4rC2&!|HQSv}F9vrb{&rCP?T?_^d(95#*RkM1gqMJM
z@Ci`k-yZY5KhFWh*A*}W-U^ED&wv`wS4Sv`pEd&}$F~DB;AC(q*aj{He+%9M-^^W5
z7yXRz+Fees=fR5!XN%rXJ^&>zKLXY7HtX^JI1Lnk9}KGhb%W~nXMpNQmx3zCEno(`
z8&tn|9#nsN0~BAcalGfZ1*rHPLG`nV;7;J-pz{43xFvW#C^>OGD89Wvg#Q34-G`v~
zd;OC0<uq^v;R-1I<0?>c^FHvW@W*4I%6U=M<F5cUE?f($9=C&Qf{%lu!!w}1|5iXP
z6007YfXZhmsCH-sB|r8C)lWLW>ELys==LtC@~pSW>oE)*On5dp13VtA2k!>21YZFU
z22VesE;<W*9{fAlvA8b!Jb28KI<u3!1l~nBzqHQg?K_<4{qF(rYs9a)tS-6`{1$iu
zxYuWW{Ja_bA>p$=R~MZG9(0oTo1cTCSM%q+-lIX$WfrJ<w}PvK6;O0r3M%~<LDAz&
z0WSho?<>H)!S92sg71T)z>mPu;O-|o{R-f^gg*<4PG^Jq-c_L5;SO+D@F$??Rd<T#
zvoEOe<Rp-;6MY*L9oPGU_oF>Qm3J<<CU`8Ud^<q#-3g$+dmbqL;xh06@LF&f`MnQr
z4h}xe=Ru=S_wpSLZb-T+D0y%iI3K(PycXR04A)~G0ac$3&vbh1466T51y!C!py+oJ
zD1JW^Tn)Su91LCy>is7`^}E+V(X;L>FZTpcbe{#PeGdaAXMO^z|Gf>~1mAxMYW%t3
zT>s94p!oI$Q2D+EiVka@=XBW&RJajTK4U?(!@l4UumxNUegXU!_%Wz{_^&V3MTdYR
zzwGq?0(cbRtH7P0W8L{K|LZUC@#Zv8bbkSqJoqEH5#?R|LYLE9ewBI=E`gHAZ(iiz
z-{s=E=of?!0KW<j{hI61_kilJ%Pw(!`OBdC!R_E1;DMJq-;KS@^_wa<m2!>zx|d_o
z<#lF<JQWlj*SW&!y9+3O*$q@X?F+sRwt>ojzi)VdeI0BhJo=m7Z#uvq5MBm8%6Inu
zmeYH+tLn_YJs6bSz8*Xed<vWkX20$AzY7$9ZS)-<ulEMW5k3i=0^SR%KMlIN&g@lt
zflCQ@fa1qjz#YK-ukmrJ2UI)$7}WUpGAMqUd#%fjuYh^NFMxMa-f7o4e|~hm<C-_{
zecEFqP<%1_M(2}b!5M_Rz}>*xLGkw=!EM36f*RL0xXJtD2vGfJPjCaiGZS0`Jo09*
zSIaHlU%ms*Cf$Re^t_F3bv<bUsPEqksy{ygijFUW>JNi%^M1BAxG&*xp!oB&5Pu)2
z@#fFqFmUtRU4Bmh7ZA>aihl;w`yYZT@ANx-+&Kc&ce_BvF9X*G&jZCDUjtVGZv!Rw
zz6VMU-3!hG9|l$a9U-!Cw}6vC(di&?G<ZCy`d<g`34Q>oy?6Vb*EbI;d@d+DKMYE~
zybSIFZgQ8)lYKzRnQ7oG=zL&^|N7m|_g8|F*EfUBJbwcGBjFFfUl%<HzJ8D6HTQbE
zcHQUSse)?f?}YG8;B>+-gH7PhKX86H0&F9E4tOB=S8x_M`F@vkUj|k0TS3XGr$Nb|
zKY*h1KLW1tKwb1C;Vr;T!Pi0413<O=`VZDczX3M~)sOxGX2Am<@^-ihED^pP)O+<0
zyF3{SN^Tqrs=t)LgTSwXD)%420yyi3ZYR74Tn#$C2cAy+zaQ~@zWAu)HK6MA1Som%
z7ASt&>M?J}N#GlVmw;-Q+>czo6+xxD5fmT&65Jj93#fAK^kb*rzM%BNOF+^4*Wg5O
z$m1?A+Ca(o^FY!2axeq_8N7&cZ}^1M<=Q8mkJkB#x93Pu{j3$#xbr2Dt{Gheb`n1F
zXFk3@0;+xg1gc+c_mtyd;CiG#8@!D8OMdS48~wERkIA6g_W)4zZw1BY3&A1aO`zn*
z)1caYjb~i$ZUKtFn?d#SS)ll}1gc-11AYd)5LAD>0#yFDfRcAV1l12;1na?<!A0O_
zp7n9)6!0*@zXH`>O}}uu9Sy2}H-M6tuY!xgBYx@gqo+ZY=fGdl-pIu&IDzn2e(iGl
zS#T!djh=TtKN@T&{8?~k@HJ5Vbb}XMzZnP4AzTEN&m*Av{pv4zy7Ax>gcpEnr#*k;
za;yy$znuk+0j~q=X@}Rr;|Q<+Tc5Z0fD;Md1FBpff#R<jzjHlu8F(w<Jzw^EzX_@w
zLtd$ieg(FGdx2wLt&6S!E1=%r?lmvRA>eljF9B}=8(#PN{1TLWZ2CQXM7c(T`w_nC
z4?fQR1=Rd-gFm|dH3vLG&%uMikHN#igWvG?t^>bJ_&x9#@QgRTp1%i`?~J#+y)OjC
z7Z-y^gI9qxQ#9ypr`Kwro(~08zL5dPh4|?K4*`$k`8-hkc|WN7{|$T%{Q5gSuR8Tl
z&fkaqnf^;X7l5MYsef_#wAWu<&g=t<Zx034&yNBnzp9}6?J`jOdJgy^cs?jT?0MJu
z^E;sE@+`O$SpPS-56lKdw_CyWz;*xb`E3KLzYGWUz3HIpods3zZcy^{gz)@aQ2qaE
zQ2q4*P;%oJV4iUCJ=cq$12ta!<)5y94gObMbUV*q1|`QX`oQaPKdAovLr~xO1-Kdb
zRtT^1p~r6-usPt=fJX&9KHzBqF9X*hpIbrI_kK|H`za_r`Xx|wdks7T+~(gdXTA-J
z4nG3*{wtv9@n=wU`Vd?N-25Z&Pg{e^cMd3d(hlwqeiqytd>kANuJy4$pA2RQ9|cNo
zp9q><0@osZ3#j(L2NXRX0>zilfuhq3pwhn$icTMc8fP~nmE^(ppxR+B_#F5Ecs=cK
zN!=jhqZz9VvhnOd@FSkLfg^a{y6PbFd%SS9L1tIkdi6mzj+_Nb{{9$LdEW*lZ#P`S
zu^E&cm<38tKL<qgN7sT3fzi^n1{wV(erAx(CuV`-n>;8weil^uPX<STXMvJe_kg>A
zFMwmgHP;zra(fD>^2`NQo+Y5#_v@hA>xK}2cfj9(YPUh_`g_}gqU%23#^4-K?=Jw=
z&lZDfhtGqe_gMii1&0#80n~d>gX@C72Q{Aj9TeZJx!xe-hasTqwJWIn#)9IHsUiLt
zQ17*a`p)7IJ`+^=E(67<w}Rq_yFksy?gvGW7eKwY#rlJ+KQ@392~Ps`y;DKa<6Kbn
zx&%~tz6FY3uLo7{dqDN`$3dn01t@<14XE$G0WJjp465E88w|2>Xep@YKL^E+zXDaC
zH$dh8?||!W==pC8Dt$dT3BG6o-zI!KlRCXWZ)4}D<3Y){^FY<(LQv)TI;i?w8^U*j
z);~b;!*e10A*gb0w8<bFM|T3%E(d{<Tb-cz@6-@~F{tm~3Tj^WLr~-PtDxl6TATXw
zk)ZOK45}W-fTCY3DEgH^m1h~40WSbYgSUa|m+ye};7*%)yUhm0KgWT}uK*qkRzT(V
zG-&Mrs-52emHq=z^;m0jr^gUba;zCtdD=nodll6CUjkL`OF^~o9pLrgec%+ZbBjSX
zzTN~@2>%0YQT&#JOb_@8sQ4|m@_v2}xEJ9kL5;7gZ#~G?OWHv3>4DogAI=5!-HX9p
z!COJm^L0?|yWX}=kBvdme;laxJpdFR9R)Uk1yK231gbulgG0gVLi|&p<k7Fd6TyFg
z8qdqy4Kh9GXQ1T7zd^P8V3e_$;2xm9cM^CUcn-Kf_zt)mI5y+-DT1o+ZJ_w-ZEzp3
zZm@rM68Kxf$AOoE6Nd~kz56%dWWqb`;Qej^D0y85e+!-os=s#b=yLOhfIkMs_rC{~
z{x6{TYR#dZ&vsyi{xb~xBk`B+G|0x)FAf_NbrC<Vo^}GSX&7XFbbs7=kl6(e+65&3
zTySUJdwjU_`#->Ggg0#*WaHJ*py>BCa1GMG2a3KQHw`j-@V3oPhdV*l?{QG=wEhTh
zx6uLj2lpj@9(X8tEhxVJ7}U74_DJt1Ywhaox-+PLyay;gKLS)ccYqgAj&s1n2@l@g
z<=+xe>F)qXfX{&=!L>&bPx^77_;}tPgWOI4P9?n2o?h<5!B)bTf@;@juR%8N+yrbU
z*aC`A&j-af{|AaMt_ODle;eZ07!BX>y=_40b@?&gPN$6Z`kf8xy&FK4|97DJ=a_L$
zufsseo%x{p<7uG!`xBt(`y#jsICyXGze7RwhelB4+8tE+XM!3ZjscbbVo>~ZVF+Ib
zsy{vg4g!A*ivM2$)&Kqsiq8g(_wQ^0Y8=jhqQgF*`sGwm<H+Hl_%sU+20Ova!E-=;
zw{e1x15-fAVs!zM-(4yMzjb&hz7S1+z$ISPZw}YTT*_-MY2OF+V;a@#w|2;f;VGg^
z*c?I$#53{l8zIf6A|yZ6lWt+_9tt1M{o;_m2ug3glnYk1-|qvi8qzE#d|HT8f}e1|
zD%Y`G2Zc1dai0zMo(nn#;fo1u5z3)>)O7nDO?v(2a$U(i%@O^WXa6QFzSW!!RVMmu
zNPiS@`fW|zXNdbe7hTGDN%0SI%_FQaRzJ1fF@*JlrJ^gqeZg<@-oqejd2~ED8`SSk
zu2#YabKT9Q-%QH=b3G5`SHIWqHV3nheu1>8Y!PC{<j3wjyC*!qh&b`g=Ry6pCZGA-
z|Ap%wF6pWIF;z1g>NViI9u?gWYM!CrO#z<-5r5H+AZlrJG5BRrzh4A=jJWS{=_mQv
z$|X6!b%<L?x+Po_D9g<u?pNVmy|Z1YtM2tXlr)MO%YWB#kNL)aOTe%4-XP-X0@3YU
z@A)J9{{+IQY|#QP{g{SD?{HtoRS0>!!Tn!&_7$%0aDT26^1G7fb>w>`_lWuE+g$qn
zgZRU^zQNVb)kU0iL;Z$x{gUf^F7@xzc>Y6>X>qhYdHtRHUz5+X;4-d%ggiBN#6PBV
zW{Z}b_$e1%IU35lUEo_>4-j`G*B3~4ZFrwxbRzc`aD9=B>1~wZolCg?7T1rt-sUQD
z?Wx54Rw0dk=M#4g*FGWK!~G=g-vw{w`F7lI9G*Q(-0R%$U~l4o6XF$ooM*f9P5nlK
zJB9m+q&bhcT?s!xnj5+H49_+M*ADmgBL6K7H@A{*TF75xntlbYkBDy!@0=K(6J_hw
z?-PEEz%@!7eoqkhI&miwZsIBto<evl@D7lvyxE$5%(HdLcP!yHuHSIo&ZXZWq+7~;
zE`$ex>yY+vQ2O1M!6U%4xpwA$Thi|deu)d!B|0BOHHrQSp3D{hb|#M_2;UIm{!W@N
z@Nh@2lR~1Yq!}KbYYg}r*KfJ@CI0KAKY;7cT=PjYnD{M;XZjmG&UFjnEkOO21=M{b
z_j7n>Fli6qx|{IRspl_puldB!lsNUfId!kw-{||Ky)gCec=FS47SD!(s9e!`;rUGP
zF5+$?PCwL#=u9rnS@rv@L$nFuKM=nt#J@^>3*pIJ@lWG!{QE06hlTGd?hxLq58+d}
zmyWLA=G=dV_*KZ~2Cn-EuR&P4g6yQ7mMSve?Qk1SBi%+^@_T=kG`n)?cRg{}`fc<I
zI3~nb!0&Tu-l5+^+@D0+__sD;%$CvRA?}Ynm>xeA^6WLP%eeIWKIxtUALjZtSDElI
zp7n6QVMxQRt(*OsaE5CiMTFnKNq-^NpSbipiRZ_2y}|u=iTf7!t8rb&eKU1@g7|-O
z|8;Pi@Xo#9b6lsBZX#*)TiwC-%QS?z5M}T(=?_Xpe2M#mNjD3;f@j|)uP<`{5ci|F
ze~0Tn!fjmA>Gvo6AlJEE`rW|wSJEB~j^f&gynY8B6`ucsd(9d2J2aGM&43$#_xdBV
zQ%Wb7zIO@uFK`a{NAjK<@)|<i6y8}4L=}&A<Guv$NBAbL4@mbp@OR)2;hkp!&L-{Z
zT+>6CWYK<v7lRWO;I{#JJ<oL**H|w73IXruy{icSiEFQr$BjzBZyT<klkRq~B|K~7
z{#owN0Y~xdCGMASe;@b5`R)wv-{<}^t{FUggz$k}M{_@tYdhixgWH3PxF&M_P;p#q
z5wG8ITtCtcza5Exl51U_jU)f~_w|r=^ALA2X?7>BhigJe^wof8fK#}(B#nOG;Myv@
z_bB&MiT?=vV#xDI!tZgv26!vD8aN&-l4c>-Glcc~8gV;=-{s12<wN}M0)7BiNwX!-
znnT>?-0Sx>!qd6V=DB{K=Q^G15#nYM_bu+<<bEkv{M&<@Uxx50%9m?n>TzC(+llc1
zrPAxYaa=zkUcZ+E>V7!sM)B@!?$;!~8+;)=*PP>Wt|^3vf=_a7NcvU5leyj^ek<@e
z;$GqE`>PB2#POGKvy61#1NRT<PX-_4+LLQ9%JFNS?EuaL_XgwNSv;Ra;5IP+{h6CQ
z-}pc96t4BTe=j^=H{c<}%a)*Do@;xqABATdgz_CjTr=0UT(5+<KX89<xG!<PPbkau
zfNOy-kk4iz&FLY}{Q`CqziGHXf%gv~{fO}HAmXnI&v+E=AL4a?9oI&@+p0k7H=g?o
zxi$~)P3E0-!}F_&dzg2QCOnP!3qt(M0R^Xo_a5SY^-$*Pxj&ZspK(3M{bxzD3-52i
z{edC<vE1v|MEr{(?v{XO@m@XmzvuY~<;nf2O3d#-(tnfiSst|YF5Ui(Yh;KUt#`uj
zwUB2+D(=_Z-@|n%X?_a61Ad8g2a)%_A>Gr&{gV5kT<Z}(ljnDFe=XO>JbMcKD%VBa
zKhHIcH0KaLhjg28jUi6IZ#qP)@q8`fXMy_tfV6#ohlhwg!n6Ma?+EwhRQiv(zk;iQ
z{Pf#}`_bHQ3hqky2i$MNcb+4BC)ZcF^!t!&NVuQReFyj5q}`kQ&w&RLz7zZj;Sad>
zCcH7>-*8_6<KJf7?;650iQJELBfu<i+j8F#5`K^H7|O95arzxa_$~1FgtrZJcr@gr
z=S{?)O87Me_$}gkhHC-WF+97G>tmju%XKwzH-ncGr{6AI4}|-J^ql)Uh?@tV5#paF
z{w1#X_bT_>@a#ygN!+(_Rl>s@_y6L0itFbg?%$+)g76VsZxT0}I_$yyABq1Q*FM~@
z$+ZR7BZTAM48kW6o)qf*tMH&o{AlhU<N7d_{!rq#58;<W+S>?UO8lANUZ8$I1Dm-1
z$$f_FcrN`ebBKP+vrev6`R;Fd?{4B}aDOoOJAy9~&T`ErjehGBH<@P#aQ{50Ukle)
zc>W{8e+qFOA^j?(*Y5?ct9Ukq@ZWeghU;y@3%T|n?)#RCb|C%_A&<?7{|@&*CGKpl
zcCLSr?nAH)-VbiY^|;<$JF^nM+1;5%xvtJkWpPg~Q!KRQN=u5l&P+!(TglANapiNR
z2`iP;zPU_iwvg%0<x1p2W<8aBuAIqc3!SBEzMLyGePT8%F7mi?rBp0*jGtMk<Vp*3
z1+q^HJgzxB95b%DrIZ=J!cR>})ihVibY~0so@y86u4LMpx|<d@WpcSfW?Zg&e7^Rn
zam|D?ZMjTqk;oG&nMK)bDPK@bTQ1jC$aUvR<qQ$?tA$LVSnAGp<uYA4%9&{^^4}r|
zx+E8#<f%cXSnRY%O_^~Nx%m^zoNI5-wN}Wgvsx$s9l5Ujg3d~QL0i5flPfeA+cVkL
z`Q)5!&nzm^2uf0HDT`RN$@0m+a%7)vIc5J>R8I;9(N|2r;j~b;l<6qt7xXwoW(s*&
zv)BW<|Jzy}n$315Tm%&}&RzN3qVj*iQ!8Y@an-IBx3#+MxUT&8u3Sei;)p9Nlvg#c
zZ^<u!Q5Tl79k~L0P_7Km<WA_xmGa&6jD`%%Fs_+AR#=kwLxo(fyJAf53{UMd+4kZ8
zStb-En=Y?4Yo-Fr(=`f`1NMdXVr#YBQ7Yzonm)OJ<C>w>O7xD|iQrNPgg0jHe@J6j
zwk4A<XBK7)i*g<6rJ1f`tN1qqnFzM$3wedIUFt(d*%~L*KXmIuw|4TZtQS)pTF4?M
zD`eVHuJ9PKfy@(s4$$QqJ}q}n$yZc#<z31x%$F%8UsQW!p=Fy0YW%MR3yY;Z)q}p)
z0!^7IBt{ms&d*ai31l%*NVY<Dh_lEn$uB_uWi#_jx%Rz>46Sd=x3|x$mbx0sL&j@B
z7}uN~FHuM1F3GP*u&-FM%<e&EcIFFk@E97od3<JQeQU8>l`A)tKMn0B(p(F28Jc%V
zu9N>ov=-5-4e85+q=xjMY+LU5YL+T2$}d1LL+*}TxhL0}Z_i6y+F-^jkdC*yb6sr|
zbh+d!R3S!*ZxtnYyGWWTh$(n`+SEfQH%^~xZBnV0mPfATlWG!!NV$^lP^L8O5-};f
z&=Zr4y5;6EDz)cJ-MO~q5pMbUr<g6F&qC?}%M?qMVy;r=%LBK@@-synsF6*?rD1#M
zER|1}k+HTFs8^}}%ZwpfYp$o#_&+PD6d+guwizJn0U3m(<tp-sPA-bmZ$A}}>~G`Y
z;0$D+pKI|BFL|8q#i0Wan~5@l%16p#t_|I%V}35*rf#Bgx8zW=Iy(t4z`(xrjF>4V
z46}Y;D8kzsf8mPU!fIFBa8rfa#4(n>Ckv})(R4bj4^gMA#Ix~irX^c;nQYy$P+6o7
z^Plp>9DPe#t9^7qv8pn5<V??`L-)~T)hN`AE>CZi_$p)<7P}BS1ih@o%FFH8q$%Z4
z<FY7y)VN)Wodyk;uvt{H<)|Rb?-~#y$Ye-ty%}v8ic1*sOnT?g`bsIAmlQO$bHLKA
z@B@<I6kT~O%6FBEg_c|=3TyYL$<B)?e&|=&|Da$K+vkf7BpOq~9wokj5Y8711Iev{
zt2ik~V;JA4O=}F*#-Lf0fXt%>tF4n(b}ec6fTe}v9a+YQY)K4XB@Yc6(jiQMliwm~
z)e^o;Z5Z=A7a<W_vb0%i)A0jyZg;*w!j@cDwp_84L0enE^rc+MHE5)PsZi!MSE8u#
z{6U;MU@0|zseZ7<0^T#m?<z9I>R*6?i8iG+5SfyLdO)wQWOlRO!f>K4YEwT(dq&WO
zl_r~@l%;TJtbgd5hpsU#E+vY?M5MDwnuam`3ckFO#I-eQQ-6kqcBx=xw6k0X>P+sT
z>*9WZdOHtovD&lTzOcNnRI)IB&;ZI^G%Sh|4bx$QEhX{2zx9-gJ;ibs6=&csGVoWX
zLK}^eG-{W|qGC@+uBBLA)Mizy7bj8pV&J9Du3Wy*kg3l%#O;_X3@1pqoGYW`l`W*l
zStP;AHtkfj9Vu*SjxW|!E7cc4UCec~dB<DHcA8GBn7B07kc36fGx0>t;Y%$wrKH?K
zi?#dU%#(Pyhy_``(v=HT6^SG`E7j^iLVsWy@7I;L8PB+UcSojNYL!CD?YwMT+dL`9
zxkcoNW}2z!OM4HQn5FaOr1}mSpDA`zQVlWm#Vqr4)dE2t609tRmsf;VL>l}FbhqS6
zsWQyTm3sJKrR+k)$3I3xM7$SDihE3`e(j-Y8HI#Wo(XA97THVcr?Rw=)qh?5u40*{
zsZp-o`bkW<bQzfr8r{^7R-QALOE*_mQ=d-hxXw;arqEolFElV2IIwu^&yD{}PD|<5
z39Xh>VEA7$ASrOQd%)I}U>L9yd9w$7>A!8?`T4eV^TL#HDSA(h1*O6v?xiZk+!#2|
zQ<@lKEF7>B*%DLCT>HwF@?h($Sn#ak4_%ipV7F?6T)pNolx5{LfkVWOCZn91-q9uF
z1A&uD1*Ix2i?Z!anHgw<F5X;MP&O*p!hBnm0eZk{x8%xQd89R@TWJx!q-s-fu`^#t
z^b-3tq6y|kw~(1|Wd_mM4tj`<85lf+=`%9}rKKY`A8jJ8zfI$$`zE71YJO34Pigw5
z{%g>8CD{l1Hs%f@qJ%)ApUB*Vji)Iy2~|l?FtOCKrpu{|GTi91Efk~83?yZ<eTLb1
zlDuq28HUST6}u~+Lc&Pv>XtHrg5wi*%31q*u)ClIF{1WQn{9Wc27?pktl>0dYgd&~
zwOur?)w?HKU6Ly|Wv2QRN7XQ^S0PtvbVbq3X&S3k2$^{Pvl?h}RqQTTRGLz^6_x^I
z+r?=q-mEX>a-HRdv<a^sHHz6(4iV45RV#o0!m9xmLSV+e&bXv}#0*)1bYYHBBOgkf
zRW#eG2@H9f2`OprmFdSZ>&a@GV!Wx)u(e2S$<xNIB@9ny1W9y$QUn%Tn9myT$lAhG
zlLwf!2()5tl9-o;vr!6kscHocou*cgB6frhnLBwC6S_=vONus;wfkYpU>H@kuVhP=
zd?y`Z36n&6E+2tCdDArVm`%rIhD^#KOHd0;xk)<ct|LaETcPw+7Qh6&)>f*TG9s?&
zEXax!EKY>mi&ZFEsI=ueD?^57hRmsU$<kOZ7G<FAR5vT98SHS%sC0+)sK<^RkwH7H
z%D%6bqc36^YopxZ3u@KMe9EXb1LgnnNtezqR@*WoVHj3yR3bWUi&k&wg4TJN880HY
zwtTjcj>alX=gTKuW^Xbn)F=37^Waj3p@O+sC5Jpsktt4&fwPnPRf;d4bg}Eyw1HU(
zAhUf%I()I4aZel`TDm3IR?1<Uq#6{CChf_W#3OAPQngj$%x%`8(u)kLd$CX!Ig;;5
z$lFJHO8JGk#xU+kx1;>F#8O6AnxD;fY48e@5@K8n<TDLTnDsTzNfN|1J`5nmp0<)E
zccvEdsK#Tm5JQb_$cS>Qm7%^2BN~h52dKApF=Cfx43)XjMj@&~;m8w%3Z}?H9^F2E
zWhz5QS4d8Zj#9Q;Mupbw5PH8+U+t#p9$ZZWG1o;~gwedOioaK;vrb7HZ;+QvvaH0h
zMVX-@i`korR}O+pp8C*6uWUs?_8R>9tL7RyV;gA&4m8DH3x3I{fuY|-IW6H!Rg9OJ
zLn@F8RlKcN_R@Getbp?aS;ytacjT}cw&XSAXv>Xj&W{hD5Wkn)=p>3l-g18hMJ&jN
zvF*}4Z4!~Rjq1pB%z_=c?kx5eJ){*eXjK;>KL^Y!ys1SC*jRSr_|@J-QZ4!uYNl~r
zB2rueXn|E`I23!zr?MeSv_uHg5HM~}hDz_tDfUF*!Ru5HzLOS`nG(zw&{?)&m@4^R
zvd&Rn8Qo%EO)Xrm8t<0XT%u1FQ-(}#d<Zt_M4oBx>SN53TvvNre`U#t#1g5M(53=1
zzL`owWrt0&Tr$}nMD(zgA>{IA6K&Y+dnvk;TtkZ$T}bMTEuGCxhKLDM(R+Wkf7>np
zlV)8=O<)dHA8pH7beOxKIK(kxv3MS81W}Xr>j4rcdMZf;^%Lcl()M3w`40-q>P_F0
z!aIzGwm{^i70cA(Lc`jeUYt5W>nb&UER-!%AC|&QeC0b^#3$C&LE4m?Wk~XsE3}+X
zOZc9)bX8^+M3)s$XXs5UNx$?21%0FfU-q4ySY+S%N$-|8IM;4^5CyBUlvQF)i&Zp5
zwdUp#Wrl)YP5%k+Yw8kmKyUL*``f5`XR>se4K{$Jal%MTmo+Y3HYS5?UAjyHbp^%v
zl&?<l9$=qUr(3?+ZD@VX<YwjY8pNw*jb=VV>~tr^w@PPXY9_R>gaZ<&VZeMRhJ{k3
z8KM`HP*<jdg%Fkxn2Dsj-2ijO{vRKxbv5+}z1YRg(E4(<r8{3iy=*9dLaD6N=)ZX7
zZ6G_^|GFGLm4sDgDWi-j!X=N)L|H7%3rU8%E5bmp92$(&EA=c>?{qF8AA*@MO`%#|
zSPk12$6t@%^2q<yyTgMWc0fY>$0bSSwo<h7#cy#5gg`eabs}TKVsf&s5y5Z}VP2Lb
z^zGPo!XS$N-caUo_*OX)Hlb4Wnrp&W7(c7hj#y)IbBH>aRGMsOh1V<Da%bw@O13`R
z(5Z=OpJc35coA41TM3C5xv~&O147bbGtszlnb|#MOr^}$5?2PKY)>>m@3Ymuq4n8n
zWquJRjpQRET?fyL&hmV8io|7Mex=e=9@E^sXwjmkYPG4*)r@}>hL2qHo}=~}H5w~k
z7M--R_mFuls8F3l#vfG8w{}7q$^1$&b1>^Onr5I_RkE2`7$+bQ1hxfGb6fdTAKz=_
zo}&l&_zVVEn=RXHv4B8gvX_+}SPJFn^W8aW#%vq5Z<ZWj5>JmGTPS9x9>cMG#2OIx
zu^UG>>milm7-d~c+0?OUA0yC^@ymIjPrIj%`6TuGwB}^l*2QR~XoUSg7apg+(>G?I
z4+JII>&7arW+ZL+PV~>eJy&UMtW{!4uFM=WmzkXH$#tzv&d6ElEe*DR-aYn^<$2wt
zYcODZ?Q7Avp7ELe)HqUj#i3^2$akWMu$0CB@VXpbWJbjLCk5Mj=88w3rc9@nLXrj@
zS}(@$DrVdI`Q}(|QYRC+VI#8oN-wb@?ZDRTlhWXf*mLxF)qtshxe}OkNDSI;GB8^L
zjx${t9MyNb)%f-apQ3ucnf7dJzRQdX;i)EIxMmG!J|P3q0#@+Rk>N;IadX2nN9KAm
z<zjnfkycmTqcOZ8OC#o5UYA!_Xp%|}?LeQ36UoTKY#P%g!hoFT7mFQGn{vv;nmA}_
z^#>aSFH&|}yd-Th+luE?m=^*YGKut-v}qaRG8xc#OeRR<=G%mj<j7l;z=RbaN7^Eq
zeE~=1>{EWa7R&;<=g8W_R7Gi|kBBU)Luw+YO2`&MZ1R~<DSb^ks}|NU%#medW?xwm
zOoQS*-Vx2ck(2?tI7Cj|J$T|{Nu&J7Sf^}5uEgu?)>ITFkUAk%`V|?E-0rLz446bS
zAX%PG%u>B-cap&zvUaDGUOWRmg5gSy7}%`7#xM}GH`g>o<ErB)r7X~R5RM;{!A>Ss
zPZhvWRg$o!!Xrmz7HFQrtybn`RA@ucV8di;tKP%H58g0X8|AL3WQweLS<-d2yvw6t
zZHT8-)X`ROGo4r)HT{hy?iWp*GhJCs={=%E6GP2wBx9P2yBAF<gN(VZ&=h88FHBJK
z;ER^JHD#ZV&cf9!9o?x#PZup@;hdO$zJf^jNGZcYX>u#3Ph^EjE<KV6#rBvh!~xSm
zkbm{Eqsctk5I-@$4F(E@t)nD2DTSm(Yr1G7ahhcA>|gK>CfkqXT&yS8QlrWjd(4Ti
z7RO+E;FM{N@&QOkYW|oCm*X!<Kv)kB^O0H_Xcml01H`2>GZ~yNAmV%A=J5LTPv5I~
zR-7m_7m38!ra73~XecARjrtc&H1}{=w$N6>skF5imJWEw#4w%BTzrOe)17Zaw82y@
zRV0hMwiBv3L-qICaOd_cu2r#RpMpplh&Lqd%fTUDMsBnAF2wg%4yy&XS<`<ohq+as
zZow_%j=5@C4^vh~B_7mFwQ`CzVI~ucdY~I0Os-pxZ^`vw8s?pp`<9GcjBfNVGt1&h
z&4^+7ccGR_PDmxNH7wM4oG)dd#gktAZ+sCxiJU-46dB1`?8$`kTLKBGM)(jtgqKKH
z$+Th$E@gcfb5H$rQ&`P<%8RLiWd@Df7o#6wrw;iRyB9Jh!1qe(>ua`$fL5{A9Oe>k
zh;$6hrb8Mlj0o7B8xv_vo{+0C(Wh8UU?xB-$$EoXwganlTfR*zL@LAZjFqR@RqXIG
z@v@c^tb7uV?1Lan_fn8epFq8@SeT?#%n2HGT$~~d(?M2vSiz*t$b%(GTOVnZ+Mg{;
zez?9(&|lWlRaci*6PWoosv3RQR#aQ_S=YDcqscR`=)gj$Hp3q=CZ^UQP>zWmOI^bP
zpPQ2t?j{?t6buF9vTma+#1wERKEpJEDRjl6xXRWOvMdQxjRqvW7Ol$B#CDQ&6^Y|E
zSp`eq!@|J>y`Arb^>9lbyf8>?clx-oR5{mL!oEUd^GIIH$&*A%F-FQ2C~Lyi1agQ8
z#u(*K|75i}zM<#uM-!DoJi$~qi4}0qFWW&Pjd}geC6YR^S=cBAVf;g>{8#?f{i#{?
zp&RLVtY*c<<8`84LiMg9Pr8adDWj>^oM^?OZm73PI=K5vzY$E88aU;EijYXh8#cr@
z8>6@qXnl!^G>RP3Bw1LM&W8IHQwVzxN;P4|G!||`->5&Kp;4VcWkl?#`54lq%u#H;
zLMKfreDzuuZh`?Hy3xE*ZFNL%#7b#dKC0C&W*+dP`nC)<2>RhZebAB;rF;3Li&D+V
zvYvDkA}6`+T%1+(iMgI>9%B`y%kaLG&faRM8iwjqa}CRUFK}f4@~7N~Yb8^rR&)BC
zEhcpreZ-h=lOt2JYdSA<kxjQpazdJfQ)mF~lEou!l(HNbX%)^`Q(_*;L}^1rn!HFD
zgouWRPzfkavSNFCzBT{Qbu_!kCR3qEq|I&`qfEu~Vk85T3u83cMEc^}zzC2`L>M$A
zTl{NUJMtfIgjJHxJS%vn0A_o7x>z5iJE+#oA+%6UD?$a`Grh1qHetApbIN3Tsx2@A
zBS^evN>Wun4%(O#G;EFWwV$M&q@&G&voPFTUomD_>$^H-D~L9kbD>$wB-f4iYezBg
zOGnNJiV9k+(<-z=m?E2o1JzBkX}5zFR;!khe$oWOVqLMvmg}gA9=eu<0yNxK#UP)z
zC!b@@D%Er1*Fr1A>oIZLshMLrM;3`}HeYvZXdl-T-o~XvOQ>{Pltre&Yzb6X(_km=
z(Vi0HA{<>b<;e!VqU8eFJBw=Gcm}5zC~j&f@XnJ|DCqr6LQv(+z25vKY!+U~`jVV;
zE=94j%GF}Xp}A5u>_%ZYqe#}YHM$J3!9VeYuVrjmh{GfrZD5V(Vno(v{Ng97hoVzx
zWX!IbuxMfA2*Rsh`AL!p0V{l>=f>;FVaXdNuXdPyfmy6E3EwGI+-Dz2)N7Z8>&HPd
z!Mw~Nc!_B~yn{P4YJ)twyz8WROl{?C2*cF~4(BIjM6yZZ$QXi}V4{yUgtc(J;Q`7q
zY5^ibwg5gCb{3G(jgk<{BVAI79LvoeKQY+==-HN)ZS0D-Q`idZ5Z|C@O3)Bfl!w?b
zl*pJNv5*lf=L@z<OUcMI;cZHTvd5lLctM3T-?XIa>IQx0sF?$?CR+WSn#S94b}qii
zKS(Ph1FUSOFAWA(f5tPGsb@&^WD9cHkWEC4XrG&Ppn9=v(D;-{lDK<UJhRhm0*?f}
zs`;7{B*jH6$lPK}`g~g1#r_SwxKs~psMKP6za`eB5)yAI1Dj{XqDSA&Z}Qbk%Ai$n
z@o-pBrRi#efY}H5woPbhd4#)ao=ROCA5e(X-u-ka+gW2AoPHx#(J&IBgfj-JySuXm
zub6+IjiyNfQ#*`kC>NUv;R3nJYAEZ~SV5q&SVoDfXuoVP)b}YoO`vo>^fqPcCCEu7
zvYDJ@;2iE=f~F`aIgeA{M{gGqh~$~~SuMaN9u=W<S@IngH)H{q4VjnK@WYyz#`;Go
z5~5s+h~yo83eBikDrtL!v>kZ?S|K!1VMe1~rIt#XHyFe}g_YMzVD(j3kn=;$p+Ax5
z$ekcL!+?X(z-Xvx0<?}jW@<bW8Xw9_6Qb=9roLXDx)s%|k)nw_>}|k{qp-%9T2v^o
zshxgCe38O-GwkYybx6FtqKWRk8%<=rNmHt5l2!~#a=P-tW50ZNX7;cy)<G6WpLWa5
z7~a&t6u?KCl-?P0frk1pEcKZ+#9ksRn0JI12beR&FU!RwE<)O?h&Wowly{oYeCmVt
z0oCGX((_V-a<6zBA`^R9|3?E(A4rC%U^2`W?UwOu!lUXK9Uy`3<<i3$2DY%}d*rdN
zg<+@HcK+VkXs|1?y^9y&Gasc^lsu0|)ykw5YpZnXv}wU+!%RH02|5pk(o81?Irkc;
zE;dlu>ntGZ_1ZYhEJ=qhNTrpZt#)78f|W@aQnn<UyhMLBac`ff;7O_J20nb|l&lRa
z2yzPG76Yt4u4<X7gaXtfe3)su52!`~=10m|8jS53WWK4HlL-_gl%8oJjhASGEH}L<
zpa^7POI~vnAKcW_<1w<&EHl%FBsCG{Go9e<)q}he2~2<VQKiNn;s-w2j&FENmi5WF
zS;LGYPRKZ)c)X|d12Kp^)s2^9pY=FWub8<wB#OhDSl-j4MWuAgFcq{Y*))))x|dRG
z<Jo+sMkSk6m}v+jq0Ln)ReilSz?l`&wd0(hn1NMt0y&voODdzX)bv@xO@5)tkcjRk
zgOJz=PL!1>I4-(ZNZc@3GHf7ftgtMZ*AX0rT!+fC5a#PH8n*=p(P9r%LiD2vZhw@%
zB6WpJ18#6%r-|*gBBKdAyks{O-|#ucE^gpAZ3na%ruk?pS_#wO6Mr>syy2PlQdK4|
zByt;;wIy2QV!xN%^&70$Q$jn$BSe+6S!(J#!9E3vV!zHbWnwpJ-<e1`oE2^S)bvAS
zh4d_nnazO#wzDM7jf%^tP}4V@=uQH2txjmF<q%#_SJTMIBv_UMR`k%tZ40|xT+<{L
z&0D3Bc4Sj_$`S*(p2Vf6@tK|~N1KS~QCQRALz;py6!Imu59SKC#DLCHDjRFTrs%qf
z1gHH(O^f9|-n>R?Tc}&^Gg;Ut#b!FnmCO$*Vzy@CGojH-L5?P=u*s1T>cbF723H9q
znSIK>GRLe(HoXo_WDz62c3hRaDe2W@1s#FHWIkn};{X)pU*p&Tg};#!4M1JXe8_RX
z2yVa1d;a2{Vg)|zG{b$av-Y&7$nvc^PYI6;QbKIK05h<5r#7`<wzaibMM9dQY9cVM
zWa3!TyOd+-ax4WPx7oUg`ZtPzNeW5a-A5&k@FAN%<5+DUa<BlG!-lJJGzk?^_5v9$
zO2rnID9n9Ke)4qmX!86VQq+nmnI9X0#zd3-)CtOCx3(@{yYm%#1QWU&%~s%vof{Bi
zBah<A`G9LYA$>X>Bn=F=+=t>g9=d*?YwgOGOsKZu;K0t|YN@#m3kNJOxrqBqvAvdD
zd(dS4_OeR*RZg~+34_pzjBeB(drB4;a5X7aaBbXX<S}L9J~%DgTJ6HOm0mWr64oaU
z4JSjC6aB|{pHUbxvAailF6%k63pAy_&Z2aGQ(cn4=1UWzDPj#{FuIp$74&3mnCMg*
zLa@VIr=WK;lu@O4MT;4L@7H(XhQGE;Wh<TD6{o?}8uoiD?`F7RcB~B+!F*fhE;Y9@
z)}cgw<zZOEipLO$X<Ab<j9FFqHm_=_%_>PIu38-)N6$yR(Tg<ZP(giK9WToonRcI`
zYIGr_*>|EvW$8GUUl4u+WEq}Vu1%TQ$VqZe=?DEw$5sb@(oL_naXp^CGIy$xD{RqH
zAyZ9bWWgvRQwu9J+BhN2H7tQ=>chT^R+&uAh|GW*L_BgZQObe<O&2tH280~>YN9mx
zrk2?7#x@T>2V)H4)kdC}Z75q@liJk0PvP;3WvdSTsbG5zdM)5HC5Cop6_)Krr(aME
z-*rtyw%t!g&;&I#6>Nfyd%2I9A!WeG+O$Kj)cmt7aV@B?9_S8NdV&y^4N|805bVDZ
zRxM<1At6O-_7!5J(P+jW=aGc1c?O=s_{YVn{l5sCxqTp-f=Us)pT#bD!C|XuQBTwS
zYIpF?>+g`4Iqa~;MY)z>{L+VL!?36zPb-(=v_y50Z_Hv8M%=Y!A$l%zSb>c~7%Xf*
z(_tuG+T<hUO9o>zCaNDWoGJm0i`&c+T#dB^Y5j`1xK;_}07IAXj?3;QhBGrEBt56x
zMr--np~b~(lF5j~h8JY1X;XZ$RBZD-ZJ|DL35l0IlIelg*y(}1!>5xkQJdJZ=hj3k
zh}?HjVkH5!C(`r|70HN@h;*6=JzXPSY{1p`!}0^~u1so%h4>T^RBVc{$W~t@+oAU-
zd}`^k0TTJrvQ}kl>&w1c3zJJQX#bnEWha8#AE$IV?D!|E6;6t<2JWi{P*t^aKh~2s
zD9)qdwZ3o3OO$^`ajbO=Tg`H1V06u~9Wg%mr7^p(V|nrYxtJ+|NDf=YV}^!s<6oFc
zEmGS)=AN8k$|ufHL&C+$UP@Hh8w(4&Wb!f!#G`29h~Z;^q?9q$sKz}Zmu$$kLx>jF
zxW>qDnx*}>d*dhux<Y1;#*rgo^Vk$ji^iFo#hsEMYP7)5++KFHgtSBJId!UBnMXg(
z#YR%&Lhrcd6REbZN!{L|j1Ic76HS&bYw$-wv9@s_I2#}dYTAT^Y^`5l>Kl`p<vs~3
zPL_Iy`q&7;K;IRZMQu^DIly%4A~wRAH=mDx>Oai(?HQJ6`E!!em!xeMbv@n&#?5k_
z$l|69?Q!A7B<d>60<<|4$ma6m?w*P^I?L9Y?I>^#1216jw6Sxz3@EmRSb9xMSYuKr
zSE2mFOry;Bq;gZZ@?w-O^HGr>islhMlFKbzWz<YVK5(I8vBK<Di$utHtDB37)C~+P
zl;6~b#Os6EEqfVVHnI5@L4{^*)_2p5dWwlrr-e%JHk=<c)>;FUlVq5XCr_R=yRpF3
zoSrc}GbNr_A>Yi=WCe{nJj4FnQNuH>t=&a>uklY<a%`k`=kfQpF}pi^LcSX{DzmHm
z`<Z>!9dy;g&fQ_HI3y9FxloT?I^vax0&KfuVF0sm4bZXG5^9hXo2V0GR*yZi(_@8v
zcan}250AY()?@eY=J=*j*)`U(YwnOysodNrx=~gudARhKNG@M|sWB*BQh4z34!)TC
zLNiU~f@)T)xQdJLn8IRBSaXio9E}nG+nQAHrYSe-u+lthJp<OLQ40dOMg1#v@N(Ss
zGl#hEwh3Ii68zxxv6)O#;!p65M@vT~PHh$twY?4OBt#R&DZM%fN?+`Tj^=|Pwt(JL
zQX?3QJ94i^{u?cs*GGVh_aJm{k(u;Sv}buGX@Ju~SD7JIjgpv95HUlfs)(hL8MfHv
zwy?wtfF0o7^y_dMmGM3{8Lbz<vdogOx7iqia3K>rMu8(`>6botu&!L@_)e_^sd%K)
zsk8AQg#sdOm)^oxI1WJW4P<1ak@OQyE5p$mt|{SxVbn|4&g-VR3b~mfse(Lf&*5v1
zrpvbwiVbSY#OaM*m-3sVK(VVA1kaMtSvl7wGmA+x6PhBMZ9Vt3eZI%)jLQiV5NetK
zyj;Drrev0d`v*}n%}c@&9sP}QlB-nN#!p`RWHVgspf11nJ{Gv%WG&0QU0*N>nbawc
z>^BCxE4P|4Ru*JW5XVtMJ6)}|y%X{Vt-R6ABpTCF=R_r%A+M&U9$4`ZCpKi5B@AJ2
zKEG0P_2Hl$C4MU623aV5u@2Qx`;V=T|IZYbp-o3r(QCTd9$<4w^$vPhr}q%CylEVM
zpsS~qFi>Pd$GBN^$|DlqXKtTB3E9}7C~akCT)KPOU(Ap1(s0HB5%FBwb1a%{(DcYu
z4>Is+F`2oGcV=mM8N%X(_@os-Tt(6&SRYi+Mq2`^S@7$Zwk?Zoe25xxMu}AgHw&1c
zw3(U>+vuJ3OSzkudd2yM!t@cGOS2uz(&a{`Aplt4M3hxn)>JW)y1?3@3TRrUL)A_a
z<QW`~@+~RlMjDhEQ+%03>J0LsZE*#X<9E=d!t$NXCz*d>O&7(Si2gA%oNIq*Ot8c-
ztVlAq`C&QvuGB~!SCa`#DMo&i&TX_8f*BT=U;>>%8FywAXl)pc#Wz0mxFRX>i|o{N
zQBnY5XeRa4Z7e~|vykE;;BlV`CRhYn;zo@)?RO9)2W+V0iY5Cj)S2|Hx3NYe2IVs0
zT^rqk#)K<4W<Pm?YwVL4j4dr}aq7WmENm@~F%uR?=|4mv8j>EuIY92`*(cs-h15hj
z2OAb*jV&R;cT{s8tp-C=>}7K2NoSif`NL7kdV=I#Sm5V42iiN)-PHtk2%IHPvc^Li
z0mnylKygd9tCK}YZM8A&977_7(-e+4R*1~YkXzoi4R&EHgUrYQmg{A^V4IoFfw2i4
z&C6LMW~RugD@bJeajf(*Nm{DQu`JAcf@hSv8_S6Z2*|FdVRSOfN{Xn-`lNb6t*7XX
z;8sJu$w)qWwbz<56Jt;0Or@zsN9(f_x{OOn&YMf~i!gGTM67My2%HyJ0>hkym^Nsn
zN}nD!w8U(a9IX=i!Y(Co%e55u=>r<3jYL5Z*m4Y<r@qdsZfD`fI^CFPio9Y};l8xV
z7kE}N*=l~b{fb$utE4yeNR5Op`%Q&b-a%|8Huc)cHGIKHRBJJLxrhyHn5G>Qg|@c0
zKAw}ue~>`(-^v)<AmGhp*3TD2;Pi4*?PKwn9@wPT`%Dp}yhs~3fu2Q4R1-<tny#T#
zwsaRiPASZm1Afic;mn)H8^qGX{L)N0q1bdk+h&BJcdoou=s*;Q7gL!fpEUW)28B}A
zS1aR@OKWT9q?Sqkpn`fT?VQTR7WR>ln!)xu`NygjT>ix(#Zsf`%BYs%j99O|uZ?1>
zz*W;4UHzNmAZ0q1x)!gHVZLSih!{3*NlUGT9a9#2QBkEz%;?PJ=^Wl>qBq<d&ZRTq
zuc+nNZh1!%MtZM=4ysrXF7b{S-@@T-?^``ZA>~+ZE#)~dTXu<TTVo3c>LbOhooI+w
zbUG~m=HtXx4K0*6VXiK+mac_D>_nD_#zp#;`5>B=LQPESu&C^9;ZjSTZpDQSDKvy@
zxrhND=P5H0sY_`bp<szCr|Ft}PTth~r3{3u%oo7~qyp0y+M0BVwg|+V^xSx5Pmb3r
zsqg2EyMv7pI{Axi<XVKpW=vt=408yIZyaenE&)SG91FWi&7;qtjk$ctb}*7?a%fCq
zvl34j{NTK`Yq`-^O%jFdVsAML5`V`sTHeP(c2vm^OlATuFBcmK5`nd%L}9oT2}2Fk
z;MQX5s{L~nfyL!3n?7l_|K!DloEloh5@KCia=^X-r3x~ps+IZ`S+n8+ce<?Lg(7Dm
zu)d(R)cE_xMojy{*hFWEXP)#5`q6R<h5<a;oV$WzLQ6SMa&|+?shOJh;+$r6Wh4|I
z=0BXBNKovt2BHsmhwIOcUQKlo4GWORdyRxA0VIdSk=(PFlQ3{Iv^Rs2j7E9|pKjlq
zM?UjepC9NK@~0B&q`^U1t<<kHsc&mqm6-a5)_2L%aUPmYHP;|L7HI$-SqY)`|Iu64
zq58e&-35IWrM7>AYhl@hoir5m3F$?~_%(*Js-$xnnAwbn#Y3Ma%UZ|5(}?cW;Id_f
zUxM)@>6c${J4$h2B_XJCX7G{KMHvk%B0^>NX3jn=adeWB)l*elz`+{inADJXiH3?+
zjt7?0P#{@qD0Pj1rmW~R2qY<tA|a<W4)Uq_TA3V`i6Jfpc15#==L;;y_!*A85YD2o
zZ1s85zO?<u(wc?WeEeCG)40oCRbOBp?voa|zv%-u2)O%%YZj)?k-wzAO|+6c-Svug
zNjz}WHxrS7=a@7E&qY=jo13iIyk#Hjl?&````86`1|NPPwOd~YqHpP)^!ih~q=q8>
zfWlZuNtlQ;Q*8q=<gy(FN$qs-xiw!l{+lY8M|JcCy*Ic@Xyrj;s<Kb}bG!N*Q!Os7
z6@<T|#l#9Z1ABCtAkZz#C(J6eJPPrZo6lZM7gqj7Euwgf7%6@6L9YjuD^;BtypCw&
z;DO#{lF-4q+?9jGBuA7=!qD!g`P$AD&$P)-#8tOSc80OmX5~n`k3im_-&;NG!?7YL
zS1H>V!3uP-+dmqcyTr&EI9(<5y=a<Dr_Eyn_vzYv($<!$dW*fVsgedMt+q+`7q^8n
z1lE*~gqKpz3QQ!;V$Aehi;J*)!pbziMwr;hr<t2Mk&(vNs-aBkZFcGS0T4_j%>OFX
z*!q?WSmb-H8Ee{yzP+emE~`^ysglhm%;+?!peEAJuzC#eP*S8Jn#z(&zAKt42@v~1
zS-mBJEIOI)Q~D$c4B`4_n3<(iHdkN6hHT!cZQa#uAvQEfVU_Dp+RP9)gfXw>h=T{~
z9%a)iom*l(k-xAa-mOiVm07KPQV>HD8|%$#3q>f8PfRoy8)7<f(kbHC5vW6&tm?30
zdIifpqRASS9mj@UN9;PHHt~#Cv6x9=(cq8$_~A>eA&B#usT1xR4voo5j4f)_*0hk2
z%=Y>(@<44@Ky2#jVmB=3XnK#<-Ouj~N6MlIB&&OPL6Z~n>L_Opm^)jIG4<fdmViMk
zF-|zsYD7rbnGDR&+i0>JBT2BzNV)1`Bas85X@FR(#AZf`nAY$$JmunM#ZNQ#$2s~K
z5NM0O=7U`9q?c@=ihC8zzM{{w-XaY)?E3V?8l9!68YyfZ6IAMiHaawjLu>{*c|{UB
zb}UHdrM*UUQQ2qStnDQuu_UcF^piEG*-&Vos-^^2G!=4d6u?9rR(r=-9E?H>`#~d8
zI-s~@YdM;#r89Y$+cZbtO}esrf=L>)y2JRjq)NA9|8|--A;o|$?#hl<QciwIGy^-9
zSWP`+KU~qN*b}A=u97FVJ1Y+FqZyPv1J>^;x|v$^A~oi(mf?a=hM{d*O2tJirrN9K
z_kjpR64FJ2XJbkR(RXTpjwTF~_M+)=W+F}R$(5B4ZOi8v^t{+Va<HmtuSn|TN+td-
zibiKoEW0biYP>x%7LYVqcqte*v|Cwb6?4FkvsS%`3*&vwB$1vwOzh5Lmc|zZn}31L
z(p{NDtEJ9n><?WKr&WD2F_0~l`E?m*p4AMbwgw(0-mP)RL4s<lWYWR3XJW!iBy;D5
z6}!vUD>L>#Oyv}flFSG8(Tc()mQictE&fv;mzeJ~ELo~lOeRFBzeZCZx&|?%<2pjm
z34S(mgPu0=AYJ7sJ~kpCXGY03lN=1_2ATiKS(EXnVwEKc+or1|gvXzp_L8tpD-EJi
zDsxyYq4IHwl_2J1m_&kp!1;8a7ZUe>B##s;y&4bv#%TI4W`R$BmkCRsza!V{odHV(
zFKb2BZA?CQsHrr)Uhg|rBxCgoQ?0lfA<vj}A}-ZcXXVcX#rckbB@@*nHCQD}g)BKS
ziYG_B)!yq{<mJD?xo^?5u)hh;)Gm`?cZoG=>w2|g<yy>{&e+CRxsWO`H`M!~MX{vq
zmzQt$;7|-RXXH4t#l?!|rxY;=DrB2G1_aj)eIRlF8E_RLGY59T6Bi!hPhNysPBJ6}
zZB5#>8l`VKmTXEWsIly>O{#b==+p^sx<IZOrQCl@3P8N%XWK+HKa-|xhYa~JK_!%n
zJXkeC*l?3n)b(-38(#`ex*3FOvNj3FiKOq9U2yZAR^n6~W+z>XGZV|5_{SYoWtin}
zx|O5pzN&26S1(nd%vw-S6AY%V*RD-_Vr#e9X`qOk6!pz)wLULKn$g`^;*v?KDRVHp
z7xYIZ{cn1O!4rW;yXs?!xYr@Q9r02Kx4xIm^hiD_KbLrCBFdsRBQiyzPp5YcQ>2s*
zU$0|U{V<-z^W;|2z*0=|x!_OK=V;1aL4BLUf@1QJ`vUv(6PbFdNb&JlhM@eVxFpl%
zsMfVnqA^zb8e_p#+nK=$nKgwv9C<2U>@&z3MNDu|APoh5_c_>zfX^O}ePxsLqBIMV
z$A<Stlt9j7#|tkfC#PLU>ioS1KQZ<H(aQe+UwBqWK5f&)97UU8hVJeYltN%a!L6am
ze)-xejk*nkXvNNrVR#B>rX-w-N*QMyoWkNwI+`ZJ3W>L}yT6&wFr|nS+ut2!Di%8s
zpt$Srqa^<Fv5_XuscnqEEHQ!Z-fx$PdZ|umOfB85_=Vo5HxBq(%@dzJh)8jaivxZ;
z5%AiJ%p4BlhCd+Gl!<vgu}AAK$@r86<FnC2RidYwbkq2osv&;~30D##YO74h#MqQ5
zZ=PT^Vm-y(Kv=}^O!=dzLDMsb04t+SJg~l0yL!|-+5q9_rY5E1B+O2BJFtj=LBeyg
z?beVyUQ={eKdnn6n6yfzaal=g<_y)sMr-M{y)0^;E;$A*uBso^=MSZRFgg*i^-wsE
z+eO+D>}xkR(Tk?n#=e{;@Qpq+YUJ?6OEY4rP_Z<Wd}33cIa0VTpY7rlNHR9Er2X4D
zE{K^B9$Nm#pMz<y_cxR8S#&QQB@9{74B7a6`7@f4Yq7;A3KW=x;%I!+c_5;fPxXSK
zkJ+#N`Jng}O%@m66fJ|88@Q_l+%bzB5p6pkY__cWnUb%XVpk;B37B;UKK!CKp8OZ5
zUxZ3&>LF!~mV;=1Ag-#@i~8|cB*rnbo;kONQ`}gQu^CuA*e8i5#Dq)d?X4Goq2B&7
zsmLhG=%BM;*m2`I%1q5gLCTO$6tm-VeJMs?=<4CWl$sC^u>)>VO4NqN@VL3(h?*pc
zTQ$_nr<VFuO5P;W!^$wwgWi6bdc9Vo-fs^OKfue0y64H^8QDC7RI$I0179W+bhaN#
zB^x6TKPzJL$xw^|-dD?``d1qJdK?q)2jIxg(pRa##hA5t^x~#I-${%Ty~-)uT5SNK
z_1PNE|K??pXp3|O9sW#(!k_ESmTZHDzHe4()GQW)q;mHCDzDlgW=lKE8>jrGehuDF
zTl)l7N;VkTe5QHG_}-_VaK6rdC{OHmV{AbH#(edkenv7u>LsqGjq#WES6r_n7Bltx
z``5g3>Q2&y+w^C=7~V`Tgg7$6@vhBtpl_Ok%9)o>zJBD0;f-d4$K2kOnZ*P<R|?yZ
zLMQAHpJ?YuZ9*UBNHW&yVJizs?9^I-51aVjTz6{x*K5zv0ME(5`x6Gm@&Fl(iI)ek
ztMq?8^|XH{>Rpm_QdwQtp!NwFhE#nr)>2t;IDw)w`y94Vb1b7`RXdx5n^;ZPA|dm3
zV#2tuztw>IVvoiNE%$_s-Ov%tS+#+G1pa{x=DB{xr1(SezL5TZz-bO6cK;WLxh<4&
zQp22^`NA4U@U{sB(qHjHDs*sED{FeLIM`Z5+N7mftPOrJLUP7PE|RCM9h#%H9-S{8
z_FVAAlq3y{K(2`*@OdfdO}+V6$IWTmaxDo0M=l|W#O#oxZMMKkEv2?}s`)Uddy&Om
zGxd2`9C6b-TfKnNrv4<`3dico)wzGBA&t6y7+_^u2+Bgz<-(!{W1aEULQ`NkNyE#y
zP_6GYVDG4Pqm)Npyo%YI6jI-8$=PaYIk?|kAROdQtRj3iP&llu)XJq@$)?8DveDw3
zGJ#+^GBX@6ZGr-yK4OwlDOGyJjaJxn=z{3rTLobjvxDSH%AI2mLOcQ7V97o01Z!eb
zA|>US!{;<g!79NY$@+-b5Izehp7}ySAi1l39DqAh3)0F@Zh8zwx}}Kh>xoA=*=$&3
zQ%mEI4I9NjD|D>B%wf<9TIuX=c!0It>CPARb7oIx;fn0zUq5lLO=1f;Oa>bWJ61XA
zLfeW_&=(dv&`RQ8-)&2=db6Up-7XR5kdbthb;)M=y%tq$G!4WF^~dNWA7r;ZxiO|G
z$!SW>q$7KaA8!JgL_hr{6DF3{#!TjH;=^g9d^PET@IjJQ@blyE_0b9pilnQRK>0yH
zYtc}KXlAD-2N{$EZCwnUX`RU$3C}O-j?&tF5~gETI4e#k@xp+8s%?ule59}c6gzgC
z^d<RXS*?0A9NFtBzDz1_*v3Nr1E+K{;Q1a4RiL$6Dp$(`rgu+?@V=%-Comw`p+eD2
zS<-BJui-g0b+dDxc*=*(x+Iq|{GudvaoEvhL(<L;Kj4WCCW*5+1Tbxgv@)(Mt;UPA
zUTz~11g?xRuH`E+!w!pCZa_6?QBR|$@34Ne4>sjy8UM@8yY03|vusDrBX?~MDs<z)
za@b@w4^usd_~Uik!JOY_AX?v$$t#|NG$M`qZ5pi|Ez~HPf|u&Zrjhe@9f_?<U($ih
z!w{mj&u^IjQJ`VtQ{VLA*0x3@A59ZsxM^uRKe?uw_O)$rkg{!)5Yy4@VgpUNeLHh}
z;IV0Xc|4wrYU413V+Y2_u5HiVX4<V)Rx=xCb3BLQIUfTGCdB>*%%oZ3xu2gTk^E(w
zVdH~86op{LEN8nL*}Dw6)z4`A^lF7G6c`?ivltB0Or;f-UY(cP#<M)J6i0h0g&moi
zq~pY^a0m^x@;#<DeU!(Kod2Xa=tx_eGx{IW2@=TrLsF8^J%XYkdMDEwd`>trT16&9
zE3pKeI$f&6#6sHa7!+441$qbdl+{UN+7pmF=o6vuBvqJDONI%DEqs2iJ(*iSOL=t4
zZHyxHdQ(eL%F-0%6iZ8dx$<w~Qfdi3KVIWcX3f2K1N3wG7t@Jd+?_HrJxeG#8kqJ$
z2F8c$+76>+`jr_nm2&l6)1k3~hg3b@dfjpj&sOmF;VUYondK8zu7Sg9+dnZM=&rpN
zdfonlhskJ#%zYx}js_f4X4<lyXq8@>HZq0p_jZy<tzK#1mJCy03I|EYE3dxb;);OH
zNN~G?=i+`dgugw8^{Y)5uy{2=BcAnr71N%&i!FtXOPMQ$;?gbcF5UuL<2Y6{UF+BJ
z5Vi=@Hw?2Z|JbKK?}nq%`ek8)I<^jSmPX=V4Xe==wDhMkn}AD>mhBgjo{p^WVKP@)
zajGzUq`Cs>gJKpp8)G(+{22<r(bQD?zGlitl+l}edYIdSdPQn-6wbj)rA_)AY0<OD
z+Eg6t?XZnj!_=C!=AlEH%QC&&QYIM$%P+pN`kNU2Mjhi{O`+qzib1vPd;_WcKI5U^
z&7CzHCjie`E-$ug+Wsc6sVAmG#u5qDCL~4R#vQ^+8~pU_lXSHdD+Vn!(ROPu*0KtU
zeE*)O*0FWXSlPFCYSREa=-aiYnk-{d<A-{rPTr~=H)BPl-pO<!&Qf2GtHGSi7Q$GG
z^YJn))4RY=RX%<>^(o~OFATVMBBl)nfntvz48^y5Jx*-KQUUQDq{_kOkesz;E3rr$
z+hnKw?avm+GZNPhBoKA_V}sh#nl9}m-OK3}*^``ZgGg4ZYab!)Cg*AmDmJV$QPHY#
z@T%^0Jc-%a8P)t4o*FIfoG{PNC__2Ox6e51rs!IJ8WzGiU8oVM)0Xw7YLa#kqPT1(
zuYJ)BK}wYL3T5ZRH|nMa+zHXX#&jAlq?_h#{hd`Nj<{<I&%8{c^YB>Hl!_`!hMmsZ
zn}arD3P7wu_xcOA@eIKZc!G#1Q5^Y++Yoe(|B?&sD;vMQ9E<_MI1#k9%z!ykU|M7#
zKaN_hwGRr$(CQ3nlfF4%e&`ggk>GqRb=pnap`Cfv7uJ=XYgyccId)K@djI|8xZ?Z;
zxAAs`UCNV^LnD)2%H9JYP9ORVSj-gBY{E<dQ9~#a<&i-_3XF_8C>{)xYC91C&1S&d
z!n`fspXFMrJ9cORgQ~iKmj>aES@c8w>4^bzgQKiCv4<-pRp+&0)yN<0iabQ8sug(P
zEQ3)%?CVOB_iHGXZqQio)h@9Wx3aMUgpq@QsqgUz(ntD)Mi2ItFgfkrDQtw)f2Iu&
z*n#YXV#{8$H0|A}&3K?n%}8i@8Fk~bk5vb(y{}<{cA!n^KDKi&rT*v-K_!RbtDV%-
zZB&*HWTm#8%GFj5ae>9P&BOBx4}BScAxRP=b&z1M*>dQT(%-F4jPjIF(-2!%OGeIk
zMiGdYjBxfXM0_8otp0LGgNhIKwM~l<OVzSzuw_(B6bqE*RL2-Nbst*;`60$M3GneN
zqw~Fxt+vP-H$<SP4|Hl2|FC=FBULo)AO(C$Le>l|e5j~FQOAIiDsS?d_b`*$$>e?o
zFKHwy2OrT;ShnBmi0WQ1seC4xDZP;j5nxlqv;kBlcFVHaC(Yw6^hkAEpXOjMNsSzd
zChC1JRwVGZN&oq0%?IiK@W%qP!lhW$)3M^w$=|&1>)@%8MPH`SHdGtEtQuAp8~^)Q
zozg>JpX5@T<xmy2GpLi<D2B8McJG8r3ve`LM_AHBlN!sgHSi}aEm^@eazW+JjxmI!
zHk_jZ`A5_)_(aLkxnO<S>Qkd{%~()I48}%BhD5iYBr^_~Gr}z3)6$+Ur?XY(eFF9Q
zkR}_N)=vyJCHdhdlSQhi;u`_{JY7{O`5PTliGoh+dkTXXvDqx!ks*WFqSmd-P%g(_
zh1zUDBdbq-Azm2JtVuFMX36XqWQXm6fYHThHUywFgg%kv&R?^Ur<4{V0<*f?tPNru
zncJnZ@^WH<@K$4MNbjB8pZu9mpJVMPnKWGrRh>B^A>;Z7=k_37?6^SjttwqpcVo+p
z=H=#SuC`<GKVH+R+9_8-TTc?H5&Z8k#mZK%oRbk>qc%l51Xt~H<IE{)o|>PM^}3`q
zP_uUYgwfUhN)D_oFEq7|spoNd6^Q2)X5etHvx6`sD(ue>$Rfb#qGn2rDW-%D{3l50
zu-#dAy6}~VFoqkoG*ztqS*I10-Ag9E)QT#vaip^`S+IdwHDqpZgF>tb+U|5Oxtl9o
zk4ohs>S+Nc{?k;x?x4|A#&YV~tDGWiy!4?~mx^aSFNiGZ69bQXwGq-^s`gTo2Jj@0
zrBsvsrD5X)`&!kSjK33xP%0D~x$zMt=qk0I+&|CZ{MA_g{(Pa@-C!OJL+kPWm-AtR
zZLF%jiUyw=Brx{|15Rx8P5u(Rh+_sF*KTAVz~3=!F!K#~{2^I<Hz8Ic#pSPsx17-p
zi4ydYnm>2KUa~RtdDW(tsifg$V@UCUUI~My`l_~1`nIp$GXf0*;niL%i^<76wZfuH
zSijVC%;pvGXKbEUODFv`DD^8<qYAyR!_}#r?WmKCWo$~k?XBj_ZK#8{c_Kx*N&2ps
zn|d}MIDd+Skp3PijO*eVArb#Ep?uDF<C=OKYah}olW_#;h8}Ni24^iWi>u6>17$C@
z^?y*j|F6Aw-Hr3S@_gT~ldGr*2t*=c$#UXOT6Uz7b+A3LEwv=u(~S)nC9+5{B3Wz}
zX<0E0Y|Jgpm)Y0Q``Z9>1G$sAlKuPt*Ln_bRgsdN^z`&#H_{fX>V2QXde-^$=*sPX
z?FEKf9&k36phZGKHh<E70O&PwPoM=i!lW#SB$c7+(+HwymRam_2T%<S8&0xa&V}#p
z4KHK?(Fwmb>e4w^<75RdnLqr*c2C1rp>97Lp+)gsv$_?p_Es5hx!ss@%Xi0WHhU0D
z=sgx8d{Y+{Q<QE56XhRBM{-6e(y;=9@RzZIVqVlV9~(InaY<mB{1IsMVk4U1Mc|w(
z7IYBwa?wNDDCpbRwN52;FzGDQ;g6yLJ>@Kj>K%)gjGiXj)vqdU{8s)Cpp`gSuk9T~
z8h&Z+c6a!r<enfA&Mx4B@iaKcqX!OcMCGtqb9SSF+R4JsyQqOSBwrz0IXdimo1(m5
zyr3Dw`FwBFNC2f;ZUv{nW4_dYV!*2dDy(?>=FLq}#cOve180#{$Fo{k*PI87zt-hO
zIXs%hM~BDU)p)l12VDL9`R#0P4=X}#`;O*+xc0p0t=CA%io5347LLn~Gtk0A#TAVh
z&{?Z}`CNn|=?B<N_i@lLN~os;OdVAlodj>E{%lD~Z*ot~5mY{m4VzO_N=gjc{=P0(
zn|D*P{P4_aNA343Mm^l$@5X#icDG){J?=D)*b8{meOH_|LjLqM>sK_DJpT#%%hqKY
zCocFlsibPRyxIKSN`Ja^&o9Ry{+c^~<Qhs4iw|u)Q7<>1bayaO&RY-k1k<;J#FujP
zRVx6pISp78LK^)f<kuu<Ub^{E2i*v3!&#!xbW=rG<7zA&QCCswhd<(E!q8Mdqv4Of
zXF}Yq@}gR<Dorf|u{P~X=M5P<FUct&(4ibB9y3RRjockR|KsqvC3!~OiUbmC6Wf!b
z<0sG$kRgfyoFR8UmkBX>>LtbBvAoYo9mBgc<iB>LE{<0|0>^PUD|9rO2|{RJYSUFJ
zNOi^&K&^Awm=W-mStM@^XP%j=!rniFtl>jOacGM`#g>M>@jfh-Q$--6=qs&!NAt>5
z@#X7e?qOSHTdByr2h2zLMd@O5I|OH;Pzfb5Ke-1SEDUK<te;fj%o2+Wye#LJlZTOk
z=)Ni8F=`YAsPN$_{{RN0L>baL7eGSdZ0y0ZWnnGYdb7BaokwDq!YlVNK-f`OVULCV
z#?s9S-!G|IXbIWzlAqEVPjy40L8~y-71Y_Z__FE$ZC9>z7H>N%)kP<q#>TJ73<D(v
z1+IS=)@F4OfJkpdx$*`ux=&61;=^hBeD-}lo6}EEej2%c=yAF_UQI=DGoE(8S(dMe
zsG+-vw^>Sq@L~c{jQ|o}-o!_2O=ylt;TS=w<v9&t)d|^T(~NKDXzR&T;bf@@zoA%6
z;!6Sb4LUwbsxq6v8`CZBvT!z6E$#*mQ#G}o{APM<a((Z*i2nNgIz>=iX~DfAg0#RR
zcQH3~b5J%d-Rj8#SHcMXAs3d(K?A_<xP&mci=-Q8B!j*jP~BNsI&X8@t0~yS=h$|%
zlZ<~X7uiQ~i}-7^ylhx1ELV!NIp-HjJgc=!UcpE+1srIfB?+_7x77M|9U(u08NQA%
z@v1R?aSz1-Tb8DK-c;OKz0#|HviKL&oTQa1g!cki*<<WB<Avt)YA}|C)IY<U=(~zv
zAwZD~un%x&I(WZAk&aPm+5T$OVzV)q_EKRG<&ETQET?EZ@vJzS44OYL;Q8d!R^n)o
z&YK*0&mvm^Pryk*DF1?cAw!Bo*sJDDQzJKi$TTx0t_rKWUW55WqvHNe-O576<$@0W
z7k6N(uYtv63r!-z!s@g;&rZK}ESac(i_zpKZLn&eIGn*w)cBE)cBO69PV>R$tSaEI
zgGl8S%6r88P$o#ZQ0Iw<))crpRu^Mx-*L~2iI|h`hllX#QX8>qDPo-J5h*4l-KOR`
z+ow;8kB`joT{1RlZ<pGJ_-fwfl5c_vYLwq!;x}T{Ozud6urd1lj{1VgG*-%-;$k#N
z7N*5hR{L2-t}JsboJf1kHv%9j7iVv-1vk(>TK(gP##Tja7bg)}z;i)@jgv{OpTG}f
zFlSVxp_1tt(@}(%T3QT7VVaaR#d8Q)Xr0kC$6yj&?$Y1dw{oh1&IN}cxgmj~rKQu4
z%{kp3eMtV$qFK`NwUmN;&1hi03uk^iUY2HAh}9YhD#yM=fhromP*S$$knc<j@w}o`
zNgqK`Kd$wu*{XE1-0nnHI5Ip*O@<FHmbpld^^jpp*Xl1QJ4@BcGRYbeI+(;tW)(T5
zL5pHbN_5k%0g047a|K0Hs3>)fDUYb191KR1&gqEyIpmJ@<=VXzA?8zzObp+k6MA-a
zeq5QI3vsFby{mGIwAgER@)z+oP~OW4$B3k_gU0rEaE>}YcA>|(4Fbo61m|@4@?%R2
zMBuslzFM%SfhSq5lzu>_6w;=e^C2Jvi6Cdc{OsX#4UbTd-UKZjvJP8Vdp*PtCk7bc
zYuz5wlP<S7x{0u$rDE$G3hA}n)UNy%#st!;<#ontzx&I7|I2@;lC5{?Yxj1++sI+e
zlEPs)e6sHQhb%~c)FJ1J`ZjM}VuS`Z>xyatt(})Hf(n$>t|)1>Q>D#FW#LwdKuC#h
zS_*-0!aWhX{w=zO0|mvCcV+jBta|`s?OCO&Fi!YujjthtKcm^N9f<MM4ng*TY?uF$
zw^AD{?l(YIhlr*reXv7Xp-m^-c`Lm`$UjoPPjHqnfIbx3l%aW1w_1RyoIg*6W~W7;
zE|%vzFBiKmPME_&zKle)7TWTe>ILZ5U4$b8QBBtL^z7LGDM7)}hsmv#kME5?zd!!?
zoAJlrjz4}d{`hy}kG~s#{Qdaj-|ORwSAwr1U8VkUduUxE`IE}xjs*yDDn}`Om42w*
zF@AI`MJ6dm0!)j0T-0z8FIln<U{&(gS4I^=pTj39+90hsuCy@@F;r%FD;ca#eoV0S
zd~rK|!U?ZGYHs_rJDa~Z=VA%Iu31g3(Ws-7MdAo~Fo_C0#Vr!PKw{Ka@JrPaS@1>w
z#=&1mMHepIjgK&Hr6+-Eeew^aE<)EM7q8>LiJTSVO{Vz2Y${vkbl6Yb^IAXsGE5m^
z^|N?}Zn?bd`@cnxIq#<<+niD&qXln8W>=(nU%I}Z4G}q<lt<y!z+^5U(FkO8njw6u
z0tjURUM}e+9Y{uB09D%Km;C7CsQM;fE%v0BN#3hIiZ9M^s2mMn(&$!QB;Y`=xT*Ja
zd3$*L$Kmk{-F9VVu_iBf-?eOo?#U{ThR5pD$K1o?D7!MN&9K{S4+CH8wim_$#{V><
zI?&DAwFhmHf+SuAA$cxxxDbD}TS1irPCilG#Xp(TmfyOPlNHhxkh4FIczUP;Rqj15
z?M>GY1jnBf3C_v>g-sB-@!O0*5b%JumAd#=ET0)P9!sVXjZ$cMG8&`)<zF@n0R&<(
zio5jT>EwR45P>?gEI?vU;}shbMNXj{BpkDDShJK$Us5s!q7q&~=;21=ElZ(H4$(4;
zPLX<ar$s;?ni$8i^gNDb*XZFKQG|C1?ZiG{DQ;n<*0-UZ0x|EQL?;AAAI16Pv*HJ3
zyLN8WC}{zU^@mxxsIDAZ%Zo#sU~3#F;1LPBcaR_gcc%QY*h}nJBdy&{?E$qp`Az##
zzeXvs^ER?jYBKg}l*?q#bXJj<H`%>LLahwf+2fN4^bL;-c+34(!(%7lWU!~ni=zJS
z9iJ}nMV-v2d%L^S+3xh>)dsDXd+$i8)MJ)tN*a=nsph9A2}vAwE*psJ7$ug3>^L(4
zfRREo1C~Bno@Za}Nhu>;bJ93xUUZs;{kM^_M546Jtry&L2ti2QVwkVK0t>a_mLQh&
z(%4=)Wa4$l<C8=gFQPrQ2jFDA{a<8Zkah7bX%|klaL|>a^N(KK3HSCdKf3wij+47s
zQFy5o_+`UNOwoPCBpcbI#P4uX1(UnwnXl@m*1XXYyjGMZ)HrEt^9eZ^ofkU3K)iUY
z;sS(Chc%mwO178U{9BZcIo2kS#j*5s0(c^fE+MYi0rRGg{8vHlM$r<<W&tYBUir6O
zk#UHm7W=$>=SrRz&>Ok-wv_l*T?5pyJVx&+M=oL@gpB0d`Ypj$xcPR*mh_ZmkRTW?
z9$u?nQb*A})cQjk9ZASCmHI?pKO|x{4J4u0>`9c;=dI6e9G<t7Y%5U@{}u|RY~TlF
zck5a_++idl$ly9zfQH0}ohM=I*I(hC0Ufc*L?gyUcQP@%?45dmgdMbt5vVH7A*mph
z6yl46c^wkPQr|-sLfF<cH2G!m|4rSbFl13<tzkMcWBI?LP5=8U-Mv$mKlv#&y8`6L
zI7n$4AR7`tqaYa;!N20U{x3Ptf1l@AvhjXa3HDo#Q&I-DfbM~33A&{&5IvHU9|zv=
z+!-FPUCc8)zStWcOXX02uKlIg=gOEJ@f!(K=|FOFqKj62uY0dNGVUj{^1%4VuG!4H
zJ~wVNQ`c`*Ou;eTKO|e`(qAmy0Fx59#7Vm+<!l5X$zoSH_mjAD&T?EHG6dzx@FcU$
zP-H`j4o^4&f@@WF!o$+nwdp5;v?g6Vacxl806UXUHZ*@9o-Al5;Ja(DGU}g15&UhJ
zWN?t5Jb3bSc#@T4H$PV7TODW5h9~Zci1+=B6qNb?@D$ZrnDi7w47Scp-Jc{l(kSn&
z`{t4_B7ao_?9Qt`#cS>iW92_mDMnx6_R!~OV_KY9-8ZSt6_NMUVM0`|axY?h;pHiS
zhz`xm`b(Ob1oB`0Md`)|d$%Y4f#_8ES2C^|x%EryZiWS&JPzkwHcok@`%36HL_UZA
zdwX~q_YzxTDW8ek0z@}W=Dz)j4J{XMz1R0#eAevI0+(mZLf;fCFsr)9=(nuzm5b0i
zXqdE!TfE)#eKepY2^--=3@4*p`EHxBH`IZq(<vV)SH>%<-spT#*f0N?lz;gh(gfl3
zs&87Z-vHqJiat}%qCea4jFuTYM0KEt;aT2$`D}4a$U5#k5Y?32@oIxriYumW@ggyo
zIugCo-ITUOOOpY9D5WFe5g49faM<r<i-C`4XK#p%ban?TNb}r`K&@@hw!yBN!v#Rj
zXM2bEVfdH9!Y9-H-5UG*OaCr*k^H0kGT50Q)VdhxZ?Z`E#~Htzkgrb|`Tr|(R!)Ol
z`QqhyWjA?D5gy=}56))C$FuEnzYLs;UKuomq7v4=hYC@C!J(o|ZI7hOfeM8ZG50Oo
zw5v)pv9BX@77QMUJ#p4>(dz{2z;@%5lbnWeg+Xr6M*2DSp-oa(5ZCu+`-IF<z1u6q
zjU0Txp{1*_T;vUDD(3;P;<%jP5Jy!5UZ#R8y{lVydLHcI9T)M))1Dct)n9PV7326G
zGYuJchnBz7Ic_?0OS&maHP9>-I$a0<V!Ut40i_SpTK`;n>vgCZI-a(Msogo+^vxTV
zt-2juwV;Fu8nG;~U4OM4o)fI}f7rhd>7@U39v>>T?yY<VH#Gn~;-srDgSH`Lec7;(
z6ORfyCw4qnJ-PfFnM~R^Gq3SeeQ)KX@rz@us?Fl`1#$n|!*iUn;6Lo8LoI#V;u-~U
z#^1(z^_?xB)%Vj&pUMtLd|}_@^VVR*npeeU2CA(`;+HzX%J=Cv8^6H$rs9FR)(zz?
zyB;X=Er#cC$D{afH+S=-4bR)(;eWc@f3+<3RF}6h`n_X|DRi4RY<_mru}pK_6`$Cp
zgUE|hiXJa((ZQM{aB6{BSa&<Om6TiNQVy=zwUP|@i1Qbq^!HLbs$mWjmxK^I&bW1i
zx!??Ohjtv39-j`+qsv42cT)f8C@P;(XT<jBZ4#~T{6J{vkkczo-G;BQoin7ZupB~g
ziTiVYz|Dm7t-t&Wz5_%DOSglqx*Q@s{;uAZ=^l)e2c0#-mvQ}d=S(UNDZN3jy!@y0
zSNof2HNqny6HxV3ELU#r=1T6P{c;)HFO}DnNfMPH<(Eu`S!`3KEd+G4yw+9khOg9c
z9EkXs@!SCh$EsjDa8-CJ91zwndD2(<e&tS(b|gr~Xv=D_i<VxD3#Elk6sl5tD>)9P
zp!3%E+dE>iz;Sz68Ke0H;v#^*=3V0^>ss*(A79~N{;Sqn<_q_*b_;D55Ajdg2;8>#
z+4~ZTzrhe?iGLH2tel?sOTY5UxZZi)sI!HIy!%1$l8{O2dOv%hk2xaPEN}lIuDSDf
z8aGs&mS`s>$Yh1?V2>;3ir!qYyzF#3No-a+k7d2$GFFcY-_TIH{a{zgd>SPBT*+%F
z652FNR2WN9QJ|cMu83>J{K)yQL2^3nJKH35)?<QKz^bwb{U|k{vuTS{zVmh8WhC_j
zI*^?XLsm}x@HHMQxjL0}P~twv(-%{&%Brm6h^J^=h?v)z)~8pjbe>U7gPzsD?f5S^
zv~Fd3Af-V8wl>L^B(JbC{i!RKY_2{c;YVLY>P~<ynPc4b!*6KS=pTA2`jxl8fQj*`
zwx2S3mFq`%A#9^~St)TSF6m~KWu|3dWR%t}!`C2_Vo|azX8dfMOt8$=6-^)F`Ra@N
zldmv+l$Q<j$R)QxRfK9l@({faw+NriWEnay$HnGJaC3N`-GJPWtgX}$5Mr;&5{wdt
zHe)MZix2>B^U2JFWkI$De4@5D*|l_6N&yI;={A%y-5LNj(m9Vw<BM(csA6uWkxKH+
zE(92#yB=F_4a}n&K?a-nduHg4QtO04TA#_UZBY-i1_gDM9QSp(4Ggh<Izg3-FWhWr
zgT#)&FC&YQiU2gfqEWg&h8V;9qZmU}0)_@WecQ-ZeMCNW=o5G3OmkkLMVU}_n8gWl
zxq1U+4BP~%QA%9n7crrq@Nhj`*lA6+;?QMAat9tGp%&hMiC2nr$KCU@qsgx)k3N`e
zeFKJZ&)c>zcK3LXZ<j9*$!PlZ<mqJVi`njWy!nvw^6tI(@)0#6`-|`E_uZTCIPA08
zKKClzMrl!_N+#Vs277-!c^DI9E)Bd>BtV3NWV66)h><?2HPkGOkhvf&M_jUn=7MTu
zEGG@eTW6C`zPT}Z1cx)Ke114PpdsSNfB7FTkDN?doZr_nB}mlY=4&}Y#ob(szb|<(
z%tar<rJE|PGodops{Srl@1{JTtu_sqPrli>{Cu>nyY%U--*gMK&`Il3G@`5(qN~Un
zmgTfU{>4bq{kHONxHCpG)Lod72<M^9tNyxy!t4<E3i}+srVp-DVRf#)tGIBy=zXj8
zDmI=B8l(v8ogq+*gIXESt*Qy8*FhBOCL}-GKUzqY?o=AGWZfbqAraYNepQ4Et5RO4
z*;R_=B|WO^JqCRWrm#6(h(%`0;Bh7wkjtF~(-UFC+|JH-B2;j)7y1Bmh|_3=u=7JA
z__2RDkiv@&GsIXtDOluL=rnm&GBSl?Spsj#tfQYA{RAgJxMcN5N?q&%;}Qq|`=fr`
z;qZ4~`LD{s!l7|K{<1UUzES0y3xI}iAlAm`w2R0D;X9J!SzI;EEVG0^HxVp4HwQF)
za}<ZpPD+xypybyj&@9!9B;tlS0gm%ms9-#L5jZxZh?sWw%2#~$>@jT<>fM)!jmQF*
z6O583ae0x8g{E?lf|6(^(QR9POnFdpKQn~8I$9gy(&0tO93K~mayr9SR3bJwaG_gV
zaFH?<>XZ}{wscM<oeLx)T`1<`5Z@ijwIqkcBV$K90FWXCV6?amU!BXYAQ7)RmP4Ba
z!B`aOhK`eK?_UG$xbRyZa{7z21-LYBVb&i@+{v4V#J8DNB6za((d0MvzGW1L!}Fc$
z%<`6b&?Hvs7IYG$y^hhxmlAYHgH{pdIIHHuJE4t6Xqtx7GPDqNWD=RS^l+0S$|KeI
z?1Ch+(y`8Jxmg7&l9KeobL2FnYo6P$3M;Q!Lxzz^6X*`8wsKTDsutC0jayo%s!78y
zv<-5dA)tB4JT0@C0xCvv&t_9cu*OVx(r74dMx&}3MtzDu!oJ#^xi<lZIr_{3xy?5g
z8r7l!;NS9)u5i0@tVrK_!E-YUc1l~~x7|WlstK4enQ1A<4`J59Hx=HNv@bDTLoA%7
z%zW(??JKxy_=tqjxC0!d5bLOyt9(r!5EN{k<C6^OU?W;6g3m5wR6lnF3u+#v6AGp<
zKud!L-sE+;Gmotvoq`bV;RXI;iYwQ%%ntTW&!+Q>4Vh(%IF>z^nKon@mMJPaT0o{0
zVVPBvkHjkWfpLa8aTioA!`jW42o#j*z@=|tNSy&;gOf@(reE@+98$t94HK?gQJZ{k
z5>y{$>&YCW_MHrh<sA%T0V;cTi31Af%7B)Ys&x+<hD^jn^@5#yMM?1UTl4RWKTgO`
zX_4x#l48m)&g_k?ZQmseQXnZa8X6!MpEFB_@o_fFvf+Nmqy3%J*)BS(XG46P&z7%1
z>mAZ)5jUv3)UMVDO4)d@o$y22Ty-KYjMxpWw4vGehsWGmy*RDF5jQDEw4ax0vX%9N
z>W>76MBL(*@Z0#CR?}Zz;*jN^;OXK(DqM7o&V2^-Z3L<Nk&1TGDPznx!X2@#rFaDv
zUE2o=2nL$A02vnCyc-l1zjcK)$)s2g0WXzQ6sOWIQAJ{A!g)p5E1<M5mE;u|wX)K?
zlaIUn)Z4zoV)K*Q`ymaWW%0|!s&)rJg(VP96OPDQeRU?y2S==NGA$A05KfsgHxf<x
zi}b4H=a<Mz_=f7uq*MyOLlIS>99Sv@<prXvo(TfdWfS&Vn+%RB3;|ncre|6q<Q%`)
zU(DiKEujW2Tvyj!>7FN7EX$s4+=2<s<Ct$h#I?40FtZ>+%%IieHo3LqlV}(d$ckDy
z83)t9iN-0aCbYO!RB!l39adTOpHZTqDR#~WR$2~!)8*3cC?w)=$lE*zO_wt$9>Xa3
z=|}0xAApGUVm<DT;QbevJ^?g8!W`+X%AU?zSx5I$#ueH0SA@u7B>eBP<%MlwFqAWo
z3xQ{t(36KHME*Q|L+#pCz$i!E(#3a(m)WV3BezoC(WXSpXAXiR-+*d@my0UR^rT4C
z(*vL|AjBNVv$Vu{0TS{AyZGuWBa<)Zs4s*@0arYHRWlMVzZQ^DR&C}>jZPL)FNZ)u
zq(+o|YbB66W=h=FORkA7x8Upapr~aYmt92iB-824*)k_&kTww?2^IoPpI=msB0sGp
zVw--&c+%5wpo8HXvCZO|>bVrq;z(Q06I6+x?r5g;r*8=ME|fkFlRI|dM)wT`)u_->
zPtA5re*G6>jN)>Nn5*z3dA=OJxpnYAtwR$9@^f**2(mi>L`HT%Veo?%Nx_zdiY*hS
zAf<UDa6E#N$*fqS`b1%IS%kfo%Re(1lzZ6%);xq($weKAinBR4NG@gI*xQy{aOa3>
z=`CF3z&_fGUau43@G9s~b6Y-5GQ&R=%aiOii+9x_li>wqOD?WhTa;ib5@@Y0KpD03
zII$VZTm(v8QiEs^I=w>Kw_<M9PK2>GW^Xpjden%rnZrx1+0yN+Z;jAR;}iWoRG1D=
z>o+k4D}Xy(c12)SP^E$K0wNc0eC7uCIn>?H{nrviT9Sag6V+sJn=_|M-5vf(3mgmL
z@1QsF-IG4N7=}Y=^1P*l3SK)SOKW#Q4^m{)>GBN;ZBl-3O!nVkAH3p^W-MpZkU37d
z1sTkK>`xbG7$5qZ`ZLg$5wrXNJqqS2me19>WOBim0cqo7Fr=B)54mk!7sGnPQ;WuU
zDBMOzn7*F=dFo;xEf$}S7aFL(I0iF<X_Q_J_Gf7k;dkYoROe9I$?1)duqO19Vm7h#
zYthb!D*{gT0wUKEM8Hw_k=Rg~DjtrUqu00Fr7n{AMGw@mRRs@Rr(Xbf_?WQFLj)on
zukf6u*ExvbTK0((<Zmmt&yS@^KJ(RAcPDYYf5qB2uQD7HSFQ82`;Wi8F?syxDgXK8
zk3yc$K7R%%7n48DDD<ehEwpUel{giSza2ZyPtK_w_$Qa*>k5QqAF^(u6dFW@dNHrZ
z&|<SPu1&hTy9>1wwZ<@IEL9#zqyp(EYSEFJWuf@Vz`_Jn@^`76Q6#4}8TNDV2Zhk2
z5rQs^lX<YnHnruN4iKTQ35zMre&pJS6dO1p4El9Caya9<5MJxF7#o+;KX@cn1C1R1
z4QJaZP>G5>3%(2}y41*uB&>etlW#s89PB*V8*C&uueba+CxbBblG!`<SGCFFua!#U
z+k2-T0qI4B#-X7}QnmGHRu55xmh>S{5lJICP40`_!cgFhrGOv+u3OS~6gA=0z!`vg
zES`bKWZNBLi@C;Q))UiMtnc?Ab;|_+jEf_JI8Fad|1KznErgU)Umnm%n3QU7@{Quu
zjR`orOt)aE;;NT417_u9^c!EgLsdzJ+-at3>hl~)+mza>xVgj7uhcV<v%UUt%jBR`
z6zl5b`gHP73xdB^s8Q;%?D-a?<YtU4?y5jh_*j@`Uyl?I*-3cvqUUZogVLiEtlOe7
zs-TxJzX#%VziN2k@55!(Af&1*{%Y&u6hO}}>!2wJ$hA=xq=h^H=(y;mS!iTCZV{^_
zSqHiV9z_B<tLNDCScRpiq%Nc#C&`Ae8CbDAxZzptAJlA8J<=yqBt<2+?&O9mx=Y^l
zkIPGXPu@fW37=5CBf38Sa~)<wGN0C!LUfuJ1crhmmKt|Pt$a>r7{WzeMUbI=P7DJ}
z9jY(ahY{%SP|lgJqcfrysGxN1i=R5+pJs!k1zu_WtA93zbqBHa^@6f78-~YS(hu{)
zA)egWawvafN4hy8unY>yuPgQx1Z+Qb_2d3ht6${^gT#+>g`<C=GiHlfDHFck<Y;3A
zMmWF@-nm}>L!QQ%Np3sN(@)>tkR2EXdkud|Q-Kc$QWHdah4gEE*w01m>m@DD{}Ljj
zEASsS)%}Qn45UK-NwNgoH!}0ZPJX9i4XKnnpY82@4VvSZyFK~E)44>^&KJvr!@Zr4
zFAkPF&li0C<nhi^H6i4ood+<k+Y_#T{LRj-TRZRl4j;$u-~8RL-^11Mi_Z}wJESI_
zz<=qWM0LmsJnP=_#l_hhV8Dmz%pd-v{*FJV2+2FVNmDn>%AM!)*)cPg&opa1`NbEX
zeetj@^49ddU)+xyFn6AFr_ybh;rHh^5!8oVVSrwJ#wF~3`0Dwio!__Tv?dBpb{>+&
zq~x31li$BMJpaX$BRWtW?L2~{m$xS;r~bJ7!}}j1_w~ykwoWF${KMqd_J_at&pV$;
z{KmeXD23;I^8WO<(_6n7>P<V}V2j2*PcRL23seBqb+z!=$;A@7CxSe`TVMD`l(t=D
zMTpD^(aG~e9OMWz<pwO<eMN1K5d!3gqCJ0BZ+4@n)KOhQRj6-MV0<>YQ>WiF*7KK2
z^^Bz>6InEx86Ij3f#w-d>omSV3fnPvdZC1`$vLmW1#}z}81U<txZns3aUmxe|9F}(
zEEaq#7`>doL6&hf)nvinII?j5!+jQdf>-(OQ0l|s(HjgJI-#ri{p9AIhqMpdWt`*L
z8$tAVK3k%d;6kTtXz!3U@I1nKwvT-Da>xrgZ%~}P8yIUliL0Ubd<>}!C=&APcf4sc
z^zkIC4+UchzY(Zdt*W8wLf>tf&*fN`db?K-Otx2y=N5;5#lc^RBOhHHU5!LStdEWk
z?;Pmt#sJ~|Ox7*T*}pi#xFcq8p;#_hHu>iZxnURZ2Du11$kum_paGvhy2+qdF0ITQ
zxT<o1(eyuY6jnNZU+dQS;xrJR&M>cb2~}bYUz|?gzB(EX9_g+zQ2EMTJT1KA+|<Hs
zEaQl<$|Q(Kmf{Xke%C9_@Uy*H!bc+O`_JG5&~(^k1v~aGAku{iBbsE8f3zis+2jyI
zqDR}A;C~`&a=R4`S!fEvoSmus?`XRs>>48p41SJ>M0U;$1P$?F>QpI(%sl%`Fktv?
z0TA)?;s!;vTA=S1&WN{U7i@vl_Gpm}k)UL-*Tpf*WmUPGO=DD{OILEeTbrmehy#Z{
zfktZg7cdc+)NP6j8Q*_%A4WZ=c=EIT$s3rq;3L+f55S|X+}quo|MNvKBT@i}d%c*`
zxk0aq*PkqO*?~H{dt2SRo+@|r=;8VOolj-GbC^;@w4PW@ECdm_e`rmVLv(Kv{$;1k
z`z=gZzs+gGzPkQ;Bp`3MYRv->j}GxC%@Ed`=j2e<HmjphNA!MeYtLOiyx?`|5EySn
z{rh!Z{&a&a*cHdJ{yM<*fpw<Z<q+<X`Wvh-)P`S9#PkcB>M`u%?1)z4cdmbCcRt*K
zFcIeOl@}Sy^e;x)-RrjaUP8H&2_y%}tx60;SpJ5T0cK|Nq*);L7?qo<X|KcwTE?(p
z)&{*MHu|-8@Y+X1^G9N<xbW8Xl(gFoywFPM1_lcd@fCkEOb>v`{#l$<%3xwWvyXpc
z@med<D%UViqUrVFITMeb^?gn#D^lDL)<lRA0lVBggML9jm9rU5led>vHyXjdez`CS
zT4e~;WS6@|Ur2SLjo_i88o5-!2RVp9R>tsR)Ms&a@+NMTT3<z*(Z~SJ5mJP-*?q8y
z_IaJu9tT*$6k%D4csY_I*_?;F0*r!LOHXWQDUd6tkom#_HEG1B3m}f^wx;VBrJ))M
zXGB)f#yyU|;eD<yg?!m9`ncTxTl49`)GL4}z$MyBYnnJmFW0Z9^O=sQJ&lVHl1bsz
zR;2afaQPD6{2ODI?dGCKPPRf9l-fq1x+=rkAX1bv;GW30Z+BpS(n}@Zm@V`X6%={L
zlz}UJ`K<-<3cftZ!o);Vi5uV_&PXq_XD~4oKe~RgM?7fg-k50$uh_cB*g6Du;iXsQ
z70so#4*AL^B#+T_2=wPGJtnO}by3jna<>q#eWqXuqG1pGm90fYx%^+FUwtFkH)<=w
zihgUf;Wp=B{alwl-@9%9mBFd^Vw5Ms4EYcd6{zDNf<T%w!?+FZ5K}v|^hr8Y>^`Bv
zJn{tdp2dzVnjSGU(R~CtSDCEe3-WD1AA_^Ic;O!TRR_9E0_0P!)j?^6!($qGym^hU
z|BE>|)YWN%F@DQG(PydNMDhiGQq5tLLkvg1$Fy>xazs5EPAb@9zWA?}SXB`-VGR=d
z@1OgrYd(UsJCML>$i>;4$Lcs6e_C1LUq5T;3FCR2RuNbbOF$^ezzg+rBV;xq&<Ioh
zR?C%IQ_mDYZC-F-fl*sJk>tY0WnY5(S1ookcCTEL@+tHepwkZ^P3U~w<}*UF#?sUv
z<GW@9Ce}YSw~{!+#DImsE*Jr<PgRf4W6AR$3hH?4$?VwtI+Js<bERofu^Eee;xLa3
zq@ga?5hGGjw`4n1&wr=C_z!{IgcpvQI0DA7G=a0RCdsO0&(4dd;+YD$<weNEx7(f?
zA&ud8j@2P)DV}tUnru@c1PF2pRpg&9Y#y?wHapftN|L?V8*Xo-3I6QGigiq+R?5%!
zGij`J4-+=yLSTC;f_fuaMD*WYi%2@bCJFPeET{^!dTg1Ir-hNm!GgmL(h2F1+-Pm;
zS$b|WK)+h+l`t+t9cQVmbvgZTGRM?eN*kvY!R!^;)a(i#Wz&`{QW+rM;YYDv@z?I7
zEFN=3oE<iogyEDx@GXyo3_poCKB|eT=HFUko6ipLzOgc~DM4}b`lWkPYId|oV1bJ-
zuz)D0k&iv6J3ln|I2OUv`$Q#dT4N7YEeX9rr)|0plq~oq-^d8LP`%n*Gk`C##c}K^
zC`Srp?2y@v?hV@%S5}Us!O_ppl1aajGVJOT==*e`%pJD)noLIpqVYotY-I?I9C|<u
zAO0_^u=uj7r6`=6O|DBzxX!!g`EsG5+lIn+?Q@ilc1Dfb-lubmL~_{3QaCW_mKqIz
z(>Xh|uoq}wS`);OKnZv?zjkAC?U87i*_={@^Y9QVEZS(eWB#)qdvb&dXT6kR&XA#p
zxbQ?(x87qkCBT|yOb&MMah5MZ{A*;hU^)w@tniZy6@DP6j>2Db{|>2HTzG>6kbiZp
zDz*Y(1)bP>2Sm;cay6D|%{;se$lOp!QHz;P9$cJb;uK&^{&YbtmuDB9@M^FEh>7GB
zGIusU8qG`2h)IIrCNjFv%4NxEQSyjTv7<#;sKc_h*2Mlj@GX5Fq(R}aL<kto!Ni^y
zhhGI!&{IuDBt@i#-J^J~WjvQjaZcb#YBeQorW;<BMJ*Qv#V7a~cQ5SBpplBYbnMUY
zGT&H}g*r05B9svhrLjh*=tFwfA5&5^-&5-WupR9gOfeFl&80c*t&J8wU~QYOEKYHj
z9V?XNayb54|D9Si;+$&(1wfyVq)Nd{c(ZPG#F2OgVkzSwp~mH}Ol7^?XsY8$S)i~s
z@+D2>j-X+$<5_?dxi!fTL>)S{H$|8|C{VSfT!>h(VRuVO{1;f2{F{g@K!A6e#ZK<!
z;>KjxTJrU;1<)nky>uDI(VOe5hrL<dSiAV{fp5Y~byogKZ@q}{2HA$9mksPbE}f3`
z>?NW<+q=a0#(~oCMao5oxgB!<gh|Ku-^Gm0;TN+)eypQ?3n8jkFDz168%{(xgA|Ji
zmr&rkpndZpdI0=GY@rZj-g{@F=zN%O1I+lgI4!XQ#ydjb>54iB|0O-ISLpoBSf%SJ
zKKrKO363_h8#|$msHkmA<E*_e`_7V4QX>a#o{}>4@C)LG95nxxNa{R?4k>o6NpkM;
z!aF_slPvUKZ8hsWCW{>=tK6|Spr2N`brG&AU3u$9{p`lwZ+qyKk?(c;7D9n_Or-9(
zk_5#|TU=MY$-F+ZZ(x=V(si&SccxtVDfZEB0OexlcU{m17w*6Qf>NDl#YzujwH@@@
zZvqgs`E5RfP=zmVe1{mag44L1-uY+B=<G4nX{S-sgKRXSg+N(Gc`?5H8@`@3e=ws>
zVEH)<>PLJhU`8ZE+9)tl@(>NzXK)+1q*(X>5(0*AXZ*O>x37q`N^>BwaLKPZ$+GrX
zL{9k(qs>=OW%z0X;kmBJx)HDIe7kq`5o@7;fcU-V4&}UKL9C<FWu1LUVOkhDpN&Gp
zM;}d|$@wJ(gNx8#%oH<1K`&APeff0Q;K?$P(KCUz)a+LgOKGTr6S8JQ-?Z1SUr#SC
zrYA=?Nvox!-~8t9KKT6ye~&jJGBIjN{6AdC0cKvVg*+|sJhCTdlP_u!zkL3V8vd-g
ze}C(Df4^bwPl19vI2T=BNnSJY?P9);r+p-inP#7GMR3*6wggBxJ6E`H6n}VITYx)y
zv%NU3viBw(64q=aMH1;nONIG4uEI$XP~3g9KHH@Q6<3Yl6ht<Zasf6?RT?3?^*OQ|
z-hcGTUc2*PzQn&UpWL5OVdO~Rc=c`c8SUZ1GTgs7vFRwQBrWAEeIa~7n&A4R@$*l*
za3wM2^v>iy$!554g{&4pKuJC>r%0Iy!gB)I<KU2kGUzp*FHzP_a>3r*;=e5?|EsOS
zI#z?ILT>VFWuz9SQube738#x9POFO|z4G+`x-)!qdgmWylZt@le3D}y3qjr)86|Q9
zK-Nq|E{bjb1TZmh_5C0}T%}uNgJLjd+DE6?8=(~kzcKlz`6)Md@1MVxodc2F1Qj(1
z8e%B_`2i{HYjChqC>BgJ9XXGJEhxXBsFF)`ox+LSHx68!vN?TSNK6A_oAJNbFR_@J
z4^am}Iw2UW6r8mu)CiV?r7lldfR1;1#>zuFHx@Zs7ug0N0<e4Fm}cOC{M+fHW#kr)
zyKHQG@MJ;7Diko#s5=V3lg#g;1i_y9^}!3Y_gs~7<TFe039+$b>#6LXW3c&-1r>Qn
z)FLhqU+AcCcmZ~e7^YbNx+O@#pY@-Wi;Wc;Y*oO9<B(hT;_RlD{G1^hI&454#l~lW
z2>^494%-74LW(t|cThJ&-qxWY3B7B3I{3u7>)396Kv0%UGcA_56LLr~Rp`tKCQw7m
zTmb+QOE5cH0+7P4RFOC(5NfWQQx)-WC#aKiY?fl+z*r<cr^6@r2Q@~~AP>gkgKmWB
zuPlJ)Sh5bn#=Ph!N+?8AcZYjTfgNatjQa<hQ|6LSONXL#{{Ar#dWONwmP0iio<-_H
zhoPg#s{*TU7tn6`*UnF%waNsR-18$2B}n4T>p!NhG4X8)7<#X^yJul9do)_@chvoj
z`cTvnW$MlM27*lTg=vqMtzC!-m2c3X`)Sz0DWzDWuaK==ts%@NG(J4U!;HJ+(s^oB
zBy0vS8a*V$)M!*{a7e7!8y@)IONYCB+3#?8rp9;J^c9ngj=abgF$ks)4_Mh1*zhr`
znMeR+CelyMY8;9G4w{h?Xo#rwm}v`d<<U7@^mM*ZawG%m6l+QX&m>hL-h(Yf-r&A!
zicv}A`cw2<G$@yhGX^7~2E8g5k5wq^LMLz8L(=Q%ORBndAzmScioF)Jn)DYWD&U^n
zi-9@0aJ_@R+=eE$E_YX8f+@@Kgh<)Y?Weesr4Z~;wZ*y^e0L_f2Gt%YtwLq0&?CbJ
zpGB;(YGli9nem*4Ru=~^Su8CzsKbFJgjbpDNv1u287?L;2Vnyio)WnuuEI|0mc&Zd
z_Y@~~6bk@g0<tve?zke0Nnw1*Sllt3Ou?#o<(f1QCPg78n?SNpDWJ}li}ba%6Ozfx
zBldYyPUgf7y?cW@(qFJ5c423eP9fawG$JJJoAk5D!%);j4VzR($q(@^Ps_zkd_fX|
z15&P*IZ(J;D<tOM&(DZ)!N8T5z!}Dhb1J|KqQaX{9{0oW0gNSih;y0__ab62+|Lm0
zUj8LRcX;k2&=TxE7CB&al}EcL?JUez>u=!9GJX>c3SVG($2hba178mJ;=AJFTMm(-
zd{q8LO>~I6e(v$I>8{<FG~ZKd3gcQ`hGnMHwt6|b`HP^=S?g>+XN=FGTk=Po`BPS{
z?N#2gzVkDhyNcSo<p)SgK2(Lv2AQL=*PkmVOP@Rg*8<oKpcoJ0R_LYUz@unEoZ38(
z?0_H-d(5X?{vbzW^pZU*y<~OAt|BGULw8j*F{cAn#z(sSsPpIU(KPu9XCVd#F<a1J
zNW->ZhIXeEZ!)~&I_fezm~%(F2>rS(;{uH9@IfL4ADX)RsjLb@^6Gccfj#*^U?IEN
zu*hVdB&l_)F(>o}6@!Qt4+>R8m7ixf*Wj*%95VELHW^m4bvsHwVIq+wq;aGKSm!cc
z*b|}9OjZDX%A=fX<j<j)BP*Ct{yF*Mqg}eRF(Wg7NT!)EdBo{H^$a@u!PB8fou$4?
zk&2BGpoA_@L0`-4R0)u*GFT_~mr-|lW;ryMVdD{cc*}Bx-)Qmfm&To`kpbXC)7Ry*
zmWhZ6Wi!?bo1cLf-#8p4C66k&4Rf#(mTAsgI2q~JxwbbGEJNHD3vQn>=VZ!4Zm`c9
zv*K$vSHXt@0y^ms%$59}m&e0G=yn${@oCtsV<BhUw-8KQ+;F5E1zO38pIzhoV=Td)
zURR0}cY>@If{9JV1ehBPR%CGy_dEz8^)Lz24mT_R7Knsslu8U>#X}5L$!ueQ02)>w
z3<-oXaM?o3Meeq0Lqp?Ixqt*#GplP-a*PH{?Pfn_RC(G)dj#Y{o~k0u&2mu)fUF|v
zwj!h!Xz?er?+$g*Dx{4FL!l3s!?`M26M=ZMu3St-Bp`ZRQQke=rnQrFadB3o{y~6B
z;tV#io=2N-T!PsV{#Cpm%>hx_V@RXYx;mqSmNz?!#qBA6s%RJ?P!8@TxvlU^Oe3dY
zD^{rEaE}LFtOB#p=Q@mbS%=Us$GU93oz#oP_oj22lGPYsF_x~$-z5lFKcUlWIhn}3
z^>3MO0*cFmZ@wSYPa_adr=7;q2s~E{4SN|*O~72nAfm0fVAy0q^iG|stRr$L&~jCi
zt(=@^&cd~%(<O+GH%e2MS>p~iQc}C<12|E}$9U}F6-mWQX^pJf$~kmccMsSbL3dcv
z7+j!ubqLBu8w&oaTL_B&MxvzIvXPi6gdOo#Miep>32KO|nM=S_qBoz&1SFl7fA8`E
z)UUvLKgX{iU(_yHE?~Hx$&7%K+EVx`f(!N<1t*J?q7sB%7r0#zJwb{*xIj&0|57%k
zzZ$SYL4bR#0BnH{Muxt|rL63M+1{UoqS}dC=h;KjL3=vc$}@w=uA>JF?Yy&YzC+Xf
zn;-*sd)k%jAfxT^v;*C&D+{ne^_oz0eY+CU@*>lV(_01lsd>~c6Qk28PZXU)SK4d4
z@>z=gR17%&*_TIq0h`anS_8}v$;w<#V~#|IjQj$-?gR^1Ve2SW$YTx<wH)GejmdD|
z(FiCyG!GHw@EG9Bo=9^t99j7-^y*4Pd<*wwY8(ys=sxo1m<kpAC;k&B)^IO`HLbhs
zz($t`&8S0zX-b*@<Kgk-@paaI#-q;1_klN`Tw^53gEps$-?m2H)N&9d!;L>h5x?@S
zO{%w5_(BawZ(@Fk)H>~eg09MgkhWq>@O-&&hGy@?Z|QU~BLpa7>5fIMd|yZw0AA`f
z#0e6WG`cQTc>wrvVKAazeL7m49QgKBvvVxJEIAB~5ZowrOw-Xo_-23BTMNHsHD&YI
zT80HiTEG%A-KvlQO|IbBmXT>IS^IHSI@Ao4S52$;X9dLrZs`$;TS6^#+6{BPD#?eW
z@QYxnIU*NJoJfeD2$;n$1>9AbO(*yE7<00Z?Y9M&I%AOZgOXV#9&FgVCe=-|y*om8
zV&|wxYN{Jj8r6d}hh4_pjP=@h-|c;BM{Pv~RGNrSbb56vZDhPruK;<NpRpjAkVZ$U
zRb(g=?4y-C>Q~N0m51<wcrZF`r?M121-V49&>uKy#{bx2*JtOCfUb6h>Obs1zrFD7
zA-Lp5HdVFgmB%sA#SUTM)(g_$5zbZ>n2lcHRHkRnN;!r3nL?sE)DB4c%1XoC7)}7k
zV8@OquQeX{28I{e;kXG!YQ^nBV;6}VTrzNR7}pM1fqHrbYMsobP%<3pTY^KBP=pwb
zREfG6{d{-w2rNjHz|u@NT6x<;!k6F<2NkIhddO%MH1j3thq_sTd{(t8$hpgz!RFch
z{uxqH-e@J~NiZDlDo<^)1z&x$Z35SGirM5>FA$&7-4T#N34vX3+61A1oh2E_wE`z8
z%xLaW6tj#B-WfA1UJT}+O3y;y)Le@f<VGn35uOzO5G;VXftD&qz@5S+z~0!r=*Xp(
z;qSxzlXH{ILYa37+DL<RO6u%@2x-{1^(b_-?C==>A!W6;5%|p~&KObEa5hJo)rx$+
zh^+gOAYW}Bjx)>#^B_B<o+-Y@MphH)%e!HFXwcyS{i~t~3WRJKFD5Mp?DUv{j8YK-
zz-5W3bl6%%f%w9;qxk(W%|pXT74KAz*v@mBY(TCON1|#(FboZ-N{M{aVT7Be|6ulB
zwklO%mDv9br^ChEpo5okQbDuO8)>T#&pVLl200-JzuEnKy1=ci5x`<DwF`Iva)wj|
z@ELtcb&A33#c;E!l5G*@&y0xCQg2Tl5;5Xf_^$;YhGr*A%Gy3qhfMnH*$wgA4@#0P
zcK}iqW~VONt?Se?9WUG|VPxO|IhNbhRZ1UDhL5?rK*%0RMnY&UwrLW*&L`4E1<FEL
z|B<pg;yNHqO7p_PhX*RxjQ{qda{e1bNNZ;0hF7aWA{Kq549Udbq`Pbo4a1Pmy5R0G
z<_i3FX(Te&8Xr_3{Ka;_VijIXrRBQR&~RO2OmZ~Db!I_E7+P)~x=^8PmeAJ<u=IoY
zP4pRi<BpcpE#7NXA>bKi<R$;t$)^{R*a}ro(V$e-Y`M0<?dA2=SfNN5|6+#4M{z~C
z6QM(ueyf&@V5?9a)u8Fso6W9i@N<-kvF#`$9OAfGQv4w)fn`>025q;F>o~Yr5$4(J
z<~KOzHGKD(E9#8z@`|dqi|ETmneXbA5CBMv76%n+L2P7p!&<UjQBp#2B6CG}YYr39
zh!*xN8ROMRkT*g0of)`m+U0R5x%p6pcvHcr&d__*7&BAieH_6)XIBBH@VmhVSt0gZ
zkkHoZsZzA1EJ?XSWpat&bn@6i4Qfrq*OhVtO~KLaxs34%|A<ROq}T-8O{Cm;VJHKG
z0KHyQd_-YNQ&mAP$;E3`xp2fRBa@8_2xIu(MkeW7{n@FzCF5J%T|&0Xw+ie!PzAQp
zyE#E3=prY`@K7C7HvZx-TjtQP`j8I(NhApAw_<rHGOAA;U6WjvQum67caPuWp^lO0
z9Ww({cCq21$*8B+&+K?KYE;4v&ms3}`(AmMCh1|<CP2;od1_YJS6``HyPZseshEe$
z{9XDj338%-720miC(#aI80C(ouTId~;OC@KoL-zci%RECJLGdboEY=cPiB#55oE>5
zoY1}>8N4e^5!$4<1I}+ttLjQjGmB_L)bB`WgjC@NYBwH5ial}?v5Cu6kv5jk++1^@
z7UD&#nENVd{fM9ug@+b@b|GaT1Z0_%DT?u)-kn_2ff8cGZkT&&pm#D#2cu1fvM1FR
zP~wU26(4B@I;%@xt14Al_-qexr)Wx7M!u@!t&b@$kJzQxpt~9`n=^u~jyl#bau=0^
zS<szKwKUE!ambNOYh{?o5}@mC%pFxN4|G;f&Is!U-0wMm(I^q24z&4_xmA!<iHo`$
zN<G*Q&waW`#Bz~|5*qoRyYA6(09X3W8Mmb&Ip;f7Bb)EczB{<=`}GV+v9dGz?ZVZu
zGwLX+`J=NP`z@xMb6c{nkI^tovIt>`;W*aqWPXr008kv@sutt$Rc-}FNBs@HvqVgk
zTKKw@I<rzamp|C~oq@UoL>XKZSB)CpvZYy3Ql5XN{O!&MrpUje-Bp~z28nG6jP@3}
zCfZ#+fnROGoR;U`it3A-G=eyM;q1cUN%IUWM<41<^h$*O;m2(wSgT7h<};;)cp)ln
z6Q^Gg6unHo*zkLOHWk)G#4O~NZi3c^N81-LA>*0mqR!v?k{DFvWK6bZb4ZBH2)NJb
zjME|tk5U3~mv4?w&$&@s#@y`Sgj?nLQ;v4jFt`QQ3nf}Iwm1Y=Q`t+@X5rpa{LycS
zIvu0*u|*UTG;jEd#UM*?AVnX{CnnEXY2Dc@_atV~d?5&W1M3w%Snw2r8UX>pOwFf=
zPti|NXmPq|t`!#Qf*ye)J9O50+H?4AzrdQV<(!lIY?Kya6STL~0zr$XB@y^Dr_X8i
z)(i3SzmQWJ7(J+UN1M*~2CdiL`v4n!_jm!>21;ZgZwI>OQY0hekve+nzOcMDVSn;|
zWUNgmPn4RhFg1cMW2^aFE`Fh+O5+;&bnr!FO<^n@9gncQ@EHk&?uHW>2~8JeqVACU
zLRY8dO^G=DXD7$r(dq3p>Az!R>&-etF>h$kiFA-~2o;h)^lwjeWjUjK?Q&=|oQx2`
z>eM$$K|rOxxwfKoX|1oxJdCik*eW1>AkO?n&F*&a$0T0c85zwSyt48ycNR!1D_rjG
z%wPraEBpAFJ5f#Ga)+R?(z-YAXeZ`f-&DoX)$J$}h5i~0y!KZ!g4Fe9L_n{$v#Pn;
z>yruAGFo7U?s-b&NQ5jNOL4JTMfh;LB%;EWb}{Rf7$rFgS={>l4*&Ukzu(wC93?>A
zGufV3VDe!LBE~ItU0W)~H?zwuL-Qz5XgpR=WHIlNSQWXGu!<<kRa1zALtWRU7T?@i
zC5^~}N7d1AE3H3^$(atB2tUh>bZ_vaJX|RPiEIfx!K5<g3Vk_0E<?<%S|2TOWm_nN
zN=lLE2|nn|H&h&5%E0pQ4bY0DBn!)~vdJ<|3lk?Sd2mX5(~3LY3GS6!hzv04dr}cK
zt}nzP9&+?^m(|S!DEoQjS@bd_JNQ%af1!$62k;wO<(fASwKp7jv)y6}uBvx}Or+_p
zxbD~hzHTdGt*hgv?>36-$Y}-z)9n(O-^ER>@M-3$NW6qOP#h}48{2F8sn=yCuQCt>
za!GO_zDesiTD;-v3|Ht%viP-3DuE0_>wtjEnf&j$w281dmIlhp2Z3S*U*>?N=&(~`
zEgPcd(m_rE*F3ev@gc2h?+N{YR}5IduIOSxDa1WkT3X&{*t8x4ak-{RL`^r)Vk-!&
zwud!B<|zNL<kmpntmO6w(XhdEA8uK@-xbNNzUQqU_I@nhJZExI01df{twK9xjyAD#
zQzu(LAkn|=-;}oEgRYA153_?GW9|52pg^U$s9l7^NBu_37jpyT!Mc+qq!wSxy%@I>
z^A%9BA3{UO|F2R24x)5h_|;z7N$t5{heLSn-RM$FltbMcGe~pd2sem3imXfjh-^op
zucH3~>@*T6x^*O!i(4su6k@jRmc6^OYSD<oMw_{eLPSRnomvinRiRL7T`IAl-8nre
z@e9h|zdh2%M<0sDpRpIBb_IOFw+PHR7pCuNhC@tNtFV#Tye5m3Ee9RcQA6KXz9)A-
zYxfHs^(!P~CnZ0es5K(v>3_sEa894`bM(6^|LX8Mhq#=J5iVLCI0yw*&$)2wmMz5%
zT2gky32v@TxD364I3AR^DZ!N@J;Xqy;n=03T~%$Lei-b_{mSHa!hIFv@s^W?Q_N9R
zRGI$KoGyS8U!<#{zJ}A5`zueiX+$x?HRKpz$k&l~`<dDmUfRMB&XOP43B&VgS*pYc
zG7&M^Sugep8H(vR&Va%?;=uK^Tl!4@I}z39RS&$Sn*@99&e3a4_7)`tWoc&7ai-n6
z8h>{PSgeob$vu#+q}0{<*t?pa3qO+9LJi1{Wjd9Xk6_}tU8_6fiK=NtgN6{B)S8s-
z?gZ5FUVH*(!X>dQvW-f<0y^!eZ&opivMmS$^FKkOkVfRpNTcW@<x24gqUbzvts=Y_
z*tC{)dgpN%*oFb)m$7}$CFX`dR02dZ!Ptml=Gk{Ng8(>%2#N-1PMZBB{JleQpvy>W
zjW@)7G_5_c<ru&+-I|(}xSS3?Jqa1gU!qTn79<a~IHqqBFI-Yu8YA`-@nSJ(EF9&4
z*NpS@sU&*zuT-7Yy;vBagejxbi>P4aoq7>*BXQQqpV#>PfQ5K1?A**b@+S*=E9eJ#
z!34Gq>`aA<RxsJYsQ8j$IPe?c<4XIcBoEF}%@&H^HrYooFHygduz=LTR*Y(=a0Wx*
zWm>YHa<?$sobBzrpcO7x0Qn3p`gXY+g|_X$Uv4Ejc07^;2PcJ4SSP||gLI6cCRYE(
z$s~})Rc^;pvPHEQ;BpqhtkPRP#9kCP$KkJj))5)j*?SKHp3)m@T9Xs=D>b;0607@1
zp4YyE!-e$j*bHnHPRit<uLT6bPbDOqJTuoz+2_e8!lkHQG$5$G<cYwWa@C@EMh|Bn
z7!#H@DxNMAXv4VC047H*&xMV&r`s&p^*)-An(JOMbq-vMPL*mRFV4{#0Bjcl=y!P(
zIN@Au@F_{hm(QlncF>LvJb{9xmBY_@xtx6wTjhW*+eD!Uh^$}D<x}(2dLr57k8>>@
zn1K!4kFN6xp)H&h1Fc1&phRfrh^QN2L+vLonv3YTqg?Hm&2tO9<j|-&X^rCd_;r)S
zf@~(8!Gla^45_~fX>%fzkAzMoC=^<`3+ZA-GPTKJ?U_J$?bcDpnzU<2rt^<%o`|gF
zfrvx}z6!CW^oGku9(^xz)>4%HHS*#8YRhK8w@Rd+Zxf)V_T%TjStuj685CrF=-m!^
zH1YWDb=0~XS4P8l`WUOC{ut*Pg@$l}xm8@=f?Z-uU51r8Q{?AhR2sROSeICRsUW>v
zGfF6wfS7;(lKMOe0*fT^DZayD&81f17hO=Vt`NsahFY3n52|R4-|#-fO}qSE(w^k7
z>~#IUybbkHMm;ECr;SLd3ysU{AtsE-$>s=JC(Yrx2g&}4Y!|Gu@=$sDSs=_*d_pZf
zmu^><UX^P=YbTC0iSBo3rL^nAX9W-_sLdRjQEWW*9OSOfs6Gm7l>sIr7r$0<zDs<J
zrDS0Wl8thTPjy*|>hBh3*go0Kto?<q3fqIqIMRkRU_rW5BWMJSve#P|3+JV91NA2X
z>#7ahF+j;q=gb*<lnUXns`f$#M6O7PCzR^Iy}VBKhOq-juhWWC-vt!FwIHAa>&oc!
z#VKs2jhVSo8@EXIIDNop6t{F+V!ez!TB{-}az~a7mo|FwhjdftCiX8Rfk8yK{SOM8
zk*T32cTcYj)h)B6N`}J*sMxB3fu@=x3p|@<0PuiCE759Rt4iFnQ{9qkFN}M&vCBLd
z*MEd!+7`-rxAZPwk|;g7XeAGoj8GRpJa?cz{I$C96g5H{Er<xh7Hx>HGyhJDRxRBL
zDf}>p5I7O>uLFfe8`;q%um~oF#p~BZUM#xoOve4|6E*1>o{4vGYSm*SQvz#OJr=iz
z2gM<U9$d{kJwd>f=E}oELMn$x!&B{8p$SOIX8mxl8SNuoK^DF?!*HwzkGf9<%y(s#
zq(5uPT`o(hsy$pNNpL5yHnv4rA0)@d@3v)e8T>j9LD3F0HW@zlyHYY4wN^kUjp50q
zD~%^ZO3+IoF_t!tx}1`uYfPY90xg4O*92a(h`dXJQh{)?w`hfvj73B>s8ND2m^}Yl
z(XFC|IJknbEc7dxWw7;T(TCrP`<LEBfCP^R5law^H^2Pmu>``yr}vfWQ#3Pm;vj3I
zSR!(V`C8;Z7lNv${}o;jyUf%)_0%nTg&fK-Zs-fXsi}l;$R31u`w72!sNLCCoVP-O
zkkbIHQC6NVS0uX*MJs}-+gD6Q!-%4;2G`jhgiLb30vN`QMnEO_35c?|Qw?e8sj{IH
z2=kJxYBhjehv`eu?nV`zwwx{X3#W(9mgnx$g7`XQ;@H;gXm}_Or9?->Yj3lasvld6
z-PAUPx7?`|%~Yv1VjI##fVTKZ2j~b>S#I0uEezK^fPZ~5I{M-_7?D&6;U#sW11&*L
zN0|Xs+ZwcR0~TbU3aJHz;TaxdR>b#Q=T56rE_igOW!`}U9PYoVue><Jj+>ti|0o?>
zKE$|{qE!N^T(B^j>F}khGQ&L3RT+@DI!l-%0HMO*e>ptVDn%ys8F4dctXkyO*eUu6
z@XmNHyc23vE7#jt)QgpbJK^5(jJu4<v(P#mp?H3A_Uh&n@;Bu_Z%pI|HEj6t+8rHV
zxTPKnr}4gYiPUzJx#pls@VmpM&t*D8`TaSt79j5zA|WM#@`Y{S<@z=nz&!k(gHunQ
zhKwk)c;>1SLmCs+Antq0WAge@3%~NkMC0(5NQ&ZN=Ws;auPe;DJ3PAg5BmS*5MizS
zhgLmuqSOX0;XrBK-mYqFsT4QeoTHEipc*$wEaPY0bot1+xHu_eYb4;|{hya#fB5nC
zh<Gv;a&Po|w2pzzb_&7egqjm+WVxa1B|WfluRg>&pL(JdLZM@9>OFJCcxx%t-3+50
z@O^cd$(^4Rlo#c63+dllb$VCWU-i(tZA3%Ysv3KQa!l?F^y1ukq6roy*)1KQA#Ef(
ze$_X=Tyf5CdiII@x5J|>69P9Q>Q~4>*o0t9O-*|cb4bW<@uS?{4v<UesW?Ts_x0__
z4|N!?(3-W4f-i6+6&Z>+ZDEdVgd&GD<5yp8mipo5Gee9Bw#>6o9TAl*1yhhkE4xZc
z8d%Jg=Vk`IH8P!;yRkhtJn^+*ueo5yYt{6z5807*Yw7!SO}N%yx8y8_%x4!gmnDOi
z;rZ~$%-`{&d#;TAhrHZv8KuE;iD<mk-uzN22$_Aiz!RA6+85Znlr2gB3@af|C1Uld
zRPNJp>FAJ<o5<2OmJ}cR;fisKHR?<}5v7V7e8N@5Q!VpBh7aIt<GfvdDus5|&*TV4
zx2h~!L%K#*Fl@^4mKtahPGYz>->QUVn>ExKGgD@z`QYfICflA4U#OVaw~cYM$~M(B
z>AIb4b)mHFHu~i%Yi0F263M&EohE*Es(Q6!H1+AO=j<HQ_>yQv5g7&v=V!LQnpI)$
zPHx=i$WNrXlb3aQ5=s^o9j^V;Wumv#aBchlfSvxIu!XNsz=W<t`NL{6Xd-tb1e>T=
zy+w|UsBHy#>gCmE&L5!jp|w>ZtW%k~>lW;LXjxsQ7$^0;@GH9pLF~x7nAlv+OV3N4
zN|+_CaiD?W@QEC5Xf&;6RRaXcV82m_(MPVXczop2+VqZ7+g%Q+7E+sLtjw}7AwjbI
zjhPI%SZbf7$rTRnY)9Ka??XDivINclY;MQKu#=U1C{9!YJiSnX4`K-OP-a3X!s7uW
zeWIvoiaP0DmkwM2FLGrh1p1}X@(}qL`3zVBD7bE`)4MY*k}v|&)6goR5TK#d;tnhV
zQo4J%6)<H=pLY6b$!E&4xd>XF@3QdL6@0GORc}^bgJTnFxEFlfH;1s|%mu$;E7&jy
zhc>34IF#&_b)_4wih6{7=M>}_-kX(BJ(hMBJj74Zpd!32102}m?~p}SJR0GkC>!Nb
z=GH-1A!_Tdc&|#QHje0Cv3wD~#U+IL?Qg+;z!<`>wjCqgU4jmSk$h-nQ~P2CHe^3a
z=0HTo4!}Mm@sDLtjf8%a-bTc#%~s1w6_16zJwDd?<Vm{kfRa4sxZJL*K?$m~3?o61
zIE>*dxu!2x1znip0yIOljL<uqzYhy3GhMtkX$ZZ}70!q}(9Sc!ZXouWN5!$E!cc`<
z&7iTn5|&b$vZjB7>pzdk1)_nIG$;iWIM8z%+hOOSuDIWpcDPGe8+f?|Fw=Ai19yi{
z=SQcqB^wxuL{14meSJDb$hLOUoszNRXI^e9A?ltgY%RAJ5c{l8oOOEKu>RFrqT*xU
z@@gIfh~u>l->to;4R)v+dXQ>!N(3OB5xov72#Ogu!#e}*w<jdg8Dx>w7vMzeUwwN+
zX0F+wx^~BWs9d1B;vnLot15}YK<HCW9Smu+GDl7BiJ3R0a>?OA3?_6?TpGf81S63d
z87}1_M)$kTs8h^W6MKt5gA$<}$Ve+)m2R=p4M$#S>!%=<N;7oZd0II;?}J}O(|v)6
zd3Ej1N-IBWcH$K;)z>Vg=+By4s($wOEAy|<{&{<7az9M5K<YRz4q1g^%dEDROAg3|
zU}SA$G+9pm=YRQsxs(Wy+9f`nd~tXp7mz$VG8#<wb|gT_r2z66?-D7*Y6+U$*?lD7
znFoja__3a^XQgoce3PcC0b75>QaTg}e1^+SkK8U4Lz&Opet-Lf{b=F$e3wyKxbFAR
zovYCwDQb?&6(I7+2`CZRF%7R$mSiloM3S^fCCixFX(_u|A+W@C`?h&bV9rsqyRz=F
zB7z_lWX1J_i`M;~%c?*PP}4b5NI|X^t5Knnl7i5*q9$Wg(ScZ___)h}9oUGQHiu8s
zP5Nf|6s3rW0DgFi%p^0_c`%eJF|S@5tS8rWS=c}Chl0z~Bg{lFr**D|%z6&dVZ|vp
z1VJ&Nvob>Dauo_3&CYn4tF`*li#c+Wo3+oR3^1qU*5%Kb%*7TZ&y&=<h4*6w3)iwi
znOLb|RhhnC=O=Mv04{)aBk48lS$)Gm-Rs>e)>6B7!jd0}T#FIbkdt=fI0B|EbOJe7
z;)#8aI-*>S!DeJ>h((Zk*Nsq$)|K?tdWD&Fu$i;@U93FKUw(X3j28f{n-nAi9MVwS
zZ9Q>DWR!l3>Qa+FAwWICVY~Aw9Reczc6=V4sHLman->c@bE^OyiveIeyuMTuN_t>I
zV*uKEU}=P@fEk#4pH@SW+3j<_Pt~XHx7+&q@h7-fDMDXk@T#Ix&$7d%3PsWH^#Y|`
z-z^S0CjM>8kRp<<dP{6wnT|CIj-k}Ih)?{>&9IG#63FQyAhlFjYlhK5c)|wk;Nltt
z;tDxLDn|udj@3wzkmHgo;gr)?<Nq4ASZgXw_VMY<Tm!p~G(DrVSY>IT%UIlEQ9wE!
zJ_}@ZdZz{mCYkn|d-zCO@xtYaBCS~l4ZVFwFer^r`L>ipYcPssH3QcYv^3?7I2I3O
z3bZ_hp=Jl^%6o*K_<ghv-~%D!`DJeaBblI4)&sTJ5E!1I?u(;VCvKW}Xq%DTt@QTD
zhLg~+6_(16j!-5<TJW4{_0^>urWaCE%9)=eh$St#d*r-c&}^eR{rVJF7CSsSzZrsM
zc~egR<;~yx=I?IeZhHUbt@my|ZC<^dK$D$^Us6K${`<GyyY-$r_Fjio*%Np@ko!7U
z6mtkJ6GWq7e-d@8QqVe!QvGqP9?}OEf4@q6c#=#QTgPCFit9-r5~p#aBcb8}$)0WF
zb}Uq{Vj;@wGOx}Tw=?yp+ELf<)MOxy7{zqO@=PwH^Ris-_z2i!eVhaFiS@~PAxiDX
zg;qGl<|$0_I&@UCSgNv51)rq3(%aO+O^v}pG0oMGQRgn~;C%I7H3@Fl2el@0u107^
zi6u-@G+ZofJ^orDWL59)suEsWo<^?;iHA9JxAnU}`?bK>uz^du`xQ2-PZ=sF@)<5y
zC@#a;k>y^}W~9>Mf)598sQqea+1=A1<z+f~dP%!hASFKlHAXP>YtQnghSf+su#WVj
zG97rRcuWCNP&my|&nDO28u6cA8?_k4ws5W{*era>9<Km>Eh8{i!LgHyA>PtUEP4f(
z02MXk;c;+BO^sO-J_|`)`_)$cvJ?Pl*svY$g(rpHRrRkW2fu#DF<%P0!Kfn;vf-;D
z58l>rXnipA3ZXfA4XB_+tj-sYRINhVxby@ifjdSfV%0my3yBU!S^Gjm5PkW|jp`<=
zkLRzOzpe|kB07B0718xZ{_?}&^M&Fz%w7E=(cPt2O!*Z_TS|DN?^6F2eug4%hi7Oe
z!>2ga1RfK2!5mQ3-lfI?pxSs2m#A{YQ_h#Ms&^HwIEwwZ7&n?DmE@O6X^QYP^Dcl>
z3C}svrdH!m?nyKH=8MPM+j1Jg@U=omGQdjR48XMzxV<h{s^(m|Mw=cu@8e?<CSd`e
z%!%64;|_I&LA@DRS;v<cPT23{FKBRt^X#@&96`5Df9wWmqo#7qJ2huVQRcWRvue(D
zV^_5pbdyvZ9xIJjir(5O>nPGbN_J&wx0L77*K~?>!QDvJLpqMGye$XInQFP=s&@r7
zHGG(jf_(Wp^#rv4mKU4SH2AD-2`6u&^{Ne`*|Qskt6x<mvF&m9IF`(^T3in{=EE+%
zS?no|(iWaW+pp5y3~xz(iPyP~jS`KSo)Nuf*ly=a%-$Q?<J!AyV`W*;xTgtDFJmK{
zadxKws?uPu6ul!;%-+-QbyxW{W7%DO+7+d6M~8D=p4}uf4m6Ud#)8YvUrY854YdHP
z8@xoDN!HB&x;zB!!g_sXbxzrnaK<5?u!<Wr0PLk17nXX`BLE-Tr;NO4vMhf-q$Qac
zvQY31Gg~Lihfq~;Dv-@gPSTw(Nqnv~thY-7UD|8*vR}2MPTjUI!s)W=)S8`|nUq#3
zoP=lBUad^`$xWrr0E<JpdPWk_a_6%Lt;$Cfpb7<-6o{?lv378GF%}A^^q)Su@4L0F
zYN-{Ad|b+6_uWgZ$DGzB41!myvtyM}A5anjA_0e~r|U?hBi)?E0s&^sq{A<eFbFfO
zVWsl>c4!_I53EUX1zg=GKXiszapnQl1IXZzP)4c?opQjBhbKibfcBxpat@&))Ma2u
zD*B}AK~(^FO!QW7)GB4GiAA_Ly<)S4Z#&c~HC?xn;Bbn%?ZPp`(znnJWhddep3`#~
z=(PKy0&7(Jl=qc02_&j$ZmZw;ta!Ak^JXK>cqK}BBZDaj*)1~g5QXWNEJ6L75;uf#
zqQj&%K8|?IB`XPa6_r$q9ww>Wa*7@!Hfq38X^y+^{{E)-F3l#)eJtE1cxk)}X|Z+}
zp=`Zgsc{HF6ggAOgN=tDQo<()Oe{v9Rw@~-hKa*D@B|T?p;w`#yfzJ8Zm69KK?PT+
zL-GmVRfpd3DCX!ZuI#41UTkGnT1!>b78X`<(ZYO<$O!4`;X+YZr=(}QtU}#sk~K4K
zJZ1om#?)am!G8Rn@j(?D3I-MPnt5yaG#)x=x(;2{UYG%H2GpqP>j&o2ekD*2->OBg
zLUYoClhr||V~FPH-)@HKBy<tp;?(eV7l>)Oa{3TI02V$k;!wI);|Q1P*@r<w9Sbu{
zEQ+obq_|H*{8y(9(};A|=uC4Bh1|Shc`ab9XJ}*vY_c=DAl<ZL*AA;tsA)T+TGfz)
z>|C!^)7!X{xUg}8;<ibu>G$)NvCw0>oGIKJwiP{n%{UMijdWoda#NzIu(|?OtFoeo
z79&@|6rTN&|6d%sDw}$zh%5s)<Zx-ma{e+-r^s9D45yj#(x7dho7B^)pKE!o^@AW;
z)$2@klIFC!D>{GrcKWsf85VFr<GxWLuW~>VZo0prcv=wJ*;_0TrjoefHZe)-r?T?i
zejcxV4A8P1&^vAT(BRXMw>~mHD6`kLeh#PR@Cz($r70`mV^^=)+$GdD!B4!U)CpZG
zvI@qM%(vZmONS^vaI(+V5|F2ZB1-?5ge$UA<d361ScuD<EOz+AY?{sV1FjEsBkry~
zxj5c-u|Ah@M=*1HIrY8hWfu7}1)C8`!M;bsmrjl}IoR93EJ0C6DP3l=rGC6BA7YfH
z?xZArkm<%p<%TQ*Z?fgyuZNuiCddZg@S@LHF%D<;KwRzVkarv^f*MjBdvl^Dgy*fo
zYs*FNmZi9Yc>!cev8etVW8g@Q%9U=gX6&VZ`}QI%l-4AN4d-w9+B6<KJPP6$kFOfv
zi1S1_POWvm`Q+sT;Wd@)ilYVR7W!7h2hVR!oZ}3H0T8~$w&Y1yCDzsbgGb?WbOD3k
z5c@_1jwhshnviR>+z~pZKX2p9|CXyoE0-}NJ0zrnw7|kSON=3{7U56liAJSR(?coA
z#3_^=M)V9vs=Y3^4Uf{tJ6x%ll55pTChcy}RZq5g^CisCRB(llw~KS7uTwmuIvGMJ
zvvbM&K8@MDp;Po&ebRr)+9)BnbhwAd*oo2+gQ)yWiiM?6a8VSDF;6a+a47eU-V1Of
zly6CRwO9of*wi{6=OBa4Mli?|&|@ft24=8BkQz8|Xc9g{^hH^#3B%gyg<_;4b%o@s
zn*x<C`d;51o`qSU;fi;o>q#=)C+P61SA$7lQ9!ELd6gpq*i^&#%Zmeg#96G$u8mUJ
z%cgO}ualNb5lY9ZQJPkUQ;6#J&6^t|RD@4kDUk4fyvRJ!ELN!_A0BfEXS;vE<;|bp
zVh^D6N51ACuJP#_0V*XkYI&=CHMgJDF_#S~TH7O0y^i|8U&O$6tr!A@BxwK(RaEA-
zI78kf6js(6ml=-+R;VKejvv?cq|3%4YSxV;_i?2^4ETh?%C}(MIawTV?{yt*E3!mO
z7OD}m=y=Q4V}kBHm#paJ7-*mJF;<};44@4dlkHZ;&Z6G=ve8elE4%$Z=h8F<Zz;4q
z&4ba^FjBt*#p|!org0uxg|L?mMOO|7)uJ0;@QiV-L+N-ote(Z9RLge{IYoHyn+@q6
zAa>kxzLHUjcdI3+zy~7nBulo%7hHI5xhM<z?(q5jQlcuhp-ekDu${6ChmyuJd@lb%
z=>5bfU|6xN?$3vLrxF)GQNu=JH2~7zPa?>qKzDvs*;?gas3cOFl)WP3j8%|e11r`4
z3)dhys~vE+c*a|BiSD#cCJxkWG;i;c;!IMkyU16Re?;KC6kaH9sujUtqg4p`O4>bL
zPgJUp6U8Mqc3P9Te5}}(>J6g}&?X%oM<uJbX^lg4=Kccq2?oeBC{arI!vtJnpFNk)
zRocuiGpED!RGs5`TLQg?>4d1RU5%s_i5aA139EWj&Dq-V*n-cl^=A6?*%<YU<D<F&
z;}XbFoW=@po@6m?l1R+h%E)V8IB4g~kAE44oA$D$x_FgVCQy!nUE5M-j{Vzi>a80p
z6yOIV1ko_H|8nBm0q_hv5|y=f5D5$b2uIxQitwJvaTkeuem#5)(IK~Q&=0rj$Ea77
zqfKBotGIkW8^^mCLKaxNLaHD^xY>kS`|*~vcf9zz`p9<|)Itlr(b}53RGY56YMUCm
zcW<7`galuYEhePlOimAX-3z1A@CY(gL`OiV+!A}bz)4s*ai@|gxhlFS{APM<a=qNn
zJim@P056lZSu`ctfa!k=3qlD-;!7m4#I5J}(sf%>a3ov~bTd#EQL3%g*siBJY{;!G
zVcgFhk_g+(TPt1=KY;(665j(hrP@CUgympn`-N!UYzfB4O5&o2lt6U_k)I~H0AtCN
z?qHct*a(EFe6u`|7u0+|Q$ECPRV@-d!<XeK(0Hs!`RY^sKnJ^NRd2?+#Bu#OicMHY
zr~&%E3@R4RXJpdp#p&UZ<fQaqI9Bg4VQ>0;MN&h3t?>o%KHl0?sXsiASVWULsNS4F
zl&S9-<XTypiOL)xUC}sOpHlTk+J;~*1^NQDenr9N`M|59p%(<pShf$l=dMMN2sC;h
zNNzb=x!tSiG{(5NL$W)$Hsm#_a8D0jHAnF>M{Mq|9~n<*w`^r9bRR)a#l@jqI5RY{
z`V+d4f;=03DN3ydV9B}>M1QV}f|y~0PUPn|rF_N@D>-v~xfV_bVTG)2*n_BMu_<2+
zVp^xE@5@S3p<U@ZGj2VQHlhyVN<4#SjCr!Rj)p*2!_pi_ubE3vCl7<%$l7(pJUiP8
zdAk+Cp$S?j`9TaJx~1zrqc_%>H5%BAMJ~OJf?IOC)hBCtK`af=5U&`0qe7=M`(Svu
zSVna>s4Yl=xa|S|<%I)67^<2}tltbv#WzZ(rIU~bKV(iekLymKJbUf8r9O^aPepEL
zRhwvIfyi1<Y8YMAc7x|L@x#m^oV4%)$4I?^3I4_iR&Lk)lW3*s-4-@2yR$H-OpLMX
zss)JcWUbuXyp)$s_ONzNg6ZT~A|9{EN2vi;prSgJu&N;5iSD?Nb`^yx9ztv(A__Vu
zkOA^NmdvP5hAWdQ%^h~nH>CXLFM_#UU8U$bybzL*HVlH>Eh&T-7i%lv2$l=17yd0O
zBQF2w4s@Gb9AX&ayG`GhoODGN=VEKFwoUlc#oj@f1TMtMh(sSFs-=bkj#g1h2RGFH
zNwxt0Zf2vxmye&*N9f4suMt`ge%OXPZFmVBwfY-@{f-k}+5*6JWt=qvGG=OmJlz1g
zR9+KNz>+0!HRUq7nUqsnClsf9&+`KKe4|?uQq@g+Q`l$|B=Qi5qMW>O_*Dz`X_9q8
zZn^$UXl?FEWWVmLrYqR953hpF#`tBvmJ+I}g_8?HCrC#nMY93S2XCS5EwXD1Wib#-
zke9CrU{_NLR*^s`042QqRDlKB36fEEQnf@Y7~!t7qYniY=a6RxY&TNaF=E0**@SD0
z<@wIb#V(;(-K;^14C3}(;!a;;`ylUYWsM_V!}G)QOjU2c+}ix@dmF!gf8)2m+4${m
zH-7uU#&7>_<F~)t`0ejEe#<=^otvWAvYDc=^6@t9%+7aTsx`S2o-02pJ#&7jeH4Cl
zm;-9DFG}iXwUd(znNqkL>t%G~$%0e)7xpn2BabZeZeV?O@(a1^obviB!P==g`F2gS
zzIIi)>STBVdf*G##Xpmm+y<VA$wt1%@Fnbdb4xb}Amlwca!|v`PFy~6SCk=pqUR6$
zaUUC_y)Isnb)PoxX#JPhHS6_WKN_CdH@Y^`W#9k2#$A_8(!!`+wjvU5rNh`|Z@=4S
zt;r|{5p+NrOO}o{w@G&^iNkiRJEO|V1rivHqm{lAHGM|P0I04qU@QJdGCIGBZ4XZ=
z!8(TPX?j=eyj+|vhsS@6+}X~886LNC+`O^0`v$GB@I;F6qq=DLPl&Z>Yds3Rad9p(
z-dP+a*q8{v$5nI7NOp1ddB?ngWJJeTy%&z|=7W>Z9yCWwlCAh=CDcM{!IG!kJsa(<
z_0Wb>(BoxWZVT|8n~%`A8@?;?BFV)aoT|ffVc@xLsd9o{QdY=0@p%!7DlXWF^=CY=
z>n(d^ms$38va;$>mAROipvn?o&7N)O0}<jZT`-2v&`tW}C3a%Vs&1zyV6Ydo$r)Gr
zWGM`o6U*ifP~1rx$F?H#sYw@|$!FFMwAfJOaPk8fyEjm?oj=4FEUKi~q|U-O_%#6+
zIz{$A(AiMz#XnX<KP#!^a9w-+<n;)dt1~)o*H{&%NxC2w70{O+5egV9$qAzr8qlx5
zi~~8U(hPDMSGe;%_sQuRQs2+3)2G=4riuKMqrveC<_U4673GR?64<1b2cRNv-?j*2
zb8ucQombDeg-$oee{~|o_+-=dJy8~}o4l$lDEjao*3=1F_I$dxyE~ojPA^_<P=g<Q
z@nk0+vye*MLj}tIaRFR)^8gLvIHi)y<CMyh^(Z4x@xk=R*(br+J<5dL;G9_41_+z3
z38V^2VOW4J)EIk-*6$OY;^hf~kgX7e)tICXi1$%{IG@_OO?FTA(JWotA{~OSza{_S
z#r$lWD`bgwZhMztM|kH|#p_(#Uw(A+#huKk0)-uK=yg0BM8RfZo3Sd@s&p%}ZINWJ
z0;{9h8)!8ZT{0jl7wg@0AUHpzRE@%TSyeSZVLV4gJDfu5yo}KaZy5p1J{O&&HfS0M
za>6xgdyVIXtLrd)cM!7srX~K0TfL}1Af@Dg^)gy*wC<}2_SFe5W%*|O1IDyv2P#xf
z!?aVp5mY=p7Ng6f<_YzjooxM<i*e_#aHj*?`C4%y&c&MOl%eVk&lH~zRsKYeG3~`Q
zJKN1V*g4g;m;I^(Dop#Td~>B2$il-Qcwt<Skyru&7V~f$`B>!BIB}2L85cmkIbL9w
z%c1A*5mZG=NnrVb!#}H;OpT_9>MWz&;-_Sn170{kiD7ln>mD^fYmDm!|69ymz~~(=
z;bL{y#?Cw*R{;NYMV7a2-g^J0wcby@*?CI4jPs+zKb_1^cD|$k%+A3)J%)4ec;_4!
z3v811#s@nu4*vu;-~&TyNG$T!EBGqd{^!N~)sFM(<~z5hx4wP<7A`w=58GU<`H8M`
z6xR;MyDIQ*a4q|PyT^UUa_jC*zUJY@|NOuIA72<{dt}@Gi~s*XOV#YZ(*uoDOuIpC
z%7$l3htZiIz?C~Ib#mv<@R+XZ^h$Pf$Kr_?9v|%uk3l@ir}~FSP(n@DK`$s4F^2;e
z;<x9gy&!U4&jx?n?|nCqpYrTlCy!?rgn;o!v5d&Ff={k}rC(Fwvg+Apl+B{l!cEK=
zl_8?G>c4A)iOUh3n5E{i!NmGeQyivW=$)Q<616h2Cm`Ja+O@=PW;gmtbkga~ZnJz^
zFn>4OeS?FEas?gzCl8)HRTHzQeRx*eqYh6lUU2RuB?Ic8aTEHIe^b+Gf2Gdz_AeqK
z6!ncZVpT8VHMQiBEm;#Gy6^D$@u~Km#K`eJ`mZb<iqlKZlepI{WGgQVTjyu>5A8u;
zX-4EMFt9Cpd*bhH#p(gq9oFo$Y8`9T(K9VAroP|40*i*HmgW907mN7@RSTg~5Fges
zF_tTS+t4C!Ho5g)>ynoqzh}keT=K@&6^1UMtQZ<y;;ohLUOs}evc@1{+=gzQl0#3Y
z^s`oFEA3X*Rhkc&`M3b`-%0%=vYOPzPMJ>FUE}BI$@47km>Qm8b?gv00mVr$qS;b(
z%y#dYXgQb4yLwp5mwst#>uP~H3XsKqGA1IN>)q`bJBs>9<j6w8j#kz4TVUY!4S0vb
z&Q@ea@w!>IXc%#^mt6!}oWwa=IGS6%Mo>C>^}YkcbB0LtlHFnrO75)cnMn?EI~*iU
z<zM?8ugGrE+ji;1<#>}VwMQY|122M#cgT!^GqbRw=B<MVU?^8+o41IpazzUfD0ElZ
zp4vbu)h{`AO{1^2L+LPBQE)nW5O)HHePL8<$|{y1Z-7m*1##zG5c*d^KC6UFuFX@;
znT%qws8(<y#Sq~IFaw{9#fHh-y;sedQQ$eWUokt54T6pQV!092>CO)Hv{G^3_!@+g
zt6co*j6l%1AOuR6ZrJ2Ykgjc41}(^hJG`WTpw51eE-m8;MK}UfEMm<F-<U@!T@oYl
zXs=A`#L5V2fDe-WvKki`2iR?@mjMY%`{wcrHq^aVijf{S?Vs3hHYqXVD$x8@wD1Zv
zlt6dKu9A56Tn?8N(r*t@(hpK4E4ZZDm*tauWY#xmrL5bgUxE*E{=mF7+Qu$oUdL*!
zS=>B?qn!7p2rIFK^X+#Gp2-9W-{gj0sGd<b&cfj0@%(aq97_rwf4=I2M^3mNN@#5&
zAFCR}$9bo<F!2RlFHU?FV@kQgJ+FMI8OU`otp<kynqB{9t<o{ma2Q6)0Q!T-PEi>Q
z%;H|_{)8^&)kTZCD}igjSwSP)o1G<$V-U3IGoaHAR(nTOPndSxdA-#4bW^#Tu&`}$
zLwksaApXjY0(xhS<-6lTpE4U?nD@yo{9HHm+8?(0`s0GXwIHPUKfy2?^!%$m>Du8M
z>=+*;vZi`7x<9%8y?&jP*nOckcI{_%*#GG8&JV<d4)3%d@Uqfk9N~RP>Mnvy3z4+K
zmpVTnd*G&A$}DD0<kJ=2nt#m$dFmt(Ys44l3%M9~i<Ek(Oi?(k1b_FpaiIFZTLKkp
zz!w4Ip-Fi!e-KNOGUeK1ElC!|bn>O6p-PUAT#3!^Rxx3@n-$A&4mq2Uy&2}}ywkgg
zG5C*tN9p}yKJwD+icr#g4X1T|{t7?@3Ag94jVz;EzThbYu=V}+j*xxE{c9Sf1o*l^
zIxj=%Gp{GF8fwERK`Aj6urDK-GC1dTuXS@hcLesgn-rDNo*+?K@iH3%KXD2`yous}
z281pd>2C?4>@K6TK(Q)8h{^|b4b_#%k?)%TJ5BTFz|EMjb`wKUJ)nVd>Iyr&1>2sp
zpR^~!R~(6zqLZTH%#>+r3(4G!@$0T@eu910c_kK*z!cTZOV+<kmAoWP5?SNMU^n`X
zn(m=j=kSVUtcKL)K?RZ#I#vS+tHixqDsI&xbsm-Xq{3e|<PO%I_8mvSEe)t>5sI)5
zt}N!YV?j4qbF8Q3eixbEwWk6o&6e$MfIwkEuC{z!d&RBFj5yVBKZ?J=2_@0W$Es~q
zMVbhaVhT$db?(iX`B-HShG~yQMeVF6{C!u0b(*OhxOkzXckJ*rehONqMF7bc1r1+l
z;7Hp6uB{zpC=*&Z4iw)i^US3Y5<b4WPvW5aTdPkuXRCt}$}ZC=WD|x8dsLSi;RVnJ
z$5;_6l(RW?tgAso6&UEAGTq1;2H96%+@F-F4$KJOFz<~5b(T#TMFcHdIu$sz-czl+
z22c8?mPH)KogcZHL*CfHw{)C{7n>yHosLZ1ZWaHGQR5w@A(n%$fu`G5E3mlxPVOPO
znY!R;0(o=h9!yKWvukf{Q<9#5F4I-b`7Vyh!6*ec(j@P3gKc<jlImtF>cKiv%DPD^
z*3b%*(V2)8gst}-`iRH}9%p{Q9Qo-J6je-l^|-v@8IdBgGMMu7I!PR+qda>z1Kk6g
z#tYCpLcmQA7d+!y9`a@JEn@4*Zc%R3BR<@J35OxCYxn%@X!7gHqYr4OMZO#+2p89r
zL2<mtx67AwSLWZRTv#>Rjh;*o_qa;Cz2?EVh?`um@9Wpyd+#>rv)Mjnp|`Vcgc)~_
z;jX`)JoNDCGz61PZk;Y6UC+h{ywQfLdlo|vPFH#);>YBhe115i%xd!SU;f8SMACXr
z(F1_kMr}z&pyBw!8O^`p!LVj!kRwAXTZji;2BGgZX6VIX<OX~0Te?O{%IIy}qs^UA
zHmD!UgSMU_{v`HxPt2wb=Syv;rAuY~CY<xa6o*!eVL{%4{aoTan%(|_CO;6X`gW~r
zMM*Wi<TZ#srZL%b&KktUa{HKwG6iu3U<SHYjz2bD$Mvby2;l+rE1vB%&|HviO(~GU
zn2I}V%NNmR)vuy7a^}jb40lL-mV+%(!KCDMd7P7lcCP{SQs=<vBjU~>v-2R|T9U*O
ziDgATmi2||Bj=|3N1|THNZ+wH0+j=t6vTt=!$DPaok)PRw5tLkfpei+5ItldAm4wB
zY4*kA$qzQMe<a$7yN;mf5ApAh{?T<?{;OkD#k-=n`>&(1;1i@7ObmgUm)-ZFP7zBe
zAaLsy)_;>r29M6=-V3ivNsFIxtY_r%$>;50zc7V6Aq)(L$!c9tsNHC69juIBkyfa-
z70iw{HWaRcKBzUuz;5>OFUk+Gyp8*xH5k4+U~ZL&`Jv3E?mN{1kQJ3=ql;JfS9c^_
zn}0vwC9uwc1<sqCoIho+rEZias|pOs;uyKifExcRxlXlFF_WVTI7>ME*(=HNS&S0k
z3vY;YG#E(B0thJTsEQw(2i%?vRgbd((N@Z}s>`zA)V24oDf&+0@Z<@lVN%K1n=zOE
z)XK9etR!#1(Gy~FpmoUIkA6eqzi!jr20SWZDh@Y$yQPW6J(qTy>A2txKv$ICt$MUA
z9ZbCwM7bdKmPE=Ds2RLW(TFNBcoXWC)lkBZ#7kbmkb)T}s|l&|a!%#@HLYmH)kn+L
zINp(Wi<%%H?JNYXo!5W^yR8XafXXTMP)SMD5}?#9vB@AX0yM+k0Obe}3XqXt%}ef%
zcs=3_&hv2KkUAA9pzPU;!U=ptQtVMPlVfW}PY!+Ig!5AfdE=cO6N!jENxMj5CqfCo
zG9Qob(>PzNS@ur1_!b*(`LnM?lcg4-%pAyz!_%rhypSzEbv7=cexv0r8<ULhr0J31
zXd;Qb%GX@qFO>TMxlIoi->C<CAdJAQcI+fO>(8As(~f4^ke_z%=s;H-%_mqq@&H+*
zd7|aPO%CP<x;>C|EqTlVwpxvcY-zKJBfuq;QxR)^c!ATDs}a||^#^;WXVdw`hGi)7
zTGa_~f^s4weSsf}6VvEOp=00nWI-eXwhT(46QL4lF)D95>t@X&WVjcko2Y?B7HwgG
zgoiNZDVJ&I(7_5|)3Ry`A7S6YFP2xmtd)zzY=kx^HpGJn73@l<$sDUTo1ARTzb|e;
z5hn#tnm!9XtB0^ADCe@a@0RSjRX?kj@g3?e-p*3<*zw@ygv$xZT~J&W)lX}dY!_EK
zU+nCj5s^g1pHL@TR;)4?`A`kAa%Wkc)x1qs4zfh}{(>MDf<j`8%L4Z5KE;mO3GX{r
zc(UuH1RZ$~`Z1iXG8BzN>m2{wt6p)3hC*|?e#G3$)uxG7<@?A`91kNQi(<n;g{8c@
zrcg_pojQKIt`P=+4c>IJyFp3uyY(|*;~pr?Brh+Dl}dZe#B>z`)F~6Hht<J?2a3kk
zGQ{tiHD)<=)XHA+q{%AU%!6Sr?q_zjF3>L1Y?mR!Je4CU6VgA4esqiTf(*6C(0|d!
z(~XP?q~=7*p=3Mku7ov5V}lMyDrDA|8aW0;+2I|&wqF5iCy`YN+(l_@a4=j`kp>jD
zS@Q_2Q!}jZ!))b`EgBmtj9HDjnAt>S9};P(9y3KSOGCXE5YIk%ED(vMhe;Bt^V-7k
zThkN1iQ9%n1~T>)=^XAA`$6riJ*>(!;SdotG;BK5+0d*^JJ$76MTny=m1-vewtIQ?
zNhtb~ub@c@qv92dy^i=r@qyX~h=xG=UFT*{mcy7IF%b9^4#|u`B;FR|)PX9g<zi!2
zYVX$!Pq*NX?EkH>Nw&#Bh(QSeJ#bfHS5O3&j#|aS!}^Qum8&Zq+Cb%UT`M-emO?E=
zQgTSwgW*!<&so=`%Da;%feyVDTqSd<5{k5<YR*z06yHcqD%UVjSBFLE+XbakVJArS
zb;t%FK`Or8u;h};)OLlk2oA6nsc!uNN+?-a)#%bQGi-riUBlD3`&U2(O{ka<J+cS6
z?hJ-8iw&16iat4UdxR`!FMMm6j*oTtipNzq9sW4gMsx641FmIe&F$*5R;FD;UNZ?+
zBm_8cp&)610+haRe4gcV8r=jc?G#AN$$_AX^-+Bg(y*(Fs217bz2_%NxqK&rDx&2!
z5$c9tG^A9`Iw*?}D#SvH6@D2Ikk?bJ_tFc61!=WTli(H3g4ILyAenU;R!i9djwfRI
zNY&}YZiF>xRYl)-GlLq77i#<fc&tze)w9*cxSa-g;SyV@e{D>OmdMIZCpDu%voc)6
zChspy3<VT0Jv=#}7s^Yxg$5RzD%ZEDdu(aY%Y%d?GU={iYGh61yJAUQSX>C-h%AQh
ze)dXD5MHAaHqu?Ol&aFkgn5c|;$9l`4jEWIY8S-~_c4!Z5od?GlS<^Wd_zGB;Zg<5
zF)d%dSvqW9u_Mk_<uZ%o!`&NUxsVcsQ;tCL9__b99>t(F&Y26g{P8|cZ#&g&yskEy
zzM%siBK1+>rr5EmohUUEw?4~+SqX8O^Mt-1u43v?J{Qw3L@DWR!vXHe!|aK(znqjV
z#uOZ`silwltReCQlWP@30BU1zU;yj>|9e##OukyxIuGpmcEowWabsB+ne*k{NjZhL
zPtk?Ct%ZDc|M8bMCXXLI<v*YNQCjL}pFg90KH{GgtzNO~8!PE3!mhwee45mnI?j$n
z6|1Bg;hxI>4_>OW*cDhP{Lsq<1cUxk@FoQX)~qdX7pOo$IO*vipqe6jUW!CUDj(Ph
zmk$XCEC{j)_6nbe;hW4t(!~wktH#xd?;;AOgLK5>l|C0FS%CLW+Y!v+bncnug@^~a
zSZA%8rm70LqT=?`XuvG8JZa~NCS-pR!d#=9aI}MX{=)%J%zTig34)$L7J5h_sguE`
zfaVPd6xBpwri@BiDFauF%%8?PPyk=q0R#q1KP<XMXb~R{wJQ~9U)DP0Mv8HFHrX-=
z@{olvqpqCWzCkcuInf%DZMC-<+As~2ZaO^M0X0HpOCYM}*Oqh&0CP5H9Wjc&W|Rgk
zbsGw=>h-c}wwIYi*R{gyl02A*6tAd!!;VxAR6#A+Z8-xAGe}&$53f6my`*Mbmr@Sf
z5TmwcK?iPeJ+=DRI@<PRqq)9Oj0TT4xiLr>Rb-vryfbOQgqwp4EX~lAtr&oVV(=5y
zeCZGkjG2W`oMDf^Rbl$o*2SsJ_qVmMMOiWy+x!Yju?7RL$GX5BAZrrr1Of&z^T}}!
znD**Y%IRq1-C{m8Jg_+wt}&9XJRlZa0A+=wogkf6%jpcIDsW>$BKe1JeV{p1mgTD7
z`VJz@$(8M5U==J<#CtFoN#6XazN#SwllY8cn35~tlW%+rRUrc3Q8~%eQWyHKtTZ9(
z!~-t-*%%fzo+Y_WNL>m&^>Zus%t1Is)}#!&wJ$v7JB(TEAEeFjX1>(_D@)h^@=rQ?
zBfwf}%Qn@U!B`7Iv#Jhbxa)}D;H4tfO+T&o2J#yXi8c%tCEF|0u-u*l@F60?5+Kg<
z7{GQ}&!O*NB)A-6xX60eR1cjBV%5Qg^F<1LIG~Z94C}mSDBdjw$|hr)2x!2C&Cxfs
zMJZ`nPOQ{1+2odahy;M(SE8Admqcy<aIH|y-x|TM-Ra0Fe2663zM<O*B8&K(7=sm)
M;fEi0`d^0s51~pdo&W#<


From 87a31a934bcb401e3e8b7d175226bb2f613215e3 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 10 Nov 2023 15:37:49 +0100
Subject: [PATCH 076/148] fix: added missing migration

Thanks Github for reminding me! ;)
---
 .../0050_alter_proposal_other_applicants.py    | 18 ++++++++++++++++++
 1 file changed, 18 insertions(+)
 create mode 100644 proposals/migrations/0050_alter_proposal_other_applicants.py

diff --git a/proposals/migrations/0050_alter_proposal_other_applicants.py b/proposals/migrations/0050_alter_proposal_other_applicants.py
new file mode 100644
index 000000000..a8756a846
--- /dev/null
+++ b/proposals/migrations/0050_alter_proposal_other_applicants.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.23 on 2023-11-10 14:37
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0049_alter_proposal_supervisor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proposal',
+            name='other_applicants',
+            field=models.BooleanField(default=False, help_text='Werk je samen met een onderzoeker of organisatie buiten de UU en is je onderzoek niet strikt anoniem? Neem dan contact op met de <a href="mailto:privacy.gw@uu.nl">privacy officer</a>. Er moeten dan wellicht afspraken worden gemaakt over de verwerking van persoonsgegevens.', verbose_name='Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?'),
+        ),
+    ]

From 15410f69305ed186462c23382fa449e7dd7a1cf5 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 13 Nov 2023 10:12:23 +0100
Subject: [PATCH 077/148] Removed pdf_template_name property of proposal model

---
 proposals/models.py               | 4 ----
 proposals/views/proposal_views.py | 6 ------
 2 files changed, 10 deletions(-)

diff --git a/proposals/models.py b/proposals/models.py
index 249f7bc12..4c1cef382 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -701,10 +701,6 @@ def generate_pdf(self, force_overwrite=False):
             )
         return pdf
 
-    @property
-    def pdf_template_name(self):
-        return 'proposals/proposal_pdf.html'
-
     def use_canonical_pdf(self):
         """Returns False if this proposal should regenerate its PDF
         on request. Proposals that have already been decided on should
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 23af7d08b..ad4ccebbb 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -591,12 +591,6 @@ def get_object(self, *args, **kwargs):
             self.object = super().get_object(*args, **kwargs)
         return self.object
 
-    def get_template_names(self):
-        """Determine the correct PDf template for given proposal"""
-        proposal = self.get_object()
-        self.template_name = proposal.pdf_template_name
-        return [self.template_name]
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 

From 6cdfacb1849f0daae44ab9793897295a8188d78f Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 14 Nov 2023 15:35:59 +0100
Subject: [PATCH 078/148] Added is_commission_review field to Review model

---
 .../0013_is_commission_review_field.py        | 29 +++++++++++++++++++
 reviews/models.py                             |  4 +++
 reviews/tests.py                              |  3 ++
 reviews/utils/review_utils.py                 |  1 +
 4 files changed, 37 insertions(+)
 create mode 100644 reviews/migrations/0013_is_commission_review_field.py

diff --git a/reviews/migrations/0013_is_commission_review_field.py b/reviews/migrations/0013_is_commission_review_field.py
new file mode 100644
index 000000000..91cac5c7b
--- /dev/null
+++ b/reviews/migrations/0013_is_commission_review_field.py
@@ -0,0 +1,29 @@
+# Generated by Django 3.2.20 on 2023-11-14 09:46
+
+from django.db import migrations, models
+
+def update_is_commssion_review(apps, schema_editor):
+
+    Review = apps.get_model('reviews', 'Review')
+
+    for review in Review.objects.all():
+        #Hardcoded this to account for possible future changes to stages
+        SUPERVISOR_STAGE = 0
+        if review.stage == SUPERVISOR_STAGE:
+            review.is_commission_review = False
+            review.save()
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('reviews', '0012_auto_20211213_1503'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='review',
+            name='is_commission_review',
+            field=models.BooleanField(default=True),
+        ),
+        migrations.RunPython(update_is_commssion_review),
+    ]
diff --git a/reviews/models.py b/reviews/models.py
index c964e0b20..37e730bbd 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -63,6 +63,10 @@ class Review(models.Model):
     date_end = models.DateTimeField(blank=True, null=True)
     date_should_end = models.DateField(blank=True, null=True)
 
+    is_commission_review = models.BooleanField(
+        default=True
+    )
+
     proposal = models.ForeignKey(Proposal, on_delete=models.CASCADE)
 
     def update_go(self, last_decision=None):
diff --git a/reviews/tests.py b/reviews/tests.py
index 81fad6e90..069d99910 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -154,6 +154,7 @@ def test_start_supervisor_review(self):
         # If the Relation on a Proposal requires a supervisor, a Review for the supervisor should be started.
         review = start_review(self.proposal)
         self.assertEqual(review.stage, Review.SUPERVISOR)
+        self.assertEqual(review.is_commission_review, False)
         self.assertEqual(Decision.objects.filter(reviewer=self.supervisor).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
@@ -170,6 +171,7 @@ def test_start_review(self):
 
         review = start_review(self.proposal)
         self.assertEqual(review.stage, Review.ASSIGNMENT)
+        self.assertEqual(review.is_commission_review, True)
         self.assertEqual(Decision.objects.filter(reviewer=self.secretary).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
@@ -196,6 +198,7 @@ def test_decision_supervisor(self):
         decision.save()
         review.refresh_from_db()
         self.assertEqual(review.go, True)
+        self.assertEqual(review.is_commission_review, False)
 
         self.assertEqual(len(mail.outbox), 2)
         self.check_subject_lines(mail.outbox)
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 772ed176f..dae480cdd 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -42,6 +42,7 @@ def start_supervisor_phase(proposal):
     """
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
     review.stage = Review.SUPERVISOR
+    review.is_commission_review = False
     review.save()
 
     proposal.date_submitted_supervisor = timezone.now()

From 667860ee8efd8ee43c2d538b5e1bc53d670159f0 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 14 Nov 2023 15:39:55 +0100
Subject: [PATCH 079/148] Supervisor name in review detail sidebar

---
 reviews/templates/reviews/review_detail_sidebar.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html
index ae1f10c15..7f24fcfc7 100644
--- a/reviews/templates/reviews/review_detail_sidebar.html
+++ b/reviews/templates/reviews/review_detail_sidebar.html
@@ -47,7 +47,7 @@ <h3>
         </li>
         {% if review.proposal.supervisor %}
             <li>
-                {% trans "Supervisor" %}: {{ review.proposal.supervisor }}
+                {% trans "Supervisor" %}: {{ review.proposal.supervisor.get_full_name }}
             </li>
         {% endif %}
         <li>

From 53bfe72dc6bd8deeae1900ae876bafbfec864f07 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 14 Nov 2023 16:31:18 +0100
Subject: [PATCH 080/148] Added chamber info to PDF

---
 locale/en/LC_MESSAGES/django.mo               | Bin 148888 -> 147361 bytes
 locale/en/LC_MESSAGES/django.po               | 682 ++++++------------
 .../templates/proposals/proposal_pdf.html     |   1 +
 3 files changed, 239 insertions(+), 444 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 7f7aaf9ee8ba9bd0b2971da546689db7d244d140..6b35444f66f139c54d711693a57edd18b9963a2f 100644
GIT binary patch
delta 18837
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
E02Q(~R{#J2

delta 19571
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
G-hTlIg7=94

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 705dc97c8..a9fa9a318 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-07 10:34+0100\n"
+"POT-Creation-Date: 2023-11-14 16:23+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -40,7 +40,7 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 #: main/templates/main/index.html:209
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
-#: proposals/utils/pdf_diff_logic.py:859
+#: proposals/utils/pdf_diff_logic.py:869
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -111,6 +111,7 @@ msgstr "You can leave feedback on the FEtC-H portal here."
 #: proposals/templates/proposals/proposal_confirmation.html:36
 #: proposals/templates/proposals/proposal_diff.html:58
 #: proposals/templates/proposals/proposal_update_attachments.html:26
+#: proposals/templates/proposals/proposal_update_date_start.html:29
 #: reviews/templates/reviews/change_chamber_form.html:19
 #: reviews/templates/reviews/decision_form.html:90
 #: reviews/templates/reviews/review_assign_form.html:46
@@ -239,8 +240,7 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
-#: proposals/templates/proposals/proposal_pdf_empty.html:186
-#: proposals/utils/pdf_diff_logic.py:586
+#: proposals/utils/pdf_diff_logic.py:596
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
@@ -282,7 +282,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648
+#: proposals/forms.py:570 proposals/forms.py:643 proposals/forms.py:658
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -358,8 +358,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:66
+#: proposals/templates/proposals/proposal_pdf.html:120
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -397,7 +396,7 @@ msgstr "Phase"
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
-#: reviews/templates/reviews/vue_templates/review_list.html:151
+#: reviews/templates/reviews/vue_templates/review_list.html:157
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
@@ -405,7 +404,7 @@ msgstr "Date submitted"
 #: reviews/templates/reviews/committee_members_workload.html:27
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
-#: reviews/templates/reviews/vue_templates/review_list.html:161
+#: reviews/templates/reviews/vue_templates/review_list.html:167
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
@@ -417,7 +416,7 @@ msgstr "My decision"
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
 #: reviews/models.py:57
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
-#: reviews/templates/reviews/vue_templates/review_list.html:131
+#: reviews/templates/reviews/vue_templates/review_list.html:137
 msgid "Afhandeling"
 msgstr "Conclusion"
 
@@ -426,7 +425,7 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:135
+#: main/templates/auth/user_detail.html:75 reviews/models.py:139
 msgid ", met revisie"
 msgstr ", with revision"
 
@@ -468,7 +467,7 @@ msgstr "Website export text"
 #: proposals/templates/proposals/proposal_confirmation.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:88
-#: reviews/utils/review_actions.py:244
+#: reviews/utils/review_actions.py:245
 msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
@@ -537,27 +536,27 @@ msgid "Maak een amendement van een al goedgekeurde aanvraag"
 msgstr "Create an amendment to an already approved application"
 
 #: main/templates/base/menu.html:32 proposals/menus.py:56
-#: proposals/views/proposal_views.py:77
+#: proposals/views/proposal_views.py:78
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
 #: main/templates/base/menu.html:35 proposals/menus.py:60
-#: proposals/views/proposal_views.py:127
+#: proposals/views/proposal_views.py:128
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
 #: main/templates/base/menu.html:38 proposals/menus.py:64
-#: proposals/views/proposal_views.py:89
+#: proposals/views/proposal_views.py:90
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
 #: main/templates/base/menu.html:41 proposals/menus.py:68
-#: proposals/views/proposal_views.py:101
+#: proposals/views/proposal_views.py:102
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
 #: main/templates/base/menu.html:44 proposals/menus.py:72
-#: proposals/views/proposal_views.py:113
+#: proposals/views/proposal_views.py:114
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
@@ -566,7 +565,7 @@ msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
 #: main/templates/base/menu.html:52 proposals/menus.py:110
-#: proposals/views/proposal_views.py:154
+#: proposals/views/proposal_views.py:155
 msgid "Archief"
 msgstr "Archive"
 
@@ -1154,7 +1153,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:747 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:737 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1238,8 +1237,7 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
-#: proposals/templates/proposals/proposal_pdf_empty.html:229
-#: proposals/utils/pdf_diff_logic.py:642
+#: proposals/utils/pdf_diff_logic.py:652
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1265,6 +1263,7 @@ msgstr "Recording behaviour"
 #: proposals/templates/proposals/proposal_update_attachments.html:7
 #: proposals/templates/proposals/proposal_update_attachments.html:14
 #: proposals/templates/proposals/proposal_update_attachments.html:25
+#: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
 #: studies/templates/studies/study_update_attachments.html:14
 #: studies/templates/studies/study_update_attachments.html:25
@@ -1307,7 +1306,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:42 proposals/models.py:221
+#: proposals/forms.py:43 proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1316,19 +1315,19 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25
+#: proposals/forms.py:64 proposals/forms.py:280 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:133
+#: proposals/forms.py:134
 msgid "Selecteer..."
 msgstr "Select..."
 
-#: proposals/forms.py:140
+#: proposals/forms.py:141
 msgid "Docent"
 msgstr "Professor"
 
-#: proposals/forms.py:141
+#: proposals/forms.py:142
 msgid ""
 "Vul hier de docent van de cursus in waarbinnen je deze portal moet "
 "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De "
@@ -1339,23 +1338,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:192
+#: proposals/forms.py:193
 msgid "Je dient een promotor/begeleider op te geven."
 msgstr "You are required to specify a promotor/supervisor."
 
-#: proposals/forms.py:199
+#: proposals/forms.py:200
 msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
 msgstr "You cannot submit yourself as the promotor/supervisor."
 
-#: proposals/forms.py:213
+#: proposals/forms.py:214
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:218
+#: proposals/forms.py:219
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:228
+#: proposals/forms.py:229
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1363,7 +1362,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:238
+#: proposals/forms.py:239
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1376,23 +1375,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:265
+#: proposals/forms.py:266
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:285 proposals/models.py:538
+#: proposals/forms.py:286 proposals/models.py:538
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:287 proposals/models.py:540
+#: proposals/forms.py:288 proposals/models.py:540
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:327 proposals/forms.py:362
+#: proposals/forms.py:328 proposals/forms.py:363
 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
 msgstr "You can, if necessary, change the title of your application here."
 
-#: proposals/forms.py:329 proposals/forms.py:364
+#: proposals/forms.py:330 proposals/forms.py:365
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1402,11 +1401,11 @@ msgstr ""
 "application is approved, also to employees viewing the archive of this "
 "portal."
 
-#: proposals/forms.py:336
+#: proposals/forms.py:337
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:337
+#: proposals/forms.py:338
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1414,69 +1413,69 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:371
+#: proposals/forms.py:372
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:372
+#: proposals/forms.py:373
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681
+#: proposals/forms.py:428 proposals/forms.py:558 proposals/forms.py:691
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:435
+#: proposals/forms.py:436
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:493
+#: proposals/forms.py:494
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:501
+#: proposals/forms.py:502
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:503
+#: proposals/forms.py:504
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:505
+#: proposals/forms.py:506
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:507
+#: proposals/forms.py:508
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:509
+#: proposals/forms.py:510
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:511
+#: proposals/forms.py:512
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:513
+#: proposals/forms.py:514
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:515
+#: proposals/forms.py:516
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:517
+#: proposals/forms.py:518
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:519
+#: proposals/forms.py:520
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:563
+#: proposals/forms.py:564
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1484,15 +1483,19 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:640
+#: proposals/forms.py:588
+msgid "Nieuwe beoogde startdatum"
+msgstr "New intended start date"
+
+#: proposals/forms.py:650
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:644
+#: proposals/forms.py:654
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:656
+#: proposals/forms.py:666
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1500,7 +1503,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:687
+#: proposals/forms.py:697
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1788,8 +1791,8 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980
-#: reviews/models.py:184
+#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:990
+#: reviews/models.py:188
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -1923,19 +1926,19 @@ msgstr "Practice"
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:732
+#: proposals/models.py:722
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:733
+#: proposals/models.py:723
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:734
+#: proposals/models.py:724
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:738
+#: proposals/models.py:728
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1943,11 +1946,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:752
+#: proposals/models.py:742
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:758
+#: proposals/models.py:748
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1955,7 +1958,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:760
+#: proposals/models.py:750
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1976,7 +1979,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:776
+#: proposals/models.py:766
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1985,15 +1988,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:783
+#: proposals/models.py:773
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:788
+#: proposals/models.py:778
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:826
+#: proposals/models.py:816
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2222,7 +2225,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/utils/pdf_diff_logic.py:954
+#: proposals/utils/pdf_diff_logic.py:964
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2371,9 +2374,6 @@ msgstr ""
 #: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
-#: proposals/templates/proposals/proposal_pdf_empty.html:60
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:69
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59
 #: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40
 #: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
@@ -2516,7 +2516,6 @@ msgstr ""
 "the archive."
 
 #: proposals/templates/proposals/proposal_pdf.html:87
-#, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
 "ingediend door %(submitter)s)"
@@ -2524,196 +2523,29 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
 "submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:93
+#: proposals/templates/proposals/proposal_pdf.html:94
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:109
+#: proposals/templates/proposals/proposal_pdf.html:110
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:113
+#: proposals/templates/proposals/proposal_pdf.html:114
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:116
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:60
+#: proposals/templates/proposals/proposal_pdf.html:117
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:118
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:63
+#: proposals/templates/proposals/proposal_pdf.html:119
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
 
-#: proposals/templates/proposals/proposal_pdf_empty.html:42
-msgid ""
-"\n"
-"    FETC-GW - <em>naam aanvraag</em> (referentienummer <em>referentienummer</"
-"em>)\n"
-"    "
-msgstr ""
-"\n"
-"    FEtC-H - <em>application name</em> (reference number <em>reference "
-"number</em>)\n"
-"    "
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:56
-msgid ""
-"\n"
-"            Referentienummer <em>referentienummer</em>\n"
-"            "
-msgstr ""
-"\n"
-"            Reference number <em>reference number</em>\n"
-"            "
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:104
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:110
-#: proposals/templates/proposals/wmo_form.html:7
-#: proposals/templates/proposals/wmo_form.html:30
-#: proposals/utils/pdf_diff_logic.py:478
-msgid ""
-"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
-msgstr ""
-"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:120
-#: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-#: proposals/utils/pdf_diff_logic.py:503
-msgid "Aanmelding bij de METC"
-msgstr "Registration with the METC"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:134
-#: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/pdf_diff_logic.py:511
-#: proposals/utils/validate_proposal.py:87
-msgid "Eén of meerdere trajecten?"
-msgstr "One or more trajectories?"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:145
-#: proposals/utils/pdf_diff_logic.py:529
-#: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
-msgid "De deelnemers"
-msgstr "Participants"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:279
-#: proposals/utils/pdf_diff_logic.py:733
-#: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
-#: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
-#: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
-msgid "Het takenonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:286
-#: proposals/templates/proposals/proposal_start.html:62
-#: proposals/templates/proposals/proposal_start_practice.html:63
-#: proposals/templates/proposals/study_start.html:81
-msgid "Sessie"
-msgstr "Session"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:304
-#: proposals/templates/proposals/proposal_start.html:69
-#: proposals/templates/proposals/proposal_start_practice.html:70
-#: proposals/templates/proposals/study_start.html:88
-msgid "Taak"
-msgstr "Task"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:335
-#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
-#: tasks/templates/tasks/task_end.html:18
-msgid "Overzicht van het takenonderzoek"
-msgstr "Overview of task-based research"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:343
-#: proposals/utils/pdf_diff_logic.py:821
-#: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
-msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
-msgstr "Overview and self-assessment of the entire study"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:372
-msgid "Informed consent formulieren voor het onderzoek"
-msgstr "Informed consent forms for the study"
-
-#: proposals/templates/proposals/proposal_pdf_empty.html:389
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150
-#: proposals/templates/proposals/proposal_submit.html:181
-#: proposals/utils/pdf_diff_logic.py:962
-msgid "Aanmelding versturen"
-msgstr "Submit application"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:42
-#, python-format
-msgid ""
-"\n"
-"    FETC-GW - Aanvraag elders al goedgekeurde aanvraag <em>%(title)s</em> "
-"(referentienummer %(reference_number)s, ingediend door %(submitter)s)\n"
-"    "
-msgstr ""
-"\n"
-"    FEtC-H - Application for preapproved assessment <em>%(title)s</em> "
-"(reference number %(reference_number)s, submitted by %(submitter)s)\n"
-"    "
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:56
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:55
-#, python-format
-msgid ""
-"\n"
-"            Referentienummer %(reference_number)s\n"
-"            "
-msgstr ""
-"\n"
-"            Reference number %(reference_number)s\n"
-"            "
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91
-#: tasks/templates/tasks/task_list.html:21
-msgid "ja,nee"
-msgstr "yes,no"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99
-msgid "onbekend"
-msgstr "unknown"
-
-#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105
-#: proposals/utils/pdf_diff_logic.py:281
-msgid "Download"
-msgstr "Download"
-
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41
-#, python-format
-msgid ""
-"\n"
-"    FETC-GW - Aanvraag voor voortoetsing <em>%(title)s</em> "
-"(referentienummer %(reference_number)s, ingediend door %(submitter)s)\n"
-"    "
-msgstr ""
-"\n"
-"    FEtC-H - Application for preliminary assessment <em>%(title)s</em> "
-"(reference number %(reference_number)s, submitted by %(submitter)s)\n"
-"    "
-
-#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:130
-#: proposals/templates/proposals/proposal_submit.html:175
-msgid "Aanvraag voor voortoetsing versturen"
-msgstr "Submit application for preliminary assessment"
-
 #: proposals/templates/proposals/proposal_public_archive.html:8
 #: proposals/templates/proposals/proposal_public_archive.html:14
 msgid "Goedgekeurde aanvragen"
@@ -2828,6 +2660,12 @@ msgstr ""
 "<u>For example</u>: parents of children up to 15 years of age, teachers, or "
 "an experimental and control group that receive significantly different tasks."
 
+#: proposals/templates/proposals/proposal_start.html:62
+#: proposals/templates/proposals/proposal_start_practice.html:63
+#: proposals/templates/proposals/study_start.html:81
+msgid "Sessie"
+msgstr "Session"
+
 #: proposals/templates/proposals/proposal_start.html:63
 #: proposals/templates/proposals/proposal_start_practice.html:64
 #: proposals/templates/proposals/study_start.html:82
@@ -2835,6 +2673,12 @@ msgid "Alle taken/onderdelen die iemand op één dag uitvoert."
 msgstr ""
 "All tasks or procedures that a participant completes in a day combined. "
 
+#: proposals/templates/proposals/proposal_start.html:69
+#: proposals/templates/proposals/proposal_start_practice.html:70
+#: proposals/templates/proposals/study_start.html:88
+msgid "Taak"
+msgstr "Task"
+
 #: proposals/templates/proposals/proposal_start.html:70
 #: proposals/templates/proposals/proposal_start_practice.html:71
 #: proposals/templates/proposals/study_start.html:89
@@ -3103,6 +2947,10 @@ msgstr ""
 "The intended start date can be edited on <a href=\"%(first_page_url)s\">this "
 "page</a>."
 
+#: proposals/templates/proposals/proposal_submit.html:175
+msgid "Aanvraag voor voortoetsing versturen"
+msgstr "Submit application for preliminary assessment"
+
 #: proposals/templates/proposals/proposal_submit.html:177
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
@@ -3111,6 +2959,11 @@ msgstr "Back to review >>"
 msgid "Concept-aanmelding versturen"
 msgstr "Submit draft application"
 
+#: proposals/templates/proposals/proposal_submit.html:181
+#: proposals/utils/pdf_diff_logic.py:972
+msgid "Aanmelding versturen"
+msgstr "Submit application"
+
 #: proposals/templates/proposals/proposal_submitted.html:8
 #: proposals/templates/proposals/proposal_submitted.html:22
 msgid "Aanvraag voor voortoetsing verstuurd"
@@ -3160,6 +3013,26 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
+#: proposals/templates/proposals/proposal_update_date_start.html:14
+#: proposals/templates/proposals/proposal_update_date_start.html:28
+msgid "Startdatum aanpassen"
+msgstr "Edit start date"
+
+#: proposals/templates/proposals/proposal_update_date_start.html:17
+#, python-format
+msgid ""
+"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
+"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
+"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
+"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
+"met"
+msgstr ""
+"On this page, the start date of proposal %(title)s (reference number "
+"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
+"already been concluded, the new start date will not be displayed in the PDF. "
+"If you would like the PDF to be generated with the new start date, please "
+"reach out to "
+
 #: proposals/templates/proposals/study_consent.html:27
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
@@ -3233,6 +3106,13 @@ msgstr "Add additional forms"
 msgid "Extra formulieren"
 msgstr "Additional forms"
 
+#: proposals/templates/proposals/study_start.html:7
+#: proposals/templates/proposals/study_start.html:64
+#: proposals/utils/pdf_diff_logic.py:521
+#: proposals/utils/validate_proposal.py:87
+msgid "Eén of meerdere trajecten?"
+msgstr "One or more trajectories?"
+
 #: proposals/templates/proposals/study_start.html:13
 msgid ""
 "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters."
@@ -3323,7 +3203,7 @@ msgstr "Route:"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:187
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
-#: reviews/templates/reviews/vue_templates/review_list.html:184
+#: reviews/templates/reviews/vue_templates/review_list.html:190
 msgid "Indieners"
 msgstr "Applicants"
 
@@ -3344,10 +3224,16 @@ msgstr "Hide"
 #: proposals/templates/proposals/vue_templates/proposal_list.html:139
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
-#: reviews/templates/reviews/vue_templates/review_list.html:139
+#: reviews/templates/reviews/vue_templates/review_list.html:145
 msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
+#: proposals/templates/proposals/wmo_application.html:7
+#: proposals/templates/proposals/wmo_application.html:27
+#: proposals/utils/pdf_diff_logic.py:513
+msgid "Aanmelding bij de METC"
+msgstr "Registration with the METC"
+
 #: proposals/templates/proposals/wmo_application.html:33
 msgid ""
 "Zolang je aanvraag nog niet is beoordeeld door de METC, kan je niet verder "
@@ -3365,6 +3251,14 @@ msgstr "WMO check"
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
+#: proposals/templates/proposals/wmo_form.html:7
+#: proposals/templates/proposals/wmo_form.html:30
+#: proposals/utils/pdf_diff_logic.py:488
+msgid ""
+"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
+msgstr ""
+"Ethical assessment by a Medical Ethical Testing Committee (METC) required?"
+
 #: proposals/utils/pdf_diff_logic.py:93
 msgid ""
 "Dit onderdeel is nieuw in de revisie en bestond niet in de originele "
@@ -3380,14 +3274,23 @@ msgstr ""
 "This section was present in the original application, but was removed for "
 "the revision."
 
-#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:130
 msgid "Onbekend"
 msgstr "Unknown"
 
+#: proposals/utils/pdf_diff_logic.py:281
+msgid "Download"
+msgstr "Download"
+
 #: proposals/utils/pdf_diff_logic.py:284
 msgid "Niet aangeleverd"
 msgstr "Not provided"
 
+#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
+#: tasks/templates/tasks/task_end.html:18
+msgid "Overzicht van het takenonderzoek"
+msgstr "Overview of task-based research"
+
 #: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348
 #: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381
 msgid "Traject "
@@ -3405,7 +3308,29 @@ msgstr "Session "
 msgid ", taak "
 msgstr ", task "
 
-#: proposals/utils/pdf_diff_logic.py:930
+#: proposals/utils/pdf_diff_logic.py:539
+#: studies/templates/studies/study_form.html:7
+#: studies/templates/studies/study_form.html:82
+msgid "De deelnemers"
+msgstr "Participants"
+
+#: proposals/utils/pdf_diff_logic.py:743
+#: studies/templates/studies/session_start.html:7
+#: studies/templates/studies/session_start.html:17
+#: tasks/templates/tasks/task_form.html:7
+#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_start.html:7
+#: tasks/templates/tasks/task_start.html:28
+msgid "Het takenonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
+#: proposals/utils/pdf_diff_logic.py:831
+#: studies/templates/studies/study_end.html:7
+#: studies/templates/studies/study_end.html:28
+msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
+msgstr "Overview and self-assessment of the entire study"
+
+#: proposals/utils/pdf_diff_logic.py:940
 msgid "Extra formulieren "
 msgstr "Additional forms "
 
@@ -3495,40 +3420,40 @@ msgstr ""
 "You must confirm your understanding of the AVG before you can submit your "
 "application."
 
-#: proposals/views/proposal_views.py:44
+#: proposals/views/proposal_views.py:45
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:45
+#: proposals/views/proposal_views.py:46
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:64
+#: proposals/views/proposal_views.py:65
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:65
+#: proposals/views/proposal_views.py:66
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:78
+#: proposals/views/proposal_views.py:79
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:90
+#: proposals/views/proposal_views.py:91
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:102
+#: proposals/views/proposal_views.py:103
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:115
+#: proposals/views/proposal_views.py:116
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:128
+#: proposals/views/proposal_views.py:129
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
 "eindverantwoordelijke bij betrokken bent."
@@ -3536,15 +3461,15 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:247
+#: proposals/views/proposal_views.py:248
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:385
+#: proposals/views/proposal_views.py:398
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:486
+#: proposals/views/proposal_views.py:499
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3585,7 +3510,7 @@ msgstr "Stage"
 #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
-#: reviews/templates/reviews/vue_templates/review_list.html:177
+#: reviews/templates/reviews/vue_templates/review_list.html:183
 msgid "Route"
 msgstr "Route"
 
@@ -3593,11 +3518,11 @@ msgstr "Route"
 msgid "Start datum"
 msgstr "Start date review"
 
-#: reviews/forms.py:14 reviews/models.py:142
+#: reviews/forms.py:14 reviews/models.py:146
 msgid "korte (2-weken) route"
 msgstr "short (2-week) route"
 
-#: reviews/forms.py:15 reviews/models.py:141
+#: reviews/forms.py:15 reviews/models.py:145
 msgid "lange (4-weken) route"
 msgstr "long (4-week) route"
 
@@ -3697,24 +3622,24 @@ msgstr "Post hoc negative advice by FETC-H"
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:178
+#: reviews/models.py:51 reviews/models.py:182
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:143
+#: reviews/models.py:147
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:172
+#: reviews/models.py:176
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:173
+#: reviews/models.py:177
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:174
+#: reviews/models.py:178
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
 
@@ -4314,7 +4239,7 @@ msgid "Verplaats naar andere kamer"
 msgstr "Move study to different reviewing chamber"
 
 #: reviews/templates/reviews/vue_templates/review_list.html:95
-#: reviews/utils/review_actions.py:281
+#: reviews/utils/review_actions.py:282
 msgid "Verberg aanvraag uit het archief"
 msgstr "Remove this application from the archive"
 
@@ -4322,6 +4247,10 @@ msgstr "Remove this application from the archive"
 msgid "Plaats aanvraag in archief"
 msgstr "Add this application to the archive"
 
+#: reviews/templates/reviews/vue_templates/review_list.html:122
+msgid "Reviewronde beëindigd: "
+msgstr "Reviewing round ended: "
+
 #: reviews/templatetags/documents_list.py:145
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
@@ -4378,85 +4307,89 @@ msgstr "Information letter for the parents"
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
-#: reviews/utils/review_actions.py:129
+#: reviews/utils/review_actions.py:130
 msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
-#: reviews/utils/review_actions.py:155
+#: reviews/utils/review_actions.py:156
 msgid "Deze aanvraag afsluiten"
 msgstr "Conclude this application"
 
-#: reviews/utils/review_actions.py:185
+#: reviews/utils/review_actions.py:186
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
 msgstr "Discontinue assessment of this application"
 
-#: reviews/utils/review_actions.py:215
+#: reviews/utils/review_actions.py:216
 msgid "Verander aangestelde commissieleden"
 msgstr "Change appointment of committee members"
 
-#: reviews/utils/review_actions.py:245
+#: reviews/utils/review_actions.py:246
 msgid "Datum van bevestigingsbrief aanpassen"
 msgstr "Change date of confirmation letter"
 
-#: reviews/utils/review_actions.py:283
+#: reviews/utils/review_actions.py:284
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_utils.py:54
+#: reviews/utils/review_actions.py:304
+msgid "Startdatum wijzigen"
+msgstr "Edit start date"
+
+#: reviews/utils/review_utils.py:55
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:74
+#: reviews/utils/review_utils.py:75
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:124
+#: reviews/utils/review_utils.py:125
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:218
+#: reviews/utils/review_utils.py:219
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:232
+#: reviews/utils/review_utils.py:233
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:281
+#: reviews/utils/review_utils.py:282
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:296
+#: reviews/utils/review_utils.py:297
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:312
+#: reviews/utils/review_utils.py:313
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:338
+#: reviews/utils/review_utils.py:339
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:341
+#: reviews/utils/review_utils.py:342
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:344
+#: reviews/utils/review_utils.py:345
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:347
+#: reviews/utils/review_utils.py:348
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:350
+#: reviews/utils/review_utils.py:351
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4464,7 +4397,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:356
+#: reviews/utils/review_utils.py:357
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4474,7 +4407,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:360
+#: reviews/utils/review_utils.py:361
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4484,7 +4417,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:367
+#: reviews/utils/review_utils.py:368
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4495,14 +4428,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:384
+#: reviews/utils/review_utils.py:385
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:388
+#: reviews/utils/review_utils.py:389
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4510,7 +4443,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:390
+#: reviews/utils/review_utils.py:391
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4520,11 +4453,11 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:395
+#: reviews/utils/review_utils.py:396
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:416
+#: reviews/utils/review_utils.py:417
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""
@@ -5633,6 +5566,10 @@ msgstr "Net duration (in minutes)"
 msgid "Feedback?"
 msgstr "Feedback?"
 
+#: tasks/templates/tasks/task_list.html:21
+msgid "ja,nee"
+msgstr "yes,no"
+
 #: tasks/templates/tasks/task_list.html:27
 msgid "Taak bewerken"
 msgstr "Edit task"
@@ -5702,146 +5639,3 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:50
 msgid "Taak verwijderd"
 msgstr "Task deleted"
-
-#: proposals/forms.py:190
-msgid "Je dient een eindverantwoordelijke op te geven."
-msgstr "You are required to specify the researcher with final responsibility."
-
-#: proposals/forms.py:579
-msgid "Nieuwe beoogde startdatum"
-msgstr "New intended start date"
-
-#: proposals/models.py:517
-#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
-#: proposals/templates/proposals/vue_templates/proposal_list.html:166
-msgid "Eindverantwoordelijke onderzoeker"
-msgstr "Researcher with final responsibility"
-
-#: proposals/templates/proposals/proposal_update_date_start.html:14
-#: proposals/templates/proposals/proposal_update_date_start.html:28
-msgid "Startdatum aanpassen"
-msgstr "Edit start date"
-
-#: proposals/templates/proposals/proposal_update_date_start.html:17
-msgid ""
-"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
-"(referentienummer <em>%(ref_number)s</em>). <b>Let op!</b> Als de review al "
-"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de "
-"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op "
-"met"
-msgstr ""
-"On this page, the start date of proposal %(title)s (reference number "
-"<em>%(ref_number)s</em>) can be edited. <b>Note!</b> If the review has "
-"already been concluded, the new start date will not be displayed in the PDF. "
-"If you would like the PDF to be generated with the new start date, please "
-"reach out to "
-
-#: reviews/templates/reviews/vue_templates/review_list.html:122
-msgid "Reviewronde beëindigd: "
-msgstr "Reviewing round ended: "
-
-#: reviews/utils/review_actions.py:304
-msgid "Startdatum wijzigen"
-msgstr "Edit start date"
-
-#~ msgid ""
-#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat "
-#~ "niet bevat."
-#~ msgstr ""
-#~ "This revision involves intervention research, whereas the original "
-#~ "application does not."
-
-#~ msgid ""
-#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag "
-#~ "dat wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve intervention research, whereas the "
-#~ "original application does include this."
-
-#~ msgid ""
-#~ "De revisie en de originele aanvraag hebben beide een "
-#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt "
-#~ "doordat de revisie een andere versie van het formulier gebruikt."
-#~ msgstr ""
-#~ "This revision and the original application both involve intervention "
-#~ "research, but this aspect cannot be compared. The revision uses a newer "
-#~ "version of the form than the original."
-
-#~ msgid "ja,nee,"
-#~ msgstr "yes,no,"
-
-#~ msgid ""
-#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat "
-#~ "niet bevat."
-#~ msgstr ""
-#~ "This revision involves observation research, whereas the original "
-#~ "application does not."
-
-#~ msgid ""
-#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag "
-#~ "dat wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve intervention research, whereas the "
-#~ "original application involve this."
-
-#~ msgid ""
-#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, "
-#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een "
-#~ "andere versie van het formulier gebruikt."
-#~ msgstr ""
-#~ "This revision and the original application both involve observation "
-#~ "research, but this aspect cannot be compared. The revision uses a newer "
-#~ "version of the form than the original."
-
-#~ msgid ""
-#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet "
-#~ "bevat."
-#~ msgstr ""
-#~ "This revision involves tasks research, whereas the original application "
-#~ "does not."
-
-#~ msgid ""
-#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat "
-#~ "wel bevat."
-#~ msgstr ""
-#~ "This revision does not involve tasks research, whereas the original "
-#~ "application does involve this."
-
-#~ msgid "Dit traject is nieuw in de revisie."
-#~ msgstr "This trajectory was added in this revision."
-
-#~ msgid "Dit traject is weggehaald uit de revisie"
-#~ msgstr "This trajectory was removed in this revision."
-
-#, python-format
-#~ msgid ""
-#~ "Klik  <a href=\"%(login_url)s\">hier</a> om opnieuw in te loggen met je "
-#~ "Solis-ID."
-#~ msgstr ""
-#~ "Click <a href=\"%(login_url)s\">here</a> to log in again with your Solis-"
-#~ "ID."
-
-#~ msgid ""
-#~ "Aan het einde van de procedure kan je deze aanvraag ter\n"
-#~ "        verificatie naar je eindverantwoordelijke sturen. De\n"
-#~ "        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen "
-#~ "en\n"
-#~ "        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n"
-#~ "        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n"
-#~ "        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt "
-#~ "nog wel\n"
-#~ "        verder met de aanvraag, maar vergeet dit veld niet in te vullen "
-#~ "voor je de\n"
-#~ "        aanvraag indient."
-#~ msgstr ""
-#~ "At the end of the procedure, you can send this application to the "
-#~ "researcher with final responsibility for verification. The researcher "
-#~ "with final responsibility can then make adjustments and submit the study "
-#~ "to the FEtC-H. <strong>Note</strong>: if you cannot find your supervisor "
-#~ "using this field, they may have to log into this portal at least once "
-#~ "with their Solis-ID. You can continue filling in the application while "
-#~ "you wait for them to do this, but remember to come back and fill in this "
-#~ "field before submitting."
-
-#~ msgid "Werkverdeling overzicht van afgelopen jaar"
-#~ msgstr "Workload overview of past year"
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index ec5b1216f..d88eb9442 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -87,6 +87,7 @@
     {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name trimmed %}
       FETC-GW - <em>{{ title }}</em> (referentienummer {{ reference_number }}, ingediend door {{ submitter }})
     {% endblocktrans %}
+    - {% trans proposal.reviewing_committee.name %}
     {% if proposal.is_revision %}
       <br>
       <strong>

From c3c459e2336da0708181fd288e2ae4d7fa599272 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 15 Nov 2023 12:10:25 +0100
Subject: [PATCH 081/148] fixes #491

---
 locale/en/LC_MESSAGES/django.mo               | Bin 147361 -> 147299 bytes
 locale/en/LC_MESSAGES/django.po               | 112 +++++++++---------
 proposals/forms.py                            |  12 +-
 .../0050_alter_proposal_avg_understood.py     |  19 +++
 proposals/models.py                           |   7 +-
 proposals/utils/pdf_diff_logic.py             |   2 +-
 proposals/validators.py                       |   8 +-
 7 files changed, 99 insertions(+), 61 deletions(-)
 create mode 100644 proposals/migrations/0050_alter_proposal_avg_understood.py

diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo
index 6b35444f66f139c54d711693a57edd18b9963a2f..eba2b348e36c7f4aaa3e8f23c90f91674b9f1bff 100644
GIT binary patch
delta 11023
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
Y1bt^o=^`g;$%}<f;+EJVCuQXS0ghCfqyPW_

delta 11113
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
V#TloZx{G(6aw=~vaoQP@^gkx+yt)7Y

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index a9fa9a318..1b7501cec 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-14 16:23+0100\n"
+"POT-Creation-Date: 2023-11-15 12:06+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -282,7 +282,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:570 proposals/forms.py:643 proposals/forms.py:658
+#: proposals/forms.py:570 proposals/forms.py:653 proposals/forms.py:668
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -1153,7 +1153,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:737 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:738 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1379,11 +1379,11 @@ msgstr ""
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:286 proposals/models.py:538
+#: proposals/forms.py:286 proposals/models.py:539
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:288 proposals/models.py:540
+#: proposals/forms.py:288 proposals/models.py:541
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
@@ -1423,7 +1423,8 @@ msgid ""
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:428 proposals/forms.py:558 proposals/forms.py:691
+#: proposals/forms.py:428 proposals/forms.py:558 proposals/forms.py:587
+#: proposals/forms.py:701
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
@@ -1483,19 +1484,19 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:588
+#: proposals/forms.py:598
 msgid "Nieuwe beoogde startdatum"
 msgstr "New intended start date"
 
-#: proposals/forms.py:650
+#: proposals/forms.py:660
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:654
+#: proposals/forms.py:664
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:666
+#: proposals/forms.py:676
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1503,7 +1504,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:697
+#: proposals/forms.py:707
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1775,13 +1776,13 @@ msgstr "How many different trajectories are there?"
 
 #: proposals/models.py:403
 msgid ""
-"Ik heb kennis genomen van het bovenstaande en begrijp mijn "
-"verantwoordelijkheden ten opzichte van de AVG."
+"Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de "
+"privacy officer."
 msgstr ""
-"I have read the information above and have considered my responsibilities "
-"with regard to the AVG."
+"I discussed my application and documents for participants with the "
+"privacy officer."
 
-#: proposals/models.py:410
+#: proposals/models.py:411
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
 "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het "
@@ -1791,24 +1792,24 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:990
+#: proposals/models.py:423 proposals/utils/pdf_diff_logic.py:990
 #: reviews/models.py:188
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:434
+#: proposals/models.py:435
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:439 reviews/forms.py:110
+#: proposals/models.py:440 reviews/forms.py:110
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:444
+#: proposals/models.py:445
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:450
+#: proposals/models.py:451
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
 "kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden."
@@ -1817,23 +1818,23 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:464
+#: proposals/models.py:465
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:472
+#: proposals/models.py:473
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:479
+#: proposals/models.py:480
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:486
+#: proposals/models.py:487
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:493
+#: proposals/models.py:494
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
 "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met "
@@ -1847,7 +1848,7 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:510
+#: proposals/models.py:511
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
 "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
@@ -1856,13 +1857,13 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:517
+#: proposals/models.py:518
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
 msgid "Promotor/Begeleider"
 msgstr "Promotor/Supervisor"
 
-#: proposals/models.py:520
+#: proposals/models.py:521
 msgid ""
 "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
 "                    naar je promotor of begeleider gestuurd worden. Deze "
@@ -1892,53 +1893,53 @@ msgstr ""
 "you wait for them to do this, but remember to come back and fill in this "
 "field before submitting."
 
-#: proposals/models.py:547
+#: proposals/models.py:548
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:619
+#: proposals/models.py:620
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:620 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:625
+#: proposals/models.py:626
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:630
+#: proposals/models.py:631
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:632
+#: proposals/models.py:633
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:634
+#: proposals/models.py:635
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:722
+#: proposals/models.py:723
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:723
+#: proposals/models.py:724
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:724
+#: proposals/models.py:725
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:728
+#: proposals/models.py:729
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1946,11 +1947,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:742
+#: proposals/models.py:743
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:748
+#: proposals/models.py:749
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1958,7 +1959,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:750
+#: proposals/models.py:751
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1979,7 +1980,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:766
+#: proposals/models.py:767
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1988,15 +1989,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:773
+#: proposals/models.py:774
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:778
+#: proposals/models.py:779
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:816
+#: proposals/models.py:817
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2516,6 +2517,7 @@ msgstr ""
 "the archive."
 
 #: proposals/templates/proposals/proposal_pdf.html:87
+#, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
 "ingediend door %(submitter)s)"
@@ -3413,12 +3415,9 @@ msgstr "Overview of task-based research: session {} (trajectory {})"
 msgid "AVG en Data Management"
 msgstr "AVG and Data Management"
 
-#: proposals/validators.py:33
-msgid ""
-"Je dient kennis genomen te hebben van de AVG om jouw aanvraag in te dienen"
-msgstr ""
-"You must confirm your understanding of the AVG before you can submit your "
-"application."
+#: proposals/validators.py:35
+msgid "Je dient deze vraag in te vullen om jouw aanvraag in te dienen"
+msgstr "You must answer this question before you can submit your application"
 
 #: proposals/views/proposal_views.py:45
 msgid "Publiek archief"
@@ -5639,3 +5638,10 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:50
 msgid "Taak verwijderd"
 msgstr "Task deleted"
+
+#~ msgid ""
+#~ "Ik heb kennis genomen van het bovenstaande en begrijp mijn "
+#~ "verantwoordelijkheden ten opzichte van de AVG."
+#~ msgstr ""
+#~ "I have read the information above and have considered my responsibilities "
+#~ "with regard to the AVG."
diff --git a/proposals/forms.py b/proposals/forms.py
index bb860fb6f..78b872f5f 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -574,8 +574,18 @@ class ProposalDataManagementForm(SoftValidationMixin, forms.ModelForm):
     class Meta:
         model = Proposal
         fields = ['avg_understood', 'dmp_file']
+        widgets = {
+            'avg_understood': forms.RadioSelect(choices=YES_NO),
+        }
+    
+    def clean(self):
+        cleaned_data = super(ProposalDataManagementForm, self).clean()
 
-    _soft_validation_fields = ['avg_understood']
+        if cleaned_data['avg_understood'] is None:
+            self.add_error(
+                'avg_understood', 
+                _('Dit veld is verplicht om verder te gaan.')
+            )
 
 class ProposalUpdateDataManagementForm(forms.ModelForm):
     class Meta:
diff --git a/proposals/migrations/0050_alter_proposal_avg_understood.py b/proposals/migrations/0050_alter_proposal_avg_understood.py
new file mode 100644
index 000000000..e90b6e4bf
--- /dev/null
+++ b/proposals/migrations/0050_alter_proposal_avg_understood.py
@@ -0,0 +1,19 @@
+# Generated by Django 3.2.20 on 2023-11-15 10:56
+
+from django.db import migrations, models
+import proposals.validators
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0049_alter_proposal_supervisor'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proposal',
+            name='avg_understood',
+            field=models.BooleanField(blank=True, default=None, null=True, validators=[proposals.validators.AVGUnderstoodValidator], verbose_name='Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+        ),
+    ]
diff --git a/proposals/models.py b/proposals/models.py
index 4c1cef382..7e7a2329f 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -400,9 +400,10 @@ class Proposal(models.Model):
     )
 
     avg_understood = models.BooleanField(
-        _('Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'),
-        default=False,
-        null=False,
+        _('Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+        default=None,
+        null=True,
+        blank=True,
         validators=[AVGUnderstoodValidator],
     )
 
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index f4c5e651d..7a3024472 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -963,7 +963,7 @@ class DMPFileSection(PageBreakMixin, BaseSection):
 
     section_title = _("Data Management Plan")
 
-    row_fields = ["dmp_file"]
+    row_fields = ["dmp_file", "avg_understood"]
 
 
 class EmbargoSection(BaseSection):
diff --git a/proposals/validators.py b/proposals/validators.py
index c70cd8f65..d73291e6b 100644
--- a/proposals/validators.py
+++ b/proposals/validators.py
@@ -27,9 +27,11 @@ def __call__(self, value):
 
 
 def AVGUnderstoodValidator(value):
-
-    if value != True:
+# This does not seem to do anything, so I removed it from the model, however,
+# if I try to remove this validator entirely I get an error when making
+# migrations?
+    if value is None:
         raise forms.ValidationError(
-            _('Je dient kennis genomen te hebben van de AVG om jouw aanvraag in '
+            _('Je dient deze vraag in te vullen om jouw aanvraag in '
               'te dienen'), code='avg'
             )

From 7ef30eceb18ed6b0e619c9a84ec8604e0e29cbcc Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 16 Nov 2023 11:11:48 +0100
Subject: [PATCH 082/148] Implemented requested changes on PR #579

---
 proposals/forms.py                            |  8 +++----
 .../migrations/0034_auto_20211213_1503.py     |  8 +++++--
 .../0050_alter_proposal_avg_understood.py     | 19 ---------------
 .../migrations/0050_replace_avg_understood.py | 24 +++++++++++++++++++
 proposals/models.py                           |  4 +---
 .../templates/proposals/proposal_pdf.html     |  5 ++--
 proposals/utils/pdf_diff_logic.py             |  2 +-
 proposals/validators.py                       | 11 ---------
 .../0013_is_commission_review_field.py        |  1 +
 reviews/models.py                             |  3 ++-
 .../reviews/review_detail_sidebar.html        |  2 +-
 reviews/views.py                              |  2 +-
 12 files changed, 43 insertions(+), 46 deletions(-)
 delete mode 100644 proposals/migrations/0050_alter_proposal_avg_understood.py
 create mode 100644 proposals/migrations/0050_replace_avg_understood.py

diff --git a/proposals/forms.py b/proposals/forms.py
index 78b872f5f..21cabcf24 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -573,17 +573,17 @@ def clean(self):
 class ProposalDataManagementForm(SoftValidationMixin, forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = ['avg_understood', 'dmp_file']
+        fields = ['privacy_officer', 'dmp_file']
         widgets = {
-            'avg_understood': forms.RadioSelect(choices=YES_NO),
+            'privacy_officer': forms.RadioSelect(choices=YES_NO),
         }
     
     def clean(self):
         cleaned_data = super(ProposalDataManagementForm, self).clean()
 
-        if cleaned_data['avg_understood'] is None:
+        if cleaned_data['privacy_officer'] is None:
             self.add_error(
-                'avg_understood', 
+                'privacy_officer', 
                 _('Dit veld is verplicht om verder te gaan.')
             )
 
diff --git a/proposals/migrations/0034_auto_20211213_1503.py b/proposals/migrations/0034_auto_20211213_1503.py
index f026a0ed4..a5afdc58d 100644
--- a/proposals/migrations/0034_auto_20211213_1503.py
+++ b/proposals/migrations/0034_auto_20211213_1503.py
@@ -5,8 +5,12 @@
 import django.db.models.deletion
 import main.validators
 import proposals.utils.proposal_utils
-import proposals.validators
 
+def AVGUnderstoodValidator():
+    '''This was formerly a validator, imported from proposals.validators,
+    but it is currently no longer required, so it has been removed.
+    To prevent an error, it has been replaced with this stub.'''
+    pass
 
 class Migration(migrations.Migration):
 
@@ -18,7 +22,7 @@ class Migration(migrations.Migration):
         migrations.AlterField(
             model_name='proposal',
             name='avg_understood',
-            field=models.BooleanField(default=False, validators=[proposals.validators.AVGUnderstoodValidator], verbose_name='Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'),
+            field=models.BooleanField(default=False, validators=[AVGUnderstoodValidator], verbose_name='Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'),
         ),
         migrations.AlterField(
             model_name='proposal',
diff --git a/proposals/migrations/0050_alter_proposal_avg_understood.py b/proposals/migrations/0050_alter_proposal_avg_understood.py
deleted file mode 100644
index e90b6e4bf..000000000
--- a/proposals/migrations/0050_alter_proposal_avg_understood.py
+++ /dev/null
@@ -1,19 +0,0 @@
-# Generated by Django 3.2.20 on 2023-11-15 10:56
-
-from django.db import migrations, models
-import proposals.validators
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('proposals', '0049_alter_proposal_supervisor'),
-    ]
-
-    operations = [
-        migrations.AlterField(
-            model_name='proposal',
-            name='avg_understood',
-            field=models.BooleanField(blank=True, default=None, null=True, validators=[proposals.validators.AVGUnderstoodValidator], verbose_name='Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
-        ),
-    ]
diff --git a/proposals/migrations/0050_replace_avg_understood.py b/proposals/migrations/0050_replace_avg_understood.py
new file mode 100644
index 000000000..a9a9c9958
--- /dev/null
+++ b/proposals/migrations/0050_replace_avg_understood.py
@@ -0,0 +1,24 @@
+# Generated by Django 3.2.20 on 2023-11-16 09:41
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    replaces = [('proposals', '0050_alter_proposal_avg_understood'), ('proposals', '0051_auto_20231116_1030')]
+
+    dependencies = [
+        ('proposals', '0049_alter_proposal_supervisor'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='proposal',
+            name='avg_understood',
+        ),
+        migrations.AddField(
+            model_name='proposal',
+            name='privacy_officer',
+            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+        ),
+    ]
diff --git a/proposals/models.py b/proposals/models.py
index 7e7a2329f..09749e2b0 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -15,7 +15,6 @@
 
 from main.models import YES, YES_NO_DOUBT
 from main.validators import MaxWordsValidator, validate_pdf_or_doc
-from .validators import AVGUnderstoodValidator
 from .utils import available_urls, FilenameFactory, OverwriteStorage
 from datetime import date, timedelta
 
@@ -399,12 +398,11 @@ class Proposal(models.Model):
         blank=True,
     )
 
-    avg_understood = models.BooleanField(
+    privacy_officer = models.BooleanField(
         _('Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
         default=None,
         null=True,
         blank=True,
-        validators=[AVGUnderstoodValidator],
     )
 
     dmp_file = models.FileField(
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index d88eb9442..2548b9eb4 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -84,10 +84,9 @@
 
 {% block page_header %}
   <div id="page-header">
-    {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name trimmed %}
-      FETC-GW - <em>{{ title }}</em> (referentienummer {{ reference_number }}, ingediend door {{ submitter }})
+    {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name reviewing_committee=proposal.reviewing_committee.name trimmed %}
+      FETC-GW - <em>{{ title }}</em> (referentienummer {{ reference_number }}-{{reviewing_committee}}, ingediend door {{ submitter }})
     {% endblocktrans %}
-    - {% trans proposal.reviewing_committee.name %}
     {% if proposal.is_revision %}
       <br>
       <strong>
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 7a3024472..9ac7cdd57 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -963,7 +963,7 @@ class DMPFileSection(PageBreakMixin, BaseSection):
 
     section_title = _("Data Management Plan")
 
-    row_fields = ["dmp_file", "avg_understood"]
+    row_fields = ["dmp_file", "privacy_officer"]
 
 
 class EmbargoSection(BaseSection):
diff --git a/proposals/validators.py b/proposals/validators.py
index d73291e6b..e5005c43c 100644
--- a/proposals/validators.py
+++ b/proposals/validators.py
@@ -24,14 +24,3 @@ def __call__(self, value):
         if qs.exists():
             raise forms.ValidationError(_('Er bestaat al een aanvraag met deze '
                                           'titel.'), code='unique')
-
-
-def AVGUnderstoodValidator(value):
-# This does not seem to do anything, so I removed it from the model, however,
-# if I try to remove this validator entirely I get an error when making
-# migrations?
-    if value is None:
-        raise forms.ValidationError(
-            _('Je dient deze vraag in te vullen om jouw aanvraag in '
-              'te dienen'), code='avg'
-            )
diff --git a/reviews/migrations/0013_is_commission_review_field.py b/reviews/migrations/0013_is_commission_review_field.py
index 91cac5c7b..88dc103e0 100644
--- a/reviews/migrations/0013_is_commission_review_field.py
+++ b/reviews/migrations/0013_is_commission_review_field.py
@@ -11,6 +11,7 @@ def update_is_commssion_review(apps, schema_editor):
         SUPERVISOR_STAGE = 0
         if review.stage == SUPERVISOR_STAGE:
             review.is_commission_review = False
+            review.update_go()
             review.save()
 
 class Migration(migrations.Migration):
diff --git a/reviews/models.py b/reviews/models.py
index 37e730bbd..15c70f4f6 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -93,7 +93,7 @@ def update_go(self, last_decision=None):
             self.save()
 
             # For a supervisor review:
-            if self.stage == self.SUPERVISOR:
+            if self.is_commission_review == False:
                 # Update the status of the Proposal with the end date
                 self.proposal.date_reviewed_supervisor = self.date_end
                 self.proposal.save()
@@ -103,6 +103,7 @@ def update_go(self, last_decision=None):
                     # in an uWSGI environment, in which it errors.
                     from reviews.utils import start_assignment_phase
                     start_assignment_phase(self.proposal)
+                    self.stage = self.CLOSED
                 # On NO-GO, reset the Proposal status
                 else:
                     # See comment above
diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html
index 7f24fcfc7..5d7b24791 100644
--- a/reviews/templates/reviews/review_detail_sidebar.html
+++ b/reviews/templates/reviews/review_detail_sidebar.html
@@ -90,7 +90,7 @@ <h3>
                 </em>
             </li>
         {% endif %}
-        {% if review.stage == review.SUPERVISOR %}
+        {% if review.is_commission_review == False %}
             <li>
                 <strong>
                     {% blocktrans trimmed %}
diff --git a/reviews/views.py b/reviews/views.py
index 9a08ce0c1..81c6bfba7 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -556,7 +556,7 @@ def form_valid(self, form):
 
         # Don't notify the secretary if this is a supervisor decision.
         # If it was a GO they the secretary will be notified anyway
-        if not review.stage == review.SUPERVISOR:
+        if review.is_commission_review == True:
             notify_secretary(form.instance)
 
         return super(DecisionUpdateView, self).form_valid(form)

From 75ab28aee8f4ddba6c883a7ad015b8bcc280d872 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 16 Nov 2023 14:17:32 +0100
Subject: [PATCH 083/148] changed is_commission_review to is_committee_review +
 minor tweaks

---
 ..._understood.py => 0050_auto_20231116_1413.py} |  4 +---
 proposals/templates/proposals/proposal_pdf.html  |  2 +-
 ..._field.py => 0013_add_is_committee_review.py} | 16 +++++++++-------
 reviews/models.py                                |  4 ++--
 .../templates/reviews/review_detail_sidebar.html |  2 +-
 reviews/tests.py                                 |  6 +++---
 reviews/utils/review_utils.py                    |  2 +-
 reviews/views.py                                 |  2 +-
 8 files changed, 19 insertions(+), 19 deletions(-)
 rename proposals/migrations/{0050_replace_avg_understood.py => 0050_auto_20231116_1413.py} (78%)
 rename reviews/migrations/{0013_is_commission_review_field.py => 0013_add_is_committee_review.py} (54%)

diff --git a/proposals/migrations/0050_replace_avg_understood.py b/proposals/migrations/0050_auto_20231116_1413.py
similarity index 78%
rename from proposals/migrations/0050_replace_avg_understood.py
rename to proposals/migrations/0050_auto_20231116_1413.py
index a9a9c9958..2de122f4d 100644
--- a/proposals/migrations/0050_replace_avg_understood.py
+++ b/proposals/migrations/0050_auto_20231116_1413.py
@@ -1,12 +1,10 @@
-# Generated by Django 3.2.20 on 2023-11-16 09:41
+# Generated by Django 3.2.20 on 2023-11-16 13:13
 
 from django.db import migrations, models
 
 
 class Migration(migrations.Migration):
 
-    replaces = [('proposals', '0050_alter_proposal_avg_understood'), ('proposals', '0051_auto_20231116_1030')]
-
     dependencies = [
         ('proposals', '0049_alter_proposal_supervisor'),
     ]
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 2548b9eb4..9d1d10631 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -85,7 +85,7 @@
 {% block page_header %}
   <div id="page-header">
     {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name reviewing_committee=proposal.reviewing_committee.name trimmed %}
-      FETC-GW - <em>{{ title }}</em> (referentienummer {{ reference_number }}-{{reviewing_committee}}, ingediend door {{ submitter }})
+      FETC-GW - <em>{{ title }}</em> (referentienummer {{reviewing_committee}}-{{ reference_number }}, ingediend door {{ submitter }})
     {% endblocktrans %}
     {% if proposal.is_revision %}
       <br>
diff --git a/reviews/migrations/0013_is_commission_review_field.py b/reviews/migrations/0013_add_is_committee_review.py
similarity index 54%
rename from reviews/migrations/0013_is_commission_review_field.py
rename to reviews/migrations/0013_add_is_committee_review.py
index 88dc103e0..0ff5fedc6 100644
--- a/reviews/migrations/0013_is_commission_review_field.py
+++ b/reviews/migrations/0013_add_is_committee_review.py
@@ -1,17 +1,19 @@
-# Generated by Django 3.2.20 on 2023-11-14 09:46
+# Generated by Django 3.2.20 on 2023-11-16 13:01
 
 from django.db import migrations, models
 
-def update_is_commssion_review(apps, schema_editor):
+def update_is_committee_review(apps, schema_editor):
 
     Review = apps.get_model('reviews', 'Review')
 
     for review in Review.objects.all():
-        #Hardcoded this to account for possible future changes to stages
+        #Hardcoded these to account for possible future changes to stages
         SUPERVISOR_STAGE = 0
+        CLOSED_STAGE = 4
         if review.stage == SUPERVISOR_STAGE:
-            review.is_commission_review = False
-            review.update_go()
+            review.is_committee_review = False
+            if review.go:
+                review.stage = CLOSED_STAGE
             review.save()
 
 class Migration(migrations.Migration):
@@ -23,8 +25,8 @@ class Migration(migrations.Migration):
     operations = [
         migrations.AddField(
             model_name='review',
-            name='is_commission_review',
+            name='is_committee_review',
             field=models.BooleanField(default=True),
         ),
-        migrations.RunPython(update_is_commssion_review),
+        migrations.RunPython(update_is_committee_review),
     ]
diff --git a/reviews/models.py b/reviews/models.py
index 15c70f4f6..20825474a 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -63,7 +63,7 @@ class Review(models.Model):
     date_end = models.DateTimeField(blank=True, null=True)
     date_should_end = models.DateField(blank=True, null=True)
 
-    is_commission_review = models.BooleanField(
+    is_committee_review = models.BooleanField(
         default=True
     )
 
@@ -93,7 +93,7 @@ def update_go(self, last_decision=None):
             self.save()
 
             # For a supervisor review:
-            if self.is_commission_review == False:
+            if self.is_committee_review == False:
                 # Update the status of the Proposal with the end date
                 self.proposal.date_reviewed_supervisor = self.date_end
                 self.proposal.save()
diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html
index 5d7b24791..da68c5636 100644
--- a/reviews/templates/reviews/review_detail_sidebar.html
+++ b/reviews/templates/reviews/review_detail_sidebar.html
@@ -90,7 +90,7 @@ <h3>
                 </em>
             </li>
         {% endif %}
-        {% if review.is_commission_review == False %}
+        {% if not review.is_committee_review %}
             <li>
                 <strong>
                     {% blocktrans trimmed %}
diff --git a/reviews/tests.py b/reviews/tests.py
index 069d99910..60a4de5dc 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -154,7 +154,7 @@ def test_start_supervisor_review(self):
         # If the Relation on a Proposal requires a supervisor, a Review for the supervisor should be started.
         review = start_review(self.proposal)
         self.assertEqual(review.stage, Review.SUPERVISOR)
-        self.assertEqual(review.is_commission_review, False)
+        self.assertEqual(review.is_committee_review, False)
         self.assertEqual(Decision.objects.filter(reviewer=self.supervisor).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
@@ -171,7 +171,7 @@ def test_start_review(self):
 
         review = start_review(self.proposal)
         self.assertEqual(review.stage, Review.ASSIGNMENT)
-        self.assertEqual(review.is_commission_review, True)
+        self.assertEqual(review.is_committee_review, True)
         self.assertEqual(Decision.objects.filter(reviewer=self.secretary).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
@@ -198,7 +198,7 @@ def test_decision_supervisor(self):
         decision.save()
         review.refresh_from_db()
         self.assertEqual(review.go, True)
-        self.assertEqual(review.is_commission_review, False)
+        self.assertEqual(review.is_committee_review, False)
 
         self.assertEqual(len(mail.outbox), 2)
         self.check_subject_lines(mail.outbox)
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index dae480cdd..d0a568fd0 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -42,7 +42,7 @@ def start_supervisor_phase(proposal):
     """
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
     review.stage = Review.SUPERVISOR
-    review.is_commission_review = False
+    review.is_committee_review = False
     review.save()
 
     proposal.date_submitted_supervisor = timezone.now()
diff --git a/reviews/views.py b/reviews/views.py
index 81c6bfba7..260438ca5 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -556,7 +556,7 @@ def form_valid(self, form):
 
         # Don't notify the secretary if this is a supervisor decision.
         # If it was a GO they the secretary will be notified anyway
-        if review.is_commission_review == True:
+        if review.is_committee_review:
             notify_secretary(form.instance)
 
         return super(DecisionUpdateView, self).form_valid(form)

From 333536dc7aeb39c2b637c5e06b8f0b7e103288cf Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 20 Nov 2023 14:26:30 +0100
Subject: [PATCH 084/148] Reviewer.get_full_name on detail page. fixes #581

---
 reviews/templates/reviews/review_table.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reviews/templates/reviews/review_table.html b/reviews/templates/reviews/review_table.html
index f107068d5..b6a2f4cca 100644
--- a/reviews/templates/reviews/review_table.html
+++ b/reviews/templates/reviews/review_table.html
@@ -14,7 +14,7 @@
     <tbody>
         {% for decision in review.decision_set.all %}
         <tr>
-            <td>{{ decision.reviewer }}</td>
+            <td>{{ decision.reviewer.get_full_name }}</td>
             <td>{{ decision.get_go_display|default:_("open") }}</td>
             <td data-order="{{ decision.date_decision|date:'c' }}">{{ decision.date_decision|date:"j F Y, G:i" }}</td>
             <td>{{ decision.comments }}</td>

From f402a27c532430a2a93a27b73b72e270deac215b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 20 Nov 2023 16:20:20 +0100
Subject: [PATCH 085/148] email to notify secretary when all decisions are
 complete. fixes #563

---
 reviews/models.py                             |   2 +
 .../templates/mail/all_decisions_notify.txt   |  14 +
 reviews/utils/review_utils.py                 | 383 ++++++++++++------
 3 files changed, 273 insertions(+), 126 deletions(-)
 create mode 100644 reviews/templates/mail/all_decisions_notify.txt

diff --git a/reviews/models.py b/reviews/models.py
index 20825474a..0f5aead33 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -114,6 +114,8 @@ def update_go(self, last_decision=None):
             # For a review by commission:
             else:
                 # Set the stage to CLOSING
+                from reviews.utils import notify_secretary_all_decisions
+                notify_secretary_all_decisions(self)
                 self.stage = self.CLOSING
                 self.save()
         else:
diff --git a/reviews/templates/mail/all_decisions_notify.txt b/reviews/templates/mail/all_decisions_notify.txt
new file mode 100644
index 000000000..5c2847a58
--- /dev/null
+++ b/reviews/templates/mail/all_decisions_notify.txt
@@ -0,0 +1,14 @@
+{% extends "mail/base-internal.txt" %}
+
+{% block content %}
+Alle beoordelingen zijn toegevoegd bij de aanvraag {{ proposal.reference_number }}.
+
+De review is klaar om afgesloten te worden.
+
+Overzicht beoordelingen:
+{% for decision in decisions %}
+Beoordelaar: {{ decision.reviewer.get_full_name }}
+Beoordeling: {{ decision.get_go_display }}
+Opmerkingen: {{ decision.comments|default:"geen"|safe }}
+{% endfor %}
+{% endblock %}
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index d0a568fd0..ef882fb3b 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -52,39 +52,62 @@ def start_supervisor_phase(proposal):
     decision = Decision.objects.create(review=review, reviewer=proposal.supervisor)
     reference = proposal.committee_prefixed_refnum()
 
-    subject = _('FETC-GW {}: bevestiging indienen concept-aanmelding'.format(reference))
+    subject = _("FETC-GW {}: bevestiging indienen concept-aanmelding".format(reference))
     params = {
-        'proposal': proposal,
-        'title': proposal.title,
-        'supervisor': proposal.supervisor.get_full_name(),
-        'secretary': get_secretary().get_full_name(),
-        'pdf_url': settings.BASE_URL + proposal.pdf.url,
+        "proposal": proposal,
+        "title": proposal.title,
+        "supervisor": proposal.supervisor.get_full_name(),
+        "secretary": get_secretary().get_full_name(),
+        "pdf_url": settings.BASE_URL + proposal.pdf.url,
     }
-    msg_plain = render_to_string('mail/concept_creator.txt', params)
-    msg_html = render_to_string('mail/concept_creator.html', params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email], html_message=msg_html)
+    msg_plain = render_to_string("mail/concept_creator.txt", params)
+    msg_html = render_to_string("mail/concept_creator.html", params)
+    send_mail(
+        subject,
+        msg_plain,
+        settings.EMAIL_FROM,
+        [proposal.created_by.email],
+        html_message=msg_html,
+    )
 
     if proposal.other_applicants:
-        params['creator'] = proposal.created_by.get_full_name()
-        msg_plain = render_to_string('mail/concept_other_applicants.txt', params)
-        msg_html = render_to_string('mail/concept_other_applicants.html', params)
+        params["creator"] = proposal.created_by.get_full_name()
+        msg_plain = render_to_string("mail/concept_other_applicants.txt", params)
+        msg_html = render_to_string("mail/concept_other_applicants.html", params)
         applicants_to_remove = [proposal.created_by, proposal.supervisor]
-        other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
+        other_applicants_emails = [
+            applicant.email
+            for applicant in proposal.applicants.all()
+            if applicant not in applicants_to_remove
+        ]
+        send_mail(
+            subject,
+            msg_plain,
+            settings.EMAIL_FROM,
+            other_applicants_emails,
+            html_message=msg_html,
+        )
 
-    subject = _('FETC-GW {}: beoordelen als eindverantwoordelijke'.format(reference))
+    subject = _("FETC-GW {}: beoordelen als eindverantwoordelijke".format(reference))
     params = {
-        'proposal': proposal,
-        'creator': proposal.created_by.get_full_name(),
-        'proposal_url': settings.BASE_URL + reverse('reviews:decide', args=(decision.pk,)),
-        'secretary': get_secretary().get_full_name(),
-        'revision': proposal.is_revision,
-        'revision_type': proposal.type(),
-        'my_supervised': settings.BASE_URL + reverse('proposals:my_supervised'),
+        "proposal": proposal,
+        "creator": proposal.created_by.get_full_name(),
+        "proposal_url": settings.BASE_URL
+        + reverse("reviews:decide", args=(decision.pk,)),
+        "secretary": get_secretary().get_full_name(),
+        "revision": proposal.is_revision,
+        "revision_type": proposal.type(),
+        "my_supervised": settings.BASE_URL + reverse("proposals:my_supervised"),
     }
-    msg_plain = render_to_string('mail/concept_supervisor.txt', params)
-    msg_html = render_to_string('mail/concept_supervisor.html', params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.supervisor.email], html_message=msg_html)
+    msg_plain = render_to_string("mail/concept_supervisor.txt", params)
+    msg_html = render_to_string("mail/concept_supervisor.html", params)
+    send_mail(
+        subject,
+        msg_plain,
+        settings.EMAIL_FROM,
+        [proposal.supervisor.email],
+        html_message=msg_html,
+    )
 
     return review
 
@@ -110,7 +133,9 @@ def start_assignment_phase(proposal):
     review.short_route = short_route
 
     if short_route:
-        review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.SHORT_ROUTE_WEEKS)
+        review.date_should_end = timezone.now() + timezone.timedelta(
+            weeks=settings.SHORT_ROUTE_WEEKS
+        )
     review.save()
 
     proposal.date_submitted = timezone.now()
@@ -122,36 +147,58 @@ def start_assignment_phase(proposal):
 
     notify_secretary_assignment(review)
 
-    subject = _('FETC-GW {}: aanmelding ontvangen'.format(proposal.committee_prefixed_refnum()))
+    subject = _(
+        "FETC-GW {}: aanmelding ontvangen".format(proposal.committee_prefixed_refnum())
+    )
     params = {
-        'secretary': secretary.get_full_name(),
-        'review_date': review.date_should_end,
-        'pdf_url': settings.BASE_URL + proposal.pdf.url,
-        'title': proposal.title,
+        "secretary": secretary.get_full_name(),
+        "review_date": review.date_should_end,
+        "pdf_url": settings.BASE_URL + proposal.pdf.url,
+        "title": proposal.title,
     }
     if review.short_route:
-        msg_plain = render_to_string('mail/submitted_shortroute.txt', params)
-        msg_html = render_to_string('mail/submitted_shortroute.html', params)
+        msg_plain = render_to_string("mail/submitted_shortroute.txt", params)
+        msg_html = render_to_string("mail/submitted_shortroute.html", params)
     else:
-        msg_plain = render_to_string('mail/submitted_longroute.txt', params)
-        msg_html = render_to_string('mail/submitted_longroute.html', params)
+        msg_plain = render_to_string("mail/submitted_longroute.txt", params)
+        msg_html = render_to_string("mail/submitted_longroute.html", params)
     recipients = [proposal.created_by.email]
     if proposal.relation.needs_supervisor:
         recipients.append(proposal.supervisor.email)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, recipients, html_message=msg_html)
+    send_mail(
+        subject, msg_plain, settings.EMAIL_FROM, recipients, html_message=msg_html
+    )
 
     if proposal.supervisor is None and proposal.other_applicants:
-        params['creator'] = proposal.created_by.get_full_name()
+        params["creator"] = proposal.created_by.get_full_name()
         if review.short_route:
-            msg_plain = render_to_string('mail/submitted_shortroute_other_applicants.txt', params)
-            msg_html = render_to_string('mail/submitted_shortroute_other_applicants.html', params)
+            msg_plain = render_to_string(
+                "mail/submitted_shortroute_other_applicants.txt", params
+            )
+            msg_html = render_to_string(
+                "mail/submitted_shortroute_other_applicants.html", params
+            )
         else:
-            msg_plain = render_to_string('mail/submitted_longroute_other_applicants.txt', params)
-            msg_html = render_to_string('mail/submitted_longroute_other_applicants.html', params)
+            msg_plain = render_to_string(
+                "mail/submitted_longroute_other_applicants.txt", params
+            )
+            msg_html = render_to_string(
+                "mail/submitted_longroute_other_applicants.html", params
+            )
         applicants_to_remove = [proposal.created_by]
-        other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
-
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
+        other_applicants_emails = [
+            applicant.email
+            for applicant in proposal.applicants.all()
+            if applicant not in applicants_to_remove
+        ]
+
+        send_mail(
+            subject,
+            msg_plain,
+            settings.EMAIL_FROM,
+            other_applicants_emails,
+            html_message=msg_html,
+        )
 
     if proposal.inform_local_staff:
         notify_local_staff(proposal)
@@ -173,7 +220,7 @@ def remind_reviewers():
         review__short_route=True,
         review__date_should_end__gte=today,
         review__date_should_end__lte=next_two_days,
-        go='',  # Checks if the decision has already been done; we don't
+        go="",  # Checks if the decision has already been done; we don't
         # check for None as the field cannot be None according to the field
         # definition
     )
@@ -184,13 +231,20 @@ def remind_reviewers():
             proposal.committee_prefixed_refnum(),
         )
         params = {
-            'creator': proposal.created_by.get_full_name(),
-            'proposal_url': settings.BASE_URL + reverse('reviews:decide', args=(decision.pk,)),
-            'secretary': get_secretary().get_full_name(),
+            "creator": proposal.created_by.get_full_name(),
+            "proposal_url": settings.BASE_URL
+            + reverse("reviews:decide", args=(decision.pk,)),
+            "secretary": get_secretary().get_full_name(),
         }
-        msg_plain = render_to_string('mail/reminder.txt', params)
-        msg_html = render_to_string('mail/reminder.html', params)
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, [decision.reviewer.email], html_message=msg_html)
+        msg_plain = render_to_string("mail/reminder.txt", params)
+        msg_html = render_to_string("mail/reminder.html", params)
+        send_mail(
+            subject,
+            msg_plain,
+            settings.EMAIL_FROM,
+            [decision.reviewer.email],
+            html_message=msg_html,
+        )
 
 
 def start_review_pre_assessment(proposal):
@@ -206,7 +260,9 @@ def start_review_pre_assessment(proposal):
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
     review.stage = Review.ASSIGNMENT
     review.short_route = True
-    review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.PREASSESSMENT_ROUTE_WEEKS)
+    review.date_should_end = timezone.now() + timezone.timedelta(
+        weeks=settings.PREASSESSMENT_ROUTE_WEEKS
+    )
     review.save()
 
     proposal.date_submitted = timezone.now()
@@ -216,27 +272,36 @@ def start_review_pre_assessment(proposal):
     secretary = get_secretary()
     Decision.objects.create(review=review, reviewer=secretary)
 
-    subject = _('FETC-GW {}: nieuwe aanvraag voor voortoetsing'.format(
-        proposal.committee_prefixed_refnum(),
+    subject = _(
+        "FETC-GW {}: nieuwe aanvraag voor voortoetsing".format(
+            proposal.committee_prefixed_refnum(),
         )
-                )
-                
+    )
+
     params = {
-        'secretary': secretary.get_full_name(),
-        'proposal': proposal,
-        'proposal_pdf': settings.BASE_URL + proposal.pdf.url,
+        "secretary": secretary.get_full_name(),
+        "proposal": proposal,
+        "proposal_pdf": settings.BASE_URL + proposal.pdf.url,
     }
-    msg_plain = render_to_string('mail/pre_assessment_secretary.txt', params)
-    msg_html = render_to_string('mail/pre_assessment_secretary.html', params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email], html_message=msg_html)
+    msg_plain = render_to_string("mail/pre_assessment_secretary.txt", params)
+    msg_html = render_to_string("mail/pre_assessment_secretary.html", params)
+    send_mail(
+        subject,
+        msg_plain,
+        settings.EMAIL_FROM,
+        [secretary.email],
+        html_message=msg_html,
+    )
 
-    subject = _('FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing'.format(
-        proposal.committee_prefixed_refnum(),)
-                )
+    subject = _(
+        "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing".format(
+            proposal.committee_prefixed_refnum(),
+        )
+    )
     params = {
-        'secretary': secretary.get_full_name(),
+        "secretary": secretary.get_full_name(),
     }
-    msg_plain = render_to_string('mail/pre_assessment_creator.txt', params)
+    msg_plain = render_to_string("mail/pre_assessment_creator.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email])
 
 
@@ -245,28 +310,32 @@ def start_review_route(review, commission_users, use_short_route):
     Creates Decisions and sends notification e-mail to the selected Reviewers
     """
 
-    template = 'mail/assignment_shortroute.txt' if use_short_route else 'mail/assignment_longroute.txt'
+    template = (
+        "mail/assignment_shortroute.txt"
+        if use_short_route
+        else "mail/assignment_longroute.txt"
+    )
 
     was_revised = review.proposal.is_revision
 
     if was_revised:
-        subject = 'FETC-GW {}: gereviseerde aanvraag ter beoordeling'
+        subject = "FETC-GW {}: gereviseerde aanvraag ter beoordeling"
     else:
-        subject = 'FETC-GW {}: nieuwe aanvraag ter beoordeling'
+        subject = "FETC-GW {}: nieuwe aanvraag ter beoordeling"
         # These emails are Dutch-only, therefore intentionally untranslated
 
-    subject = subject.format(review.proposal.committee_prefixed_refnum(),
-                             )
+    subject = subject.format(
+        review.proposal.committee_prefixed_refnum(),
+    )
 
     for user in commission_users:
-
         Decision.objects.create(review=review, reviewer=user)
         params = {
-            'secretary': get_secretary().get_full_name(),
-            'reviewer': user.get_full_name(),
-            'review_date': review.date_should_end,
-            'is_pre_assessment': review.proposal.is_pre_assessment,
-            'was_revised': was_revised,
+            "secretary": get_secretary().get_full_name(),
+            "reviewer": user.get_full_name(),
+            "review_date": review.date_should_end,
+            "is_pre_assessment": review.proposal.is_pre_assessment,
+            "was_revised": was_revised,
         }
         msg_plain = render_to_string(template, params)
         send_mail(subject, msg_plain, settings.EMAIL_FROM, [user.email])
@@ -279,12 +348,14 @@ def notify_secretary_assignment(review):
     secretary = get_secretary()
     proposal = review.proposal
     committee = review.proposal.reviewing_committee
-    subject = _('FETC-GW {}: nieuwe aanvraag ingediend').format(proposal.committee_prefixed_refnum())
+    subject = _("FETC-GW {}: nieuwe aanvraag ingediend").format(
+        proposal.committee_prefixed_refnum()
+    )
     params = {
-        'secretary': secretary.get_full_name(),
-        'review': review,
+        "secretary": secretary.get_full_name(),
+        "review": review,
     }
-    msg_plain = render_to_string('mail/submitted.txt', params)
+    msg_plain = render_to_string("mail/submitted.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
 
@@ -294,14 +365,31 @@ def notify_secretary(decision):
     """
     secretary = get_secretary()
     proposal = decision.review.proposal
-    subject = _('FETC-GW {}: nieuwe beoordeling toegevoegd').format(
+    subject = _("FETC-GW {}: nieuwe beoordeling toegevoegd").format(
         proposal.committee_prefixed_refnum(),
     )
     params = {
-        'secretary': secretary.get_full_name(),
-        'decision': decision,
+        "secretary": secretary.get_full_name(),
+        "decision": decision,
+    }
+    msg_plain = render_to_string("mail/decision_notify.txt", params)
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
+
+
+def notify_secretary_all_decisions(review):
+    """
+    Notifies a secretary all Decisions have been made for a certain review
+    """
+    secretary = get_secretary()
+    subject = _("FETC-GW {}: alle beoordelingen toegevoegd").format(
+        review.proposal.committee_prefixed_refnum(),
+    )
+    params = {
+        "secretary": secretary.get_full_name(),
+        "proposal": review.proposal,
+        "decisions": review.decision_set.all()
     }
-    msg_plain = render_to_string('mail/decision_notify.txt', params)
+    msg_plain = render_to_string("mail/all_decisions_notify.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
 
@@ -310,18 +398,20 @@ def notify_supervisor_nogo(decision):
     proposal = decision.review.proposal
     supervisor = proposal.supervisor
     receivers = set(applicant for applicant in proposal.applicants.all())
-    subject = _('FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld'.format(
-        proposal.committee_prefixed_refnum(),)
+    subject = _(
+        "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld".format(
+            proposal.committee_prefixed_refnum(),
+        )
     )
     params = {
-        'secretary': secretary.get_full_name(),
-        'decision': decision,
-        'supervisor': supervisor,
+        "secretary": secretary.get_full_name(),
+        "decision": decision,
+        "supervisor": supervisor,
     }
 
     for applicant in receivers:
-        params['applicant'] = applicant
-        msg_plain = render_to_string('mail/supervisor_decision.txt', params)
+        params["applicant"] = applicant
+        msg_plain = render_to_string("mail/supervisor_decision.txt", params)
         send_mail(subject, msg_plain, settings.EMAIL_FROM, [applicant.email])
 
 
@@ -334,40 +424,66 @@ def auto_review(proposal: Proposal):
     reasons = []
 
     for study in proposal.study_set.all():
-
         if study.legally_incapable:
-            reasons.append(_('De aanvraag bevat het gebruik van wilsonbekwame volwassenen.'))
+            reasons.append(
+                _("De aanvraag bevat het gebruik van wilsonbekwame volwassenen.")
+            )
 
         if study.deception in [YES, DOUBT]:
-            reasons.append(_('De aanvraag bevat het gebruik van misleiding.'))
+            reasons.append(_("De aanvraag bevat het gebruik van misleiding."))
 
         if study.hierarchy:
-            reasons.append(_('Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)'))
+            reasons.append(
+                _(
+                    "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
+                )
+            )
 
         if study.has_special_details:
-            reasons.append(_('Het onderzoek verzamelt bijzondere persoonsgegevens.'))
+            reasons.append(_("Het onderzoek verzamelt bijzondere persoonsgegevens."))
 
         if study.has_traits:
-            reasons.append(_('Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht verhoogde kwetsbaarheid met zich meebrengen.'))
+            reasons.append(
+                _(
+                    "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht verhoogde kwetsbaarheid met zich meebrengen."
+                )
+            )
 
         for task in Task.objects.filter(session__study=study):
             reasons.extend(auto_review_task(study, task))
 
         if study.stressful in [YES, DOUBT]:
-            reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
-als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen.'))
+            reasons.append(
+                _(
+                    "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
+als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen."
+                )
+            )
 
         if study.risk in [YES, DOUBT]:
-            reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) de risico\'s op psychische of \
-fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn.'))
+            reasons.append(
+                _(
+                    "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op psychische of \
+fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn."
+                )
+            )
 
         if study.has_sessions:
             for session in study.session_set.all():
                 for age_group in study.age_groups.all():
                     if session.net_duration() > age_group.max_net_duration:
-                        reasons.append(_('De totale duur van de taken in sessie {s}, exclusief pauzes \
+                        reasons.append(
+                            _(
+                                "De totale duur van de taken in sessie {s}, exclusief pauzes \
 en andere niet-taak elementen ({d} minuten), is groter dan het streefmaximum ({max_d} minuten) \
-voor de leeftijdsgroep {ag}.').format(s=session.order, ag=age_group, d=session.net_duration(), max_d=age_group.max_net_duration))
+voor de leeftijdsgroep {ag}."
+                            ).format(
+                                s=session.order,
+                                ag=age_group,
+                                d=session.net_duration(),
+                                max_d=age_group.max_net_duration,
+                            )
+                        )
 
     return reasons
 
@@ -382,18 +498,30 @@ def auto_review_observation(observation):
 
     if observation.settings_requires_review():
         for setting in observation.settings_requires_review():
-            reasons.append(_('Het onderzoek observeert deelnemers in de volgende setting: {s}').format(s=setting))
+            reasons.append(
+                _(
+                    "Het onderzoek observeert deelnemers in de volgende setting: {s}"
+                ).format(s=setting)
+            )
 
     if observation.is_nonpublic_space:
         if not observation.has_advanced_consent:
-            reasons.append(_('Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met informed consent achteraf.'))
+            reasons.append(
+                _(
+                    "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met informed consent achteraf."
+                )
+            )
         if observation.is_anonymous:
-            reasons.append(_('De onderzoeker begeeft zich "under cover" in een beheerde niet-publieke ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie deel en/of verzamelt data die te herleiden zijn tot individuele personen.'))
+            reasons.append(
+                _(
+                    'De onderzoeker begeeft zich "under cover" in een beheerde niet-publieke ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie deel en/of verzamelt data die te herleiden zijn tot individuele personen.'
+                )
+            )
 
     for registration in observation.registrations.all():
         if registration.requires_review:
             reasons.append(
-                _('De aanvraag bevat het gebruik van {}').format(
+                _("De aanvraag bevat het gebruik van {}").format(
                     registration.description
                 )
             )
@@ -413,8 +541,15 @@ def auto_review_task(study, task):
         if registration.requires_review:
             if registration.age_min:
                 for age_group in study.age_groups.all():
-                    if age_group.age_max is not None and age_group.age_max < registration.age_min:
-                        reasons.append(_('De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar.').format(registration.age_min))
+                    if (
+                        age_group.age_max is not None
+                        and age_group.age_max < registration.age_min
+                    ):
+                        reasons.append(
+                            _(
+                                "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
+                            ).format(registration.age_min)
+                        )
                         break
 
     return reasons
@@ -423,7 +558,7 @@ def auto_review_task(study, task):
 def discontinue_review(review):
     """
     Set continuation to discontinued on the given review,
-    and set DECISION_MADE on its proposal. """
+    and set DECISION_MADE on its proposal."""
 
     # Set review continuation
     review.continuation = review.DISCONTINUED
@@ -448,21 +583,17 @@ def assign_reviewers(review, list_of_users, route):
     obsolete_reviewers = current_reviewers - list_of_users
 
     if review.proposal.is_revision:
-        #Revisions should end in one week.
-        review.date_should_end = timezone.now() + \
-            timezone.timedelta(
-                weeks=1
-            )
+        # Revisions should end in one week.
+        review.date_should_end = timezone.now() + timezone.timedelta(weeks=1)
     elif review.date_should_end is not None:
-        #if the date_end_variable gets assigned through auto review
-        #the review keeps this date
+        # if the date_end_variable gets assigned through auto review
+        # the review keeps this date
         pass
     elif route == True:
-        #The short route reviews should take two weeks.
-        review.date_should_end = timezone.now() + \
-            timezone.timedelta(
-                weeks=settings.SHORT_ROUTE_WEEKS
-            )
+        # The short route reviews should take two weeks.
+        review.date_should_end = timezone.now() + timezone.timedelta(
+            weeks=settings.SHORT_ROUTE_WEEKS
+        )
     elif route == False:
         # We have no desired end date for long track reviews
         review.date_should_end = None
@@ -471,8 +602,7 @@ def assign_reviewers(review, list_of_users, route):
     start_review_route(review, new_reviewers, route)
 
     # Remove the Decision for obsolete reviewers
-    Decision.objects.filter(review=review,
-                            reviewer__in=obsolete_reviewers).delete()
+    Decision.objects.filter(review=review, reviewer__in=obsolete_reviewers).delete()
 
     review.save()
 
@@ -480,6 +610,7 @@ def assign_reviewers(review, list_of_users, route):
     # This prevents it waiting for removed reviewers
     review.update_go()
 
+
 def straight_to_revision(review):
     """This action by the secretary in ReviewAssignForm bypasses
     the usual review process and sends a review straight to revision"""

From 82627e5d4cbcaeb9c7b0aa5584d806a01012ef06 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 20 Nov 2023 16:46:02 +0100
Subject: [PATCH 086/148] unblacked review_utils

---
 reviews/utils/review_utils.py | 368 ++++++++++++----------------------
 1 file changed, 126 insertions(+), 242 deletions(-)

diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index ef882fb3b..597e19f2d 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -52,62 +52,39 @@ def start_supervisor_phase(proposal):
     decision = Decision.objects.create(review=review, reviewer=proposal.supervisor)
     reference = proposal.committee_prefixed_refnum()
 
-    subject = _("FETC-GW {}: bevestiging indienen concept-aanmelding".format(reference))
+    subject = _('FETC-GW {}: bevestiging indienen concept-aanmelding'.format(reference))
     params = {
-        "proposal": proposal,
-        "title": proposal.title,
-        "supervisor": proposal.supervisor.get_full_name(),
-        "secretary": get_secretary().get_full_name(),
-        "pdf_url": settings.BASE_URL + proposal.pdf.url,
+        'proposal': proposal,
+        'title': proposal.title,
+        'supervisor': proposal.supervisor.get_full_name(),
+        'secretary': get_secretary().get_full_name(),
+        'pdf_url': settings.BASE_URL + proposal.pdf.url,
     }
-    msg_plain = render_to_string("mail/concept_creator.txt", params)
-    msg_html = render_to_string("mail/concept_creator.html", params)
-    send_mail(
-        subject,
-        msg_plain,
-        settings.EMAIL_FROM,
-        [proposal.created_by.email],
-        html_message=msg_html,
-    )
+    msg_plain = render_to_string('mail/concept_creator.txt', params)
+    msg_html = render_to_string('mail/concept_creator.html', params)
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email], html_message=msg_html)
 
     if proposal.other_applicants:
-        params["creator"] = proposal.created_by.get_full_name()
-        msg_plain = render_to_string("mail/concept_other_applicants.txt", params)
-        msg_html = render_to_string("mail/concept_other_applicants.html", params)
+        params['creator'] = proposal.created_by.get_full_name()
+        msg_plain = render_to_string('mail/concept_other_applicants.txt', params)
+        msg_html = render_to_string('mail/concept_other_applicants.html', params)
         applicants_to_remove = [proposal.created_by, proposal.supervisor]
-        other_applicants_emails = [
-            applicant.email
-            for applicant in proposal.applicants.all()
-            if applicant not in applicants_to_remove
-        ]
-        send_mail(
-            subject,
-            msg_plain,
-            settings.EMAIL_FROM,
-            other_applicants_emails,
-            html_message=msg_html,
-        )
+        other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
+        send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
 
-    subject = _("FETC-GW {}: beoordelen als eindverantwoordelijke".format(reference))
+    subject = _('FETC-GW {}: beoordelen als eindverantwoordelijke'.format(reference))
     params = {
-        "proposal": proposal,
-        "creator": proposal.created_by.get_full_name(),
-        "proposal_url": settings.BASE_URL
-        + reverse("reviews:decide", args=(decision.pk,)),
-        "secretary": get_secretary().get_full_name(),
-        "revision": proposal.is_revision,
-        "revision_type": proposal.type(),
-        "my_supervised": settings.BASE_URL + reverse("proposals:my_supervised"),
+        'proposal': proposal,
+        'creator': proposal.created_by.get_full_name(),
+        'proposal_url': settings.BASE_URL + reverse('reviews:decide', args=(decision.pk,)),
+        'secretary': get_secretary().get_full_name(),
+        'revision': proposal.is_revision,
+        'revision_type': proposal.type(),
+        'my_supervised': settings.BASE_URL + reverse('proposals:my_supervised'),
     }
-    msg_plain = render_to_string("mail/concept_supervisor.txt", params)
-    msg_html = render_to_string("mail/concept_supervisor.html", params)
-    send_mail(
-        subject,
-        msg_plain,
-        settings.EMAIL_FROM,
-        [proposal.supervisor.email],
-        html_message=msg_html,
-    )
+    msg_plain = render_to_string('mail/concept_supervisor.txt', params)
+    msg_html = render_to_string('mail/concept_supervisor.html', params)
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.supervisor.email], html_message=msg_html)
 
     return review
 
@@ -133,9 +110,7 @@ def start_assignment_phase(proposal):
     review.short_route = short_route
 
     if short_route:
-        review.date_should_end = timezone.now() + timezone.timedelta(
-            weeks=settings.SHORT_ROUTE_WEEKS
-        )
+        review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.SHORT_ROUTE_WEEKS)
     review.save()
 
     proposal.date_submitted = timezone.now()
@@ -147,58 +122,36 @@ def start_assignment_phase(proposal):
 
     notify_secretary_assignment(review)
 
-    subject = _(
-        "FETC-GW {}: aanmelding ontvangen".format(proposal.committee_prefixed_refnum())
-    )
+    subject = _('FETC-GW {}: aanmelding ontvangen'.format(proposal.committee_prefixed_refnum()))
     params = {
-        "secretary": secretary.get_full_name(),
-        "review_date": review.date_should_end,
-        "pdf_url": settings.BASE_URL + proposal.pdf.url,
-        "title": proposal.title,
+        'secretary': secretary.get_full_name(),
+        'review_date': review.date_should_end,
+        'pdf_url': settings.BASE_URL + proposal.pdf.url,
+        'title': proposal.title,
     }
     if review.short_route:
-        msg_plain = render_to_string("mail/submitted_shortroute.txt", params)
-        msg_html = render_to_string("mail/submitted_shortroute.html", params)
+        msg_plain = render_to_string('mail/submitted_shortroute.txt', params)
+        msg_html = render_to_string('mail/submitted_shortroute.html', params)
     else:
-        msg_plain = render_to_string("mail/submitted_longroute.txt", params)
-        msg_html = render_to_string("mail/submitted_longroute.html", params)
+        msg_plain = render_to_string('mail/submitted_longroute.txt', params)
+        msg_html = render_to_string('mail/submitted_longroute.html', params)
     recipients = [proposal.created_by.email]
     if proposal.relation.needs_supervisor:
         recipients.append(proposal.supervisor.email)
-    send_mail(
-        subject, msg_plain, settings.EMAIL_FROM, recipients, html_message=msg_html
-    )
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, recipients, html_message=msg_html)
 
     if proposal.supervisor is None and proposal.other_applicants:
-        params["creator"] = proposal.created_by.get_full_name()
+        params['creator'] = proposal.created_by.get_full_name()
         if review.short_route:
-            msg_plain = render_to_string(
-                "mail/submitted_shortroute_other_applicants.txt", params
-            )
-            msg_html = render_to_string(
-                "mail/submitted_shortroute_other_applicants.html", params
-            )
+            msg_plain = render_to_string('mail/submitted_shortroute_other_applicants.txt', params)
+            msg_html = render_to_string('mail/submitted_shortroute_other_applicants.html', params)
         else:
-            msg_plain = render_to_string(
-                "mail/submitted_longroute_other_applicants.txt", params
-            )
-            msg_html = render_to_string(
-                "mail/submitted_longroute_other_applicants.html", params
-            )
+            msg_plain = render_to_string('mail/submitted_longroute_other_applicants.txt', params)
+            msg_html = render_to_string('mail/submitted_longroute_other_applicants.html', params)
         applicants_to_remove = [proposal.created_by]
-        other_applicants_emails = [
-            applicant.email
-            for applicant in proposal.applicants.all()
-            if applicant not in applicants_to_remove
-        ]
-
-        send_mail(
-            subject,
-            msg_plain,
-            settings.EMAIL_FROM,
-            other_applicants_emails,
-            html_message=msg_html,
-        )
+        other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
+
+        send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
 
     if proposal.inform_local_staff:
         notify_local_staff(proposal)
@@ -220,7 +173,7 @@ def remind_reviewers():
         review__short_route=True,
         review__date_should_end__gte=today,
         review__date_should_end__lte=next_two_days,
-        go="",  # Checks if the decision has already been done; we don't
+        go='',  # Checks if the decision has already been done; we don't
         # check for None as the field cannot be None according to the field
         # definition
     )
@@ -231,20 +184,13 @@ def remind_reviewers():
             proposal.committee_prefixed_refnum(),
         )
         params = {
-            "creator": proposal.created_by.get_full_name(),
-            "proposal_url": settings.BASE_URL
-            + reverse("reviews:decide", args=(decision.pk,)),
-            "secretary": get_secretary().get_full_name(),
+            'creator': proposal.created_by.get_full_name(),
+            'proposal_url': settings.BASE_URL + reverse('reviews:decide', args=(decision.pk,)),
+            'secretary': get_secretary().get_full_name(),
         }
-        msg_plain = render_to_string("mail/reminder.txt", params)
-        msg_html = render_to_string("mail/reminder.html", params)
-        send_mail(
-            subject,
-            msg_plain,
-            settings.EMAIL_FROM,
-            [decision.reviewer.email],
-            html_message=msg_html,
-        )
+        msg_plain = render_to_string('mail/reminder.txt', params)
+        msg_html = render_to_string('mail/reminder.html', params)
+        send_mail(subject, msg_plain, settings.EMAIL_FROM, [decision.reviewer.email], html_message=msg_html)
 
 
 def start_review_pre_assessment(proposal):
@@ -260,9 +206,7 @@ def start_review_pre_assessment(proposal):
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
     review.stage = Review.ASSIGNMENT
     review.short_route = True
-    review.date_should_end = timezone.now() + timezone.timedelta(
-        weeks=settings.PREASSESSMENT_ROUTE_WEEKS
-    )
+    review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.PREASSESSMENT_ROUTE_WEEKS)
     review.save()
 
     proposal.date_submitted = timezone.now()
@@ -272,36 +216,27 @@ def start_review_pre_assessment(proposal):
     secretary = get_secretary()
     Decision.objects.create(review=review, reviewer=secretary)
 
-    subject = _(
-        "FETC-GW {}: nieuwe aanvraag voor voortoetsing".format(
-            proposal.committee_prefixed_refnum(),
+    subject = _('FETC-GW {}: nieuwe aanvraag voor voortoetsing'.format(
+        proposal.committee_prefixed_refnum(),
         )
-    )
-
+                )
+                
     params = {
-        "secretary": secretary.get_full_name(),
-        "proposal": proposal,
-        "proposal_pdf": settings.BASE_URL + proposal.pdf.url,
+        'secretary': secretary.get_full_name(),
+        'proposal': proposal,
+        'proposal_pdf': settings.BASE_URL + proposal.pdf.url,
     }
-    msg_plain = render_to_string("mail/pre_assessment_secretary.txt", params)
-    msg_html = render_to_string("mail/pre_assessment_secretary.html", params)
-    send_mail(
-        subject,
-        msg_plain,
-        settings.EMAIL_FROM,
-        [secretary.email],
-        html_message=msg_html,
-    )
+    msg_plain = render_to_string('mail/pre_assessment_secretary.txt', params)
+    msg_html = render_to_string('mail/pre_assessment_secretary.html', params)
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email], html_message=msg_html)
 
-    subject = _(
-        "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing".format(
-            proposal.committee_prefixed_refnum(),
-        )
-    )
+    subject = _('FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing'.format(
+        proposal.committee_prefixed_refnum(),)
+                )
     params = {
-        "secretary": secretary.get_full_name(),
+        'secretary': secretary.get_full_name(),
     }
-    msg_plain = render_to_string("mail/pre_assessment_creator.txt", params)
+    msg_plain = render_to_string('mail/pre_assessment_creator.txt', params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email])
 
 
@@ -310,32 +245,28 @@ def start_review_route(review, commission_users, use_short_route):
     Creates Decisions and sends notification e-mail to the selected Reviewers
     """
 
-    template = (
-        "mail/assignment_shortroute.txt"
-        if use_short_route
-        else "mail/assignment_longroute.txt"
-    )
+    template = 'mail/assignment_shortroute.txt' if use_short_route else 'mail/assignment_longroute.txt'
 
     was_revised = review.proposal.is_revision
 
     if was_revised:
-        subject = "FETC-GW {}: gereviseerde aanvraag ter beoordeling"
+        subject = 'FETC-GW {}: gereviseerde aanvraag ter beoordeling'
     else:
-        subject = "FETC-GW {}: nieuwe aanvraag ter beoordeling"
+        subject = 'FETC-GW {}: nieuwe aanvraag ter beoordeling'
         # These emails are Dutch-only, therefore intentionally untranslated
 
-    subject = subject.format(
-        review.proposal.committee_prefixed_refnum(),
-    )
+    subject = subject.format(review.proposal.committee_prefixed_refnum(),
+                             )
 
     for user in commission_users:
+
         Decision.objects.create(review=review, reviewer=user)
         params = {
-            "secretary": get_secretary().get_full_name(),
-            "reviewer": user.get_full_name(),
-            "review_date": review.date_should_end,
-            "is_pre_assessment": review.proposal.is_pre_assessment,
-            "was_revised": was_revised,
+            'secretary': get_secretary().get_full_name(),
+            'reviewer': user.get_full_name(),
+            'review_date': review.date_should_end,
+            'is_pre_assessment': review.proposal.is_pre_assessment,
+            'was_revised': was_revised,
         }
         msg_plain = render_to_string(template, params)
         send_mail(subject, msg_plain, settings.EMAIL_FROM, [user.email])
@@ -348,14 +279,12 @@ def notify_secretary_assignment(review):
     secretary = get_secretary()
     proposal = review.proposal
     committee = review.proposal.reviewing_committee
-    subject = _("FETC-GW {}: nieuwe aanvraag ingediend").format(
-        proposal.committee_prefixed_refnum()
-    )
+    subject = _('FETC-GW {}: nieuwe aanvraag ingediend').format(proposal.committee_prefixed_refnum())
     params = {
-        "secretary": secretary.get_full_name(),
-        "review": review,
+        'secretary': secretary.get_full_name(),
+        'review': review,
     }
-    msg_plain = render_to_string("mail/submitted.txt", params)
+    msg_plain = render_to_string('mail/submitted.txt', params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
 
@@ -365,17 +294,16 @@ def notify_secretary(decision):
     """
     secretary = get_secretary()
     proposal = decision.review.proposal
-    subject = _("FETC-GW {}: nieuwe beoordeling toegevoegd").format(
+    subject = _('FETC-GW {}: nieuwe beoordeling toegevoegd').format(
         proposal.committee_prefixed_refnum(),
     )
     params = {
-        "secretary": secretary.get_full_name(),
-        "decision": decision,
+        'secretary': secretary.get_full_name(),
+        'decision': decision,
     }
-    msg_plain = render_to_string("mail/decision_notify.txt", params)
+    msg_plain = render_to_string('mail/decision_notify.txt', params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
-
 def notify_secretary_all_decisions(review):
     """
     Notifies a secretary all Decisions have been made for a certain review
@@ -392,26 +320,23 @@ def notify_secretary_all_decisions(review):
     msg_plain = render_to_string("mail/all_decisions_notify.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
-
 def notify_supervisor_nogo(decision):
     secretary = get_secretary()
     proposal = decision.review.proposal
     supervisor = proposal.supervisor
     receivers = set(applicant for applicant in proposal.applicants.all())
-    subject = _(
-        "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld".format(
-            proposal.committee_prefixed_refnum(),
-        )
+    subject = _('FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld'.format(
+        proposal.committee_prefixed_refnum(),)
     )
     params = {
-        "secretary": secretary.get_full_name(),
-        "decision": decision,
-        "supervisor": supervisor,
+        'secretary': secretary.get_full_name(),
+        'decision': decision,
+        'supervisor': supervisor,
     }
 
     for applicant in receivers:
-        params["applicant"] = applicant
-        msg_plain = render_to_string("mail/supervisor_decision.txt", params)
+        params['applicant'] = applicant
+        msg_plain = render_to_string('mail/supervisor_decision.txt', params)
         send_mail(subject, msg_plain, settings.EMAIL_FROM, [applicant.email])
 
 
@@ -424,66 +349,40 @@ def auto_review(proposal: Proposal):
     reasons = []
 
     for study in proposal.study_set.all():
+
         if study.legally_incapable:
-            reasons.append(
-                _("De aanvraag bevat het gebruik van wilsonbekwame volwassenen.")
-            )
+            reasons.append(_('De aanvraag bevat het gebruik van wilsonbekwame volwassenen.'))
 
         if study.deception in [YES, DOUBT]:
-            reasons.append(_("De aanvraag bevat het gebruik van misleiding."))
+            reasons.append(_('De aanvraag bevat het gebruik van misleiding.'))
 
         if study.hierarchy:
-            reasons.append(
-                _(
-                    "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
-                )
-            )
+            reasons.append(_('Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)'))
 
         if study.has_special_details:
-            reasons.append(_("Het onderzoek verzamelt bijzondere persoonsgegevens."))
+            reasons.append(_('Het onderzoek verzamelt bijzondere persoonsgegevens.'))
 
         if study.has_traits:
-            reasons.append(
-                _(
-                    "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht verhoogde kwetsbaarheid met zich meebrengen."
-                )
-            )
+            reasons.append(_('Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht verhoogde kwetsbaarheid met zich meebrengen.'))
 
         for task in Task.objects.filter(session__study=study):
             reasons.extend(auto_review_task(study, task))
 
         if study.stressful in [YES, DOUBT]:
-            reasons.append(
-                _(
-                    "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
-als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen."
-                )
-            )
+            reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
+als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen.'))
 
         if study.risk in [YES, DOUBT]:
-            reasons.append(
-                _(
-                    "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op psychische of \
-fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn."
-                )
-            )
+            reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) de risico\'s op psychische of \
+fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn.'))
 
         if study.has_sessions:
             for session in study.session_set.all():
                 for age_group in study.age_groups.all():
                     if session.net_duration() > age_group.max_net_duration:
-                        reasons.append(
-                            _(
-                                "De totale duur van de taken in sessie {s}, exclusief pauzes \
+                        reasons.append(_('De totale duur van de taken in sessie {s}, exclusief pauzes \
 en andere niet-taak elementen ({d} minuten), is groter dan het streefmaximum ({max_d} minuten) \
-voor de leeftijdsgroep {ag}."
-                            ).format(
-                                s=session.order,
-                                ag=age_group,
-                                d=session.net_duration(),
-                                max_d=age_group.max_net_duration,
-                            )
-                        )
+voor de leeftijdsgroep {ag}.').format(s=session.order, ag=age_group, d=session.net_duration(), max_d=age_group.max_net_duration))
 
     return reasons
 
@@ -498,30 +397,18 @@ def auto_review_observation(observation):
 
     if observation.settings_requires_review():
         for setting in observation.settings_requires_review():
-            reasons.append(
-                _(
-                    "Het onderzoek observeert deelnemers in de volgende setting: {s}"
-                ).format(s=setting)
-            )
+            reasons.append(_('Het onderzoek observeert deelnemers in de volgende setting: {s}').format(s=setting))
 
     if observation.is_nonpublic_space:
         if not observation.has_advanced_consent:
-            reasons.append(
-                _(
-                    "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met informed consent achteraf."
-                )
-            )
+            reasons.append(_('Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met informed consent achteraf.'))
         if observation.is_anonymous:
-            reasons.append(
-                _(
-                    'De onderzoeker begeeft zich "under cover" in een beheerde niet-publieke ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie deel en/of verzamelt data die te herleiden zijn tot individuele personen.'
-                )
-            )
+            reasons.append(_('De onderzoeker begeeft zich "under cover" in een beheerde niet-publieke ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie deel en/of verzamelt data die te herleiden zijn tot individuele personen.'))
 
     for registration in observation.registrations.all():
         if registration.requires_review:
             reasons.append(
-                _("De aanvraag bevat het gebruik van {}").format(
+                _('De aanvraag bevat het gebruik van {}').format(
                     registration.description
                 )
             )
@@ -541,15 +428,8 @@ def auto_review_task(study, task):
         if registration.requires_review:
             if registration.age_min:
                 for age_group in study.age_groups.all():
-                    if (
-                        age_group.age_max is not None
-                        and age_group.age_max < registration.age_min
-                    ):
-                        reasons.append(
-                            _(
-                                "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
-                            ).format(registration.age_min)
-                        )
+                    if age_group.age_max is not None and age_group.age_max < registration.age_min:
+                        reasons.append(_('De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar.').format(registration.age_min))
                         break
 
     return reasons
@@ -558,7 +438,7 @@ def auto_review_task(study, task):
 def discontinue_review(review):
     """
     Set continuation to discontinued on the given review,
-    and set DECISION_MADE on its proposal."""
+    and set DECISION_MADE on its proposal. """
 
     # Set review continuation
     review.continuation = review.DISCONTINUED
@@ -583,17 +463,21 @@ def assign_reviewers(review, list_of_users, route):
     obsolete_reviewers = current_reviewers - list_of_users
 
     if review.proposal.is_revision:
-        # Revisions should end in one week.
-        review.date_should_end = timezone.now() + timezone.timedelta(weeks=1)
+        #Revisions should end in one week.
+        review.date_should_end = timezone.now() + \
+            timezone.timedelta(
+                weeks=1
+            )
     elif review.date_should_end is not None:
-        # if the date_end_variable gets assigned through auto review
-        # the review keeps this date
+        #if the date_end_variable gets assigned through auto review
+        #the review keeps this date
         pass
     elif route == True:
-        # The short route reviews should take two weeks.
-        review.date_should_end = timezone.now() + timezone.timedelta(
-            weeks=settings.SHORT_ROUTE_WEEKS
-        )
+        #The short route reviews should take two weeks.
+        review.date_should_end = timezone.now() + \
+            timezone.timedelta(
+                weeks=settings.SHORT_ROUTE_WEEKS
+            )
     elif route == False:
         # We have no desired end date for long track reviews
         review.date_should_end = None
@@ -602,7 +486,8 @@ def assign_reviewers(review, list_of_users, route):
     start_review_route(review, new_reviewers, route)
 
     # Remove the Decision for obsolete reviewers
-    Decision.objects.filter(review=review, reviewer__in=obsolete_reviewers).delete()
+    Decision.objects.filter(review=review,
+                            reviewer__in=obsolete_reviewers).delete()
 
     review.save()
 
@@ -610,7 +495,6 @@ def assign_reviewers(review, list_of_users, route):
     # This prevents it waiting for removed reviewers
     review.update_go()
 
-
 def straight_to_revision(review):
     """This action by the secretary in ReviewAssignForm bypasses
     the usual review process and sends a review straight to revision"""

From ea01d88484112f32309d06e5cc7e7ca7c03db3ba Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 21 Nov 2023 09:57:16 +0100
Subject: [PATCH 087/148] corrected email params

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

diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 597e19f2d..5295b304c 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -309,7 +309,7 @@ def notify_secretary_all_decisions(review):
     Notifies a secretary all Decisions have been made for a certain review
     """
     secretary = get_secretary()
-    subject = _("FETC-GW {}: alle beoordelingen toegevoegd").format(
+    subject = "FETC-GW {}: alle beoordelingen toegevoegd".format(
         review.proposal.committee_prefixed_refnum(),
     )
     params = {
@@ -318,7 +318,7 @@ def notify_secretary_all_decisions(review):
         "decisions": review.decision_set.all()
     }
     msg_plain = render_to_string("mail/all_decisions_notify.txt", params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, ['fetc-gw@uu.nl'])
 
 def notify_supervisor_nogo(decision):
     secretary = get_secretary()

From 4d061bf0fff054ae70989a18fe3655855ce4437d Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Tue, 21 Nov 2023 16:03:30 +0100
Subject: [PATCH 088/148] chore: post-merge cleanup

---
 locale/en/LC_MESSAGES/django.po | 393 ++++++++++----------------------
 1 file changed, 117 insertions(+), 276 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index e8b428c89..4f89bcc22 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-15 12:06+0100\n"
+"POT-Creation-Date: 2023-11-21 16:02+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -63,21 +63,7 @@ msgstr "FAQ"
 msgid "Frequently Asked Questions"
 msgstr "Frequently Asked Questions"
 
-#: observations/templates/observations/observation_update_attachments.html:39
-#: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:58
-#: proposals/templates/proposals/proposal_update_attachments.html:26
-#: proposals/templates/proposals/proposal_update_date_start.html:29
-#: reviews/templates/reviews/change_chamber_form.html:19
-#: reviews/templates/reviews/decision_form.html:90
-#: reviews/templates/reviews/review_assign_form.html:46
-#: reviews/templates/reviews/review_close_form.html:41
-#: reviews/templates/reviews/review_discontinue_form.html:72
-#: studies/templates/studies/study_update_attachments.html:26
-msgid "Terug naar de vorige pagina"
-msgstr "Back to the previous page"
-
-#: fetc/settings.py:133
+#: fetc/settings.py:132
 msgid "Nederlands"
 msgstr "Dutch"
 
@@ -234,7 +220,7 @@ msgstr "uncertain"
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:70 observations/models.py:129 proposals/models.py:264
+#: main/models.py:70 observations/models.py:129 proposals/models.py:263
 #: studies/models.py:208 studies/models.py:244 tasks/models.py:157
 #: tasks/models.py:169
 msgid "Namelijk"
@@ -275,7 +261,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:120
+#: proposals/templates/proposals/proposal_pdf.html:119
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -342,7 +328,7 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:139
+#: main/templates/auth/user_detail.html:75 reviews/models.py:140
 msgid ", met revisie"
 msgstr ", with revision"
 
@@ -421,147 +407,6 @@ msgstr "Save and go to next step >>"
 msgid "Welkom {}"
 msgstr "Welcome {}"
 
-#: main/templates/base/menu.html:11 proposals/menus.py:80
-msgid "Mijn aanvragen"
-msgstr "My applications"
-
-#: main/templates/base/menu.html:14 proposals/menus.py:9
-msgid "Nieuwe aanvraag starten"
-msgstr "Start a new application"
-
-#: main/templates/base/menu.html:17
-msgid "Nieuwe studie starten op basis van een kopie van een oude studie"
-msgstr "Start a new study based on a copy of an old study"
-
-#: main/templates/base/menu.html:20
-msgid "Nieuwe voortoetsing aanvraag starten"
-msgstr "Start a new preliminary application"
-
-#: main/templates/base/menu.html:23
-msgid ""
-"Nieuwe aanvraag starten (die al goedgekeurd is door een andere ethische "
-"toetsingscommissie)"
-msgstr ""
-"Start a new application (that has been approved by another ethics committee)"
-
-#: main/templates/base/menu.html:26 proposals/menus.py:30
-msgid "Maak een revisie van een bestaande aanvraag"
-msgstr "Create a revision for an existing application"
-
-#: main/templates/base/menu.html:29 proposals/menus.py:34
-msgid "Maak een amendement van een al goedgekeurde aanvraag"
-msgstr "Create an amendment to an already approved application"
-
-#: main/templates/base/menu.html:32 proposals/menus.py:56
-#: proposals/views/proposal_views.py:78
-msgid "Mijn conceptaanvragen"
-msgstr "My draft applications"
-
-#: main/templates/base/menu.html:35 proposals/menus.py:60
-#: proposals/views/proposal_views.py:128
-msgid "Mijn oefenaanvragen"
-msgstr "My practice applications"
-
-#: main/templates/base/menu.html:38 proposals/menus.py:64
-#: proposals/views/proposal_views.py:90
-msgid "Mijn ingediende aanvragen"
-msgstr "My submitted applications"
-
-#: main/templates/base/menu.html:41 proposals/menus.py:68
-#: proposals/views/proposal_views.py:102
-msgid "Mijn afgehandelde aanvragen"
-msgstr "My processed applications"
-
-#: main/templates/base/menu.html:44 proposals/menus.py:72
-#: proposals/views/proposal_views.py:114
-msgid "Mijn aanvragen als eindverantwoordelijke"
-msgstr "My supervised applications"
-
-#: main/templates/base/menu.html:47 proposals/menus.py:52
-msgid "Al mijn aanvragen"
-msgstr "All my applications"
-
-#: main/templates/base/menu.html:52 proposals/menus.py:110
-#: proposals/views/proposal_views.py:155
-msgid "Archief"
-msgstr "Archive"
-
-#: main/templates/base/menu.html:55
-msgid "Alle aanvragen bekijken van de Algemene Kamer"
-msgstr "View all applications of the General Chamber"
-
-#: main/templates/base/menu.html:58
-msgid "Alle aanvragen bekijken van de Linguïstiek Kamer"
-msgstr ""
-"View all processed and approved applications of the Linguistics Chamber"
-
-#: main/templates/base/menu.html:62 proposals/menus.py:100
-msgid "Site-export"
-msgstr "Site-export"
-
-#: main/templates/base/menu.html:69 reviews/forms.py:31 reviews/menus.py:60
-#: reviews/mixins.py:127
-msgid "Algemene Kamer"
-msgstr "General Chamber"
-
-#: main/templates/base/menu.html:72 main/templates/base/menu.html:99
-#: reviews/menus.py:14 reviews/views.py:70
-msgid "Mijn openstaande besluiten"
-msgstr "My pending decisions"
-
-#: main/templates/base/menu.html:75 main/templates/base/menu.html:102
-#: reviews/menus.py:18
-msgid "Al mijn besluiten"
-msgstr "All my decisions"
-
-#: main/templates/base/menu.html:79 main/templates/base/menu.html:106
-#: reviews/menus.py:22
-msgid "Alle openstaande besluiten commissieleden"
-msgstr "All pending decisions committee members"
-
-#: main/templates/base/menu.html:82 main/templates/base/menu.html:109
-#: reviews/menus.py:27
-msgid "Alle openstaande besluiten eindverantwoordelijken"
-msgstr "All pending decisions supervisors"
-
-#: main/templates/base/menu.html:85 main/templates/base/menu.html:112
-#: reviews/menus.py:32 reviews/views.py:229
-msgid "Nog af te handelen aanvragen"
-msgstr "Applications waiting for conclusion"
-
-#: main/templates/base/menu.html:88 main/templates/base/menu.html:115
-#: reviews/menus.py:47 reviews/views.py:275
-msgid "Alle ingezonden aanvragen"
-msgstr "All submitted applications"
-
-#: main/templates/base/menu.html:96 reviews/forms.py:32 reviews/menus.py:67
-#: reviews/mixins.py:130
-msgid "Linguïstiek Kamer"
-msgstr "Linguistics Chamber"
-
-#: main/templates/base/menu.html:128
-msgid "Reglement Algemene Kamer (AK)"
-msgstr "Regulations General Chamber (GC)"
-
-#: main/templates/base/menu.html:131
-msgid " Reglement Linguïstiek Kamer (LK) "
-msgstr " Regulations Linguistics Chamber (LC) "
-
-#: main/templates/base/menu.html:145
-#: main/templates/registration/logged_out.html:9
-msgid "Uitloggen"
-msgstr "Log out"
-
-#: main/templates/base/menu.html:149
-msgid "FETC-GW-website"
-msgstr "FEtC-H website"
-
-#: main/templates/base/menu.html:152 main/templates/main/landing.html:77
-#: main/templates/registration/login.html:15
-#: main/templates/registration/login.html:32
-msgid "Inloggen"
-msgstr "Log in"
-
 #: main/templates/base/sidebar.html:27
 msgid "Toon voortgang"
 msgstr "Show progress"
@@ -978,7 +823,7 @@ msgstr "Log out"
 
 #: main/templates/registration/logged_out.html:12
 msgid "Je bent succesvol uitgelogd."
-msgstr "You have successfully logged out."
+msgstr ""
 
 #: main/templates/registration/logged_out.html:17
 #, python-format
@@ -1076,7 +921,7 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:738 studies/models.py:172
+#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
 #: studies/models.py:228 studies/models.py:358
 msgid "Licht toe"
 msgstr "Explain"
@@ -1243,7 +1088,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:43 proposals/models.py:221
+#: proposals/forms.py:43 proposals/models.py:229
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1316,11 +1161,11 @@ msgstr ""
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:286 proposals/models.py:539
+#: proposals/forms.py:286 proposals/models.py:546
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:288 proposals/models.py:541
+#: proposals/forms.py:288 proposals/models.py:548
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
@@ -1530,40 +1375,40 @@ msgstr "Archive"
 msgid "Aanvraag %(title)s bewerkt"
 msgstr "Application %(title)s edited"
 
-#: proposals/models.py:143
+#: proposals/models.py:142
 msgid "Concept"
 msgstr "Draft"
 
-#: proposals/models.py:146
+#: proposals/models.py:145
 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke"
 msgstr "Sent for assessment by the researcher with final responsibility"
 
-#: proposals/models.py:147
+#: proposals/models.py:146
 msgid "Opgestuurd ter beoordeling door FETC-GW"
 msgstr "Sent for assessment by FEtC-H"
 
-#: proposals/models.py:149 proposals/models.py:150
+#: proposals/models.py:148 proposals/models.py:149
 msgid "Aanvraag is beoordeeld door FETC-GW"
 msgstr "Application has been assessed by FEtC-H"
 
-#: proposals/models.py:156
+#: proposals/models.py:155
 msgid "in het kader van een cursus"
 msgstr "in the context of a course"
 
-#: proposals/models.py:157
+#: proposals/models.py:156
 msgid "om de portal te exploreren"
 msgstr "to explore the portal"
 
 # Not actually used in the interface
-#: proposals/models.py:169
+#: proposals/models.py:168
 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?"
 msgstr "Which chamber should be reviewing this application?"
 
-#: proposals/models.py:178
+#: proposals/models.py:177
 msgid "Aan welk onderzoeksinstituut ben je verbonden?"
 msgstr "To which research institute are you affiliated?"
 
-#: proposals/models.py:184
+#: proposals/models.py:183
 msgid ""
 "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt "
 "ingediend?"
@@ -1571,7 +1416,7 @@ msgstr ""
 "What is the desired starting date of the actual research for which this "
 "application is being submitted?"
 
-#: proposals/models.py:185
+#: proposals/models.py:184
 msgid ""
 "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW "
 "de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer gegeven "
@@ -1581,7 +1426,7 @@ msgstr ""
 "has approved it cannot receive formal approval; in such cases, the FEtC-H "
 "only provides a post-hoc advice."
 
-#: proposals/models.py:194
+#: proposals/models.py:193
 msgid ""
 "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle "
 "formele correspondentie."
@@ -1589,7 +1434,7 @@ msgstr ""
 "What is the title of your application? This title will be used in all formal "
 "correspondence."
 
-#: proposals/models.py:199
+#: proposals/models.py:198
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1601,7 +1446,7 @@ msgstr ""
 "portal. The title cannot be identical to that of a study you have previously "
 "submitted."
 
-#: proposals/models.py:207
+#: proposals/models.py:206
 msgid ""
 "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. "
 "Gebruik maximaal 200 woorden."
@@ -1609,7 +1454,7 @@ msgstr ""
 "Give a clear, concise description of the research question or questions. Use "
 "a maximum of 200 words."
 
-#: proposals/models.py:215
+#: proposals/models.py:214
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd "
 "zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?"
@@ -1617,7 +1462,7 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:218
+#: proposals/models.py:217
 msgid ""
 "Werk je samen met een onderzoeker of organisatie buiten de UU en is je "
 "onderzoek niet strikt anoniem? Neem dan contact op met de <a href=\"mailto:"
@@ -1629,11 +1474,11 @@ msgstr ""
 "gw@uu.nl\">privacy officer</a>. Agreements may then have to be made about "
 "the processing of personal data."
 
-#: proposals/models.py:238
+#: proposals/models.py:237
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:243
+#: proposals/models.py:242
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
 "Nederlands of Engels?"
@@ -1641,30 +1486,30 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:250
+#: proposals/models.py:249
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:259
+#: proposals/models.py:258
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:270
+#: proposals/models.py:269
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:274
+#: proposals/models.py:273
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:280
+#: proposals/models.py:279
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:286
+#: proposals/models.py:285
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
 "faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS "
@@ -1687,7 +1532,7 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:306
+#: proposals/models.py:305
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
 "ervoor kiezen je applicatie pas later op te laten nemen in het           "
@@ -1699,16 +1544,16 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:317
+#: proposals/models.py:316
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:327
+#: proposals/models.py:326
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:335
+#: proposals/models.py:334
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
 "deze FETC-GW commissie?"
@@ -1716,11 +1561,11 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:343
+#: proposals/models.py:342
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:351
+#: proposals/models.py:350
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
 "doc(x)-formaat)"
@@ -1728,22 +1573,22 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:359
+#: proposals/models.py:358
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:364
+#: proposals/models.py:363
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:376
+#: proposals/models.py:375
 msgid ""
 "Kan voor alle deelnemersgroepen dezelfde informatiebrief en         "
 "toestemmingsverklaring gebruikt worden?"
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:378
+#: proposals/models.py:377
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
 "sprake van in essentie hetzelfde traject, en voldoet één set documenten voor "
@@ -1767,19 +1612,19 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:394
+#: proposals/models.py:393
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:412
+#: proposals/models.py:411
 msgid ""
 "Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de "
 "privacy officer."
 msgstr ""
-"I discussed my application and documents for participants with the "
-"privacy officer."
+"I discussed my application and documents for participants with the privacy "
+"officer."
 
-#: proposals/models.py:411
+#: proposals/models.py:418
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
 "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het "
@@ -1789,24 +1634,24 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:423 proposals/utils/pdf_diff_logic.py:990
-#: reviews/models.py:188
+#: proposals/models.py:430 proposals/utils/pdf_diff_logic.py:990
+#: reviews/models.py:189
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:435
+#: proposals/models.py:442
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:440 reviews/forms.py:110
+#: proposals/models.py:447 reviews/forms.py:110
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:445
+#: proposals/models.py:452
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:451
+#: proposals/models.py:458
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
 "kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden."
@@ -1815,23 +1660,23 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:465
+#: proposals/models.py:472
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:473
+#: proposals/models.py:480
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:480
+#: proposals/models.py:487
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:487
+#: proposals/models.py:494
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:494
+#: proposals/models.py:501
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
 "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met "
@@ -1845,7 +1690,7 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:511
+#: proposals/models.py:518
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
 "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
@@ -1854,13 +1699,13 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:518
+#: proposals/models.py:525
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:166
 msgid "Promotor/Begeleider"
 msgstr "Promotor/Supervisor"
 
-#: proposals/models.py:521
+#: proposals/models.py:528
 msgid ""
 "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
 "                    naar je promotor of begeleider gestuurd worden. Deze "
@@ -1890,53 +1735,53 @@ msgstr ""
 "you wait for them to do this, but remember to come back and fill in this "
 "field before submitting."
 
-#: proposals/models.py:548
+#: proposals/models.py:555
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:620
+#: proposals/models.py:627
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:620 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:627 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:626
+#: proposals/models.py:633
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:631
+#: proposals/models.py:638
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:633
+#: proposals/models.py:640
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:635
+#: proposals/models.py:642
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:723
+#: proposals/models.py:730
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:724
+#: proposals/models.py:731
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:725
+#: proposals/models.py:732
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:729
+#: proposals/models.py:736
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1944,11 +1789,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:743
+#: proposals/models.py:750
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:749
+#: proposals/models.py:756
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1956,7 +1801,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:751
+#: proposals/models.py:758
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1977,7 +1822,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:767
+#: proposals/models.py:774
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1986,15 +1831,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:774
+#: proposals/models.py:781
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:779
+#: proposals/models.py:786
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:817
+#: proposals/models.py:824
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2516,31 +2361,31 @@ msgstr ""
 #: proposals/templates/proposals/proposal_pdf.html:87
 #, python-format
 msgid ""
-"FETC-GW - <em>%(title)s</em> (referentienummer %(reference_number)s, "
-"ingediend door %(submitter)s)"
+"FETC-GW - <em>%(title)s</em> (referentienummer %(reviewing_committee)s-"
+"%(reference_number)s, ingediend door %(submitter)s)"
 msgstr ""
-"FEtC-H - <em>%(title)s</em> (reference number %(reference_number)s, "
-"submitted by %(submitter)s)"
+"FEtC-H - <em>%(title)s</em> (reference number %(reviewing_committee)s-"
+"%(reference_number)s, submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:94
+#: proposals/templates/proposals/proposal_pdf.html:93
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:110
+#: proposals/templates/proposals/proposal_pdf.html:109
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:114
+#: proposals/templates/proposals/proposal_pdf.html:113
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:117
+#: proposals/templates/proposals/proposal_pdf.html:116
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:119
+#: proposals/templates/proposals/proposal_pdf.html:118
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
@@ -3273,7 +3118,7 @@ msgstr ""
 "This section was present in the original application, but was removed for "
 "the revision."
 
-#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:130
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:131
 msgid "Onbekend"
 msgstr "Unknown"
 
@@ -3412,10 +3257,6 @@ msgstr "Overview of task-based research: session {} (trajectory {})"
 msgid "AVG en Data Management"
 msgstr "AVG and Data Management"
 
-#: proposals/validators.py:35
-msgid "Je dient deze vraag in te vullen om jouw aanvraag in te dienen"
-msgstr "You must answer this question before you can submit your application"
-
 #: proposals/views/proposal_views.py:45
 msgid "Publiek archief"
 msgstr "Public archive"
@@ -3514,11 +3355,11 @@ msgstr "Route"
 msgid "Start datum"
 msgstr "Start date review"
 
-#: reviews/forms.py:14 reviews/models.py:146
+#: reviews/forms.py:14 reviews/models.py:147
 msgid "korte (2-weken) route"
 msgstr "short (2-week) route"
 
-#: reviews/forms.py:15 reviews/models.py:145
+#: reviews/forms.py:15 reviews/models.py:146
 msgid "lange (4-weken) route"
 msgstr "long (4-week) route"
 
@@ -3650,24 +3491,24 @@ msgstr "Post hoc negative advice by FETC-H"
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:182
+#: reviews/models.py:51 reviews/models.py:183
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:147
+#: reviews/models.py:148
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:176
+#: reviews/models.py:177
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:177
+#: reviews/models.py:178
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:178
+#: reviews/models.py:179
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
 
@@ -4367,57 +4208,57 @@ msgstr "Edit start date"
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:75
+#: reviews/utils/review_utils.py:82
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:125
+#: reviews/utils/review_utils.py:132
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:219
+#: reviews/utils/review_utils.py:231
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:233
+#: reviews/utils/review_utils.py:245
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:282
+#: reviews/utils/review_utils.py:294
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:297
+#: reviews/utils/review_utils.py:309
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:313
+#: reviews/utils/review_utils.py:325
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:339
+#: reviews/utils/review_utils.py:351
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:342
+#: reviews/utils/review_utils.py:354
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:345
+#: reviews/utils/review_utils.py:357
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:348
+#: reviews/utils/review_utils.py:360
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:351
+#: reviews/utils/review_utils.py:363
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4425,7 +4266,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:357
+#: reviews/utils/review_utils.py:369
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4435,7 +4276,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:361
+#: reviews/utils/review_utils.py:373
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4445,7 +4286,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:368
+#: reviews/utils/review_utils.py:380
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4456,14 +4297,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:385
+#: reviews/utils/review_utils.py:397
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:389
+#: reviews/utils/review_utils.py:401
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4471,7 +4312,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:391
+#: reviews/utils/review_utils.py:403
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4481,11 +4322,11 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:396
+#: reviews/utils/review_utils.py:408
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:417
+#: reviews/utils/review_utils.py:429
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""

From aeae91ef9170553a12050d21855220048a49a6de Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Tue, 21 Nov 2023 16:06:45 +0100
Subject: [PATCH 089/148] fix: added merge migration to resolve conflicts

---
 proposals/migrations/0051_merge_20231121_1606.py | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 proposals/migrations/0051_merge_20231121_1606.py

diff --git a/proposals/migrations/0051_merge_20231121_1606.py b/proposals/migrations/0051_merge_20231121_1606.py
new file mode 100644
index 000000000..0ef8b45a1
--- /dev/null
+++ b/proposals/migrations/0051_merge_20231121_1606.py
@@ -0,0 +1,14 @@
+# Generated by Django 3.2.23 on 2023-11-21 15:06
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0050_alter_proposal_other_applicants'),
+        ('proposals', '0050_auto_20231116_1413'),
+    ]
+
+    operations = [
+    ]

From 9a5c417d5d5ea46b3672b6b4aaef24a64a7af9ad Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 21 Nov 2023 16:09:26 +0100
Subject: [PATCH 090/148] changed email contents + fixed tests

---
 .../templates/mail/all_decisions_notify.txt   |  8 ++++++--
 reviews/tests.py                              |  4 ++--
 reviews/utils/review_utils.py                 | 20 +++++++++++++++----
 3 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/reviews/templates/mail/all_decisions_notify.txt b/reviews/templates/mail/all_decisions_notify.txt
index 5c2847a58..a7ab55478 100644
--- a/reviews/templates/mail/all_decisions_notify.txt
+++ b/reviews/templates/mail/all_decisions_notify.txt
@@ -1,7 +1,7 @@
 {% extends "mail/base-internal.txt" %}
 
 {% block content %}
-Alle beoordelingen zijn toegevoegd bij de aanvraag {{ proposal.reference_number }}.
+Alle beoordelingen zijn toegevoegd bij de aanvraag {{ review.proposal.reference_number }}.
 
 De review is klaar om afgesloten te worden.
 
@@ -9,6 +9,10 @@ Overzicht beoordelingen:
 {% for decision in decisions %}
 Beoordelaar: {{ decision.reviewer.get_full_name }}
 Beoordeling: {{ decision.get_go_display }}
-Opmerkingen: {{ decision.comments|default:"geen"|safe }}
 {% endfor %}
+
+Detailpagina: {{ review_detail_page }}
+
+Review afsluiten: {{ close_review_page }}
+
 {% endblock %}
diff --git a/reviews/tests.py b/reviews/tests.py
index 60a4de5dc..9d619aef2 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -247,8 +247,8 @@ def test_decision_commission(self):
         self.assertEqual(review.go, False)  # no go
 
         notify_secretary(decisions[1])
-        self.assertEqual(len(mail.outbox), 3)
-        self.assertIn(c, mail.outbox[2].body)
+        self.assertEqual(len(mail.outbox), 4)
+        self.assertIn(c, mail.outbox[3].body)
 
         decisions[1].go = Decision.APPROVED
         decisions[1].save()
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 5295b304c..4b2911d5d 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -5,7 +5,7 @@
 from django.core.mail import send_mail
 from django.urls import reverse
 from django.template.loader import render_to_string
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import activate, get_language, ugettext_lazy as _
 from django.utils import timezone
 
 from main.models import YES, DOUBT
@@ -308,17 +308,29 @@ def notify_secretary_all_decisions(review):
     """
     Notifies a secretary all Decisions have been made for a certain review
     """
+    # Change language to Dutch for this e-mail, but save the current language to reset it later
+    current_language = get_language()
+    activate("nl")
+
     secretary = get_secretary()
     subject = "FETC-GW {}: alle beoordelingen toegevoegd".format(
         review.proposal.committee_prefixed_refnum(),
     )
     params = {
         "secretary": secretary.get_full_name(),
-        "proposal": review.proposal,
-        "decisions": review.decision_set.all()
+        "review": review,
+        "decisions": review.decision_set.all(),
+        "review_detail_page": settings.BASE_URL
+        + (reverse("reviews:detail", args=[review.pk])),
+        "close_review_page": settings.BASE_URL
+        + (reverse("reviews:close", args=[review.pk])),
     }
     msg_plain = render_to_string("mail/all_decisions_notify.txt", params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, ['fetc-gw@uu.nl'])
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, ["fetc-gw@uu.nl"])
+
+    # Reset the current language
+    activate(current_language)
+
 
 def notify_supervisor_nogo(decision):
     secretary = get_secretary()

From 2807b93a4b027376ce2330a85f4ef23171bc4d24 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 22 Nov 2023 11:35:47 +0100
Subject: [PATCH 091/148] changed email recipient to npm

---
 reviews/utils/review_utils.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 4b2911d5d..0eef5b54e 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -326,7 +326,7 @@ def notify_secretary_all_decisions(review):
         + (reverse("reviews:close", args=[review.pk])),
     }
     msg_plain = render_to_string("mail/all_decisions_notify.txt", params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, ["fetc-gw@uu.nl"])
+    send_mail(subject, msg_plain, settings.EMAIL_FROM, [settings.EMAIL_FROM])
 
     # Reset the current language
     activate(current_language)

From 1cbc8ec4070a0cd65f336c23059da8f85b9b201a Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 21 Nov 2023 14:14:27 +0100
Subject: [PATCH 092/148] Refactor of all choices in reviews/models.py

---
 main/views.py                               |  2 +-
 proposals/api/views.py                      |  2 +-
 proposals/models.py                         |  4 +-
 proposals/utils/statistics_utils.py         |  2 +-
 reviews/api/views.py                        | 58 +++++++-------
 reviews/forms.py                            |  4 +-
 reviews/migrations/0003_decision_go_char.py |  8 +-
 reviews/models.py                           | 85 ++++++++-------------
 reviews/tests.py                            | 24 +++---
 reviews/utils/review_actions.py             |  6 +-
 reviews/utils/review_utils.py               |  8 +-
 reviews/views.py                            | 36 ++++-----
 12 files changed, 110 insertions(+), 129 deletions(-)

diff --git a/main/views.py b/main/views.py
index 0a4a89c16..c4d13e7fa 100644
--- a/main/views.py
+++ b/main/views.py
@@ -112,7 +112,7 @@ def get_user_reviews(self):
         """Returns all Committee Reviews of this user"""
         reviews = {}
         objects = Review.objects.filter(
-            stage__gte=Review.ASSIGNMENT,
+            stage__gte=Review.Stages.ASSIGNMENT,
             proposal__status__gte=Proposal.SUBMITTED,
             proposal__created_by=self.get_object()
         )
diff --git a/proposals/api/views.py b/proposals/api/views.py
index af99992d9..059d6357b 100644
--- a/proposals/api/views.py
+++ b/proposals/api/views.py
@@ -55,7 +55,7 @@ def get_context(self):
             'DECISION_MADE': Proposal.DECISION_MADE,
         }
         context['review'] = {
-            'REVISION': Review.REVISION,
+            'REVISION': Review.Continuations.REVISION,
         }
         context['user_pk'] = self.request.user.pk
 
diff --git a/proposals/models.py b/proposals/models.py
index 09749e2b0..c0576899a 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -641,7 +641,7 @@ def supervisor_decision(self):
         if self.supervisor and self.status == Proposal.SUBMITTED_TO_SUPERVISOR:
             decisions = Decision.objects.filter(
                 review__proposal=self,
-                review__stage=Review.SUPERVISOR
+                review__stage=Review.Stages.SUPERVISOR
             ).order_by('-pk')
 
             if decisions:
@@ -672,7 +672,7 @@ def mark_reviewed(self, continuation, time=None):
         # Importing here to prevent circular import
         from reviews.models import Review
         self.status_review = continuation in [
-            Review.GO, Review.GO_POST_HOC
+            Review.Continuations.GO, Review.Continuations.GO_POST_HOC
         ]
         self.date_reviewed = time
         self.generate_pdf()
diff --git a/proposals/utils/statistics_utils.py b/proposals/utils/statistics_utils.py
index 2aeb6c230..c15f5e803 100644
--- a/proposals/utils/statistics_utils.py
+++ b/proposals/utils/statistics_utils.py
@@ -57,7 +57,7 @@ def get_review_qs_for_proposals(proposal_data: QuerySet) -> QuerySet:
     return Review.objects.filter(
         proposal__in=proposal_data,
     ).exclude(
-        stage=Review.SUPERVISOR,
+        stage=Review.Stages.SUPERVISOR,
         date_end=None,
     )
 
diff --git a/reviews/api/views.py b/reviews/api/views.py
index 37d5aa0a8..881eb348e 100644
--- a/reviews/api/views.py
+++ b/reviews/api/views.py
@@ -61,12 +61,12 @@ def get_context(self):
 
         context['is_secretary'] = is_secretary(self.request.user)
         context['review'] = {
-            'ASSIGNMENT': Review.ASSIGNMENT,
-            'COMMISSION': Review.COMMISSION,
-            'CLOSING': Review.CLOSING,
-            'CLOSED': Review.CLOSED,
-            'GO': Review.GO,
-            'GO_POST_HOC': Review.GO_POST_HOC,
+            'ASSIGNMENT': Review.Stages.ASSIGNMENT,
+            'COMMISSION': Review.Stages.COMMISSION,
+            'CLOSING': Review.Stages.CLOSING,
+            'CLOSED': Review.Stages.CLOSED,
+            'GO': Review.Continuations.GO,
+            'GO_POST_HOC': Review.Continuations.GO_POST_HOC,
         }
         context['current_user_pk'] = self.request.user.pk
 
@@ -96,7 +96,7 @@ def get_queryset_for_committee(self):
         objects = Decision.objects.filter(
             reviewer=self.request.user,
             review__proposal__reviewing_committee=self.committee,
-            review__continuation__lt=Review.DISCONTINUED,
+            review__continuation__lt=Review.Continuations.DISCONTINUED,
         )
 
         for obj in objects:
@@ -119,7 +119,7 @@ def get_queryset_for_secretary(self):
         objects = Decision.objects.filter(
             reviewer__groups__name=settings.GROUP_SECRETARY,
             review__proposal__reviewing_committee=self.committee,
-            review__continuation__lt=Review.DISCONTINUED,
+            review__continuation__lt=Review.Continuations.DISCONTINUED,
         )
 
         for obj in objects:
@@ -172,7 +172,7 @@ def get_queryset_for_committee(self):
             reviewer=self.request.user,
             go='',
             review__proposal__reviewing_committee=self.committee,
-            review__continuation__lt=Review.DISCONTINUED,
+            review__continuation__lt=Review.Continuations.DISCONTINUED,
         )
 
         for obj in objects:
@@ -196,7 +196,7 @@ def get_queryset_for_secretary(self):
             reviewer__groups__name=settings.GROUP_SECRETARY,
             go='',
             review__proposal__reviewing_committee=self.committee,
-            review__continuation__lt=Review.DISCONTINUED,
+            review__continuation__lt=Review.Continuations.DISCONTINUED,
         )
 
         for obj in objects:
@@ -238,8 +238,8 @@ def get_queryset(self):
         objects = Decision.objects.filter(
             go='',
             review__proposal__reviewing_committee=self.committee,
-            review__continuation__lt=Review.DISCONTINUED,
-        ).exclude(review__stage=Review.SUPERVISOR)
+            review__continuation__lt=Review.Continuations.DISCONTINUED,
+        ).exclude(review__stage=Review.Stages.SUPERVISOR)
 
         for obj in objects:
             proposal = obj.review.proposal
@@ -292,7 +292,7 @@ def get_queryset(self):
         """
         objects = Decision.objects.filter(
             go='',
-            review__stage=Review.SUPERVISOR,
+            review__stage=Review.Stages.SUPERVISOR,
             review__proposal__status=Proposal.SUBMITTED_TO_SUPERVISOR,
             review__proposal__reviewing_committee=self.committee
         )
@@ -354,13 +354,13 @@ def get_context(self):
 
         context['is_secretary'] = is_secretary(self.request.user)
         context['review'] = {
-            'ASSIGNMENT': Review.ASSIGNMENT,
-            'COMMISSION': Review.COMMISSION,
-            'CLOSING': Review.CLOSING,
-            'CLOSED': Review.CLOSED,
-            'GO': Review.GO,
-            'GO_POST_HOC': Review.GO_POST_HOC,
-            'REVISION': Review.REVISION,
+            'ASSIGNMENT': Review.Stages.ASSIGNMENT,
+            'COMMISSION': Review.Stages.COMMISSION,
+            'CLOSING': Review.Stages.CLOSING,
+            'CLOSED': Review.Stages.CLOSED,
+            'GO': Review.Continuations.GO,
+            'GO_POST_HOC': Review.Continuations.GO_POST_HOC,
+            'REVISION': Review.Continuations.REVISION,
 
         }
         context['current_user_pk'] = self.request.user.pk
@@ -375,13 +375,13 @@ def get_queryset(self):
         """Returns all open Committee Decisions of all Users"""
         reviews = {}
         objects = Review.objects.filter(
-            stage__gte=Review.CLOSING,
+            stage__gte=Review.Stages.CLOSING,
             proposal__status__gte=Proposal.SUBMITTED,
             proposal__date_confirmed=None,
             proposal__reviewing_committee=self.committee,
         ).filter(
-            Q(continuation=Review.GO) |
-            Q(continuation=Review.GO_POST_HOC) |
+            Q(continuation=Review.Continuations.GO) |
+            Q(continuation=Review.Continuations.GO_POST_HOC) |
             Q(continuation=None)
         ).select_related(
             'proposal',
@@ -420,15 +420,15 @@ def get_queryset(self):
         # that the review of its parent is "in revision"
         revision_reviews = Review.objects.filter(
             proposal__is_revision=True,    # Not a copy
-            stage__gte=Review.ASSIGNMENT,  # Not a supervisor review
+            stage__gte=Review.Stages.ASSIGNMENT,  # Not a supervisor review
         )
         # 2. Get candidate reviews:
         # All reviews whose conclusion is "revision necessary"
         # that are in the current committee
         candidates = Review.objects.filter(
             proposal__reviewing_committee=self.committee,
-            stage=Review.CLOSED,
-            continuation=Review.REVISION,
+            stage=Review.Stages.CLOSED,
+            continuation=Review.Continuations.REVISION,
         )
         # 3. Finally, exclude candidates whose proposal
         # has a child with a revision review
@@ -461,8 +461,8 @@ def get_queryset(self):
         """Returns all open Reviews"""
         reviews = OrderedDict()
         objects = Review.objects.filter(
-            stage__gte=Review.ASSIGNMENT,
-            stage__lte=Review.CLOSING,
+            stage__gte=Review.Stages.ASSIGNMENT,
+            stage__lte=Review.Stages.CLOSING,
             proposal__status__gte=Proposal.SUBMITTED,
             proposal__reviewing_committee=self.committee,
         ).select_related(
@@ -508,7 +508,7 @@ def get_queryset(self):
         """Returns all open Committee Decisions of all Users"""
         reviews = OrderedDict()
         objects = Review.objects.filter(
-            stage__gte=Review.ASSIGNMENT,
+            stage__gte=Review.Stages.ASSIGNMENT,
             proposal__status__gte=Proposal.SUBMITTED,
             proposal__reviewing_committee=self.committee,
         ).select_related(
diff --git a/reviews/forms.py b/reviews/forms.py
index 39ab86608..f7b66609f 100644
--- a/reviews/forms.py
+++ b/reviews/forms.py
@@ -102,7 +102,7 @@ def __init__(self, *args, **kwargs):
         allow_long_route_continuation = kwargs.pop('allow_long_route_continuation', False)
         super(ReviewCloseForm, self).__init__(*args, **kwargs)
         if not allow_long_route_continuation:
-            self.fields['continuation'].choices = [x for x in Review.CONTINUATIONS if x[0] != Review.LONG_ROUTE]
+            self.fields['continuation'].choices = [x for x in Review.Continuations.choices if x != Review.Continuations.LONG_ROUTE]
 
         self.fields['in_archive'].label = _('Voeg deze aanvraag toe aan het archief')
         self.fields['in_archive'].widget = forms.RadioSelect(choices=YES_NO)
@@ -145,7 +145,7 @@ def __init__(self, *args, **kwargs):
         """Removes the empty label for the go field, and sets it as required"""
         super(DecisionForm, self).__init__(*args, **kwargs)
         self.fields['go'].empty_label = None
-        self.fields['go'].choices = Decision.APPROVAL
+        self.fields['go'].choices = Decision.Approval.choices
         self.fields['go'].required = True
 
 class StartEndDateForm(forms.Form):
diff --git a/reviews/migrations/0003_decision_go_char.py b/reviews/migrations/0003_decision_go_char.py
index 5b82ec488..7df471ad0 100644
--- a/reviews/migrations/0003_decision_go_char.py
+++ b/reviews/migrations/0003_decision_go_char.py
@@ -14,9 +14,9 @@ def forwards(apps, schema_editor):
         if decision.go is None:
             decision.go_char = ''
         elif decision.go:
-            decision.go_char = Decision.APPROVED
+            decision.go_char = Decision.Approval.APPROVED
         else:
-            decision.go_char = Decision.NOT_APPROVED
+            decision.go_char = Decision.Approval.NOT_APPROVED
 
         decision.save()
 
@@ -26,9 +26,9 @@ def backwards(apps, schema_editor):
         return
 
     for decision in apps.get_model('reviews', 'decision').objects.all():
-        if decision.go_char == Decision.APPROVED:
+        if decision.go_char == Decision.Approval.APPROVED:
             decision.go = True
-        elif decision.go_char == Decision.NOT_APPROVED:
+        elif decision.go_char == Decision.Approval.NOT_APPROVED:
             decision.go = False
         else:
             decision.go = None
diff --git a/reviews/models.py b/reviews/models.py
index 20825474a..e376c3081 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -8,39 +8,25 @@
 
 
 class Review(models.Model):
-    SUPERVISOR = 0
-    ASSIGNMENT = 1
-    COMMISSION = 2
-    CLOSING = 3
-    CLOSED = 4
-    STAGES = (
-        (SUPERVISOR, _('Beoordeling door eindverantwoordelijke')),
-        (ASSIGNMENT, _('Aanstelling commissieleden')),
-        (COMMISSION, _('Beoordeling door commissie')),
-        (CLOSING, _('Afsluiting door secretaris')),
-        (CLOSED, _('Afgesloten')),
-    )
-
-    GO = 0
-    REVISION = 1
-    NO_GO = 2
-    LONG_ROUTE = 3
-    METC = 4
-    GO_POST_HOC = 5
-    NO_GO_POST_HOC = 6
-    DISCONTINUED = 7
-    CONTINUATIONS = (
-        (GO, _('Goedkeuring door FETC-GW')),
-        (REVISION, _('Revisie noodzakelijk')),
-        (NO_GO, _('Afwijzing door FETC-GW')),
-        (LONG_ROUTE, _('Open review met lange (4-weken) route')),
-        (METC, _('Laat opnieuw beoordelen door METC')),
-        (GO_POST_HOC, _('Positief advies van FETC-GW, post-hoc')),
-        (NO_GO_POST_HOC, _('Negatief advies van FETC-GW, post-hoc')),
-        (DISCONTINUED, _('Niet verder in behandeling genomen')),
-    )
 
-    stage = models.PositiveIntegerField(choices=STAGES, default=SUPERVISOR)
+    class Stages(models.IntegerChoices):
+        SUPERVISOR = 0, _('Beoordeling door eindverantwoordelijke')
+        ASSIGNMENT = 1, _('Aanstelling commissieleden')
+        COMMISSION = 2, _('Beoordeling door commissie')
+        CLOSING = 3, _('Afsluiting door secretaris')
+        CLOSED = 4, _('Afgesloten')
+
+    class Continuations(models.IntegerChoices):
+        GO = 0, _('Goedkeuring door FETC-GW')
+        REVISION = 1, _('Revisie noodzakelijk')
+        NO_GO = 2, _('Afwijzing door FETC-GW')
+        LONG_ROUTE = 3, _('Open review met lange (4-weken) route')
+        METC = 4, _('Laat opnieuw beoordelen door METC')
+        GO_POST_HOC = 5, _('Positief advies van FETC-GW, post-hoc')
+        NO_GO_POST_HOC = 6, _('Negatief advies van FETC-GW, post-hoc')
+        DISCONTINUED = 7, _('Niet verder in behandeling genomen')
+
+    stage = models.PositiveIntegerField(choices=Stages.choices, default=Stages.SUPERVISOR)
     short_route = models.BooleanField(
         _('Route'),
         default=None,
@@ -55,8 +41,8 @@ class Review(models.Model):
     )
     continuation = models.PositiveIntegerField(
         _('Afhandeling'),
-        choices=CONTINUATIONS,
-        default=GO,
+        choices=Continuations.choices,
+        default=Continuations.GO,
     )
 
     date_start = models.DateTimeField()
@@ -76,7 +62,7 @@ def update_go(self, last_decision=None):
         """
 
         # If this review is discontinued, it is set in stone
-        if self.continuation == self.DISCONTINUED:
+        if self.continuation == self.Continuations.DISCONTINUED:
             return
 
         all_decisions = self.decision_set.count()
@@ -85,7 +71,7 @@ def update_go(self, last_decision=None):
         for decision in self.decision_set.all():
             if decision.go != '':
                 closed_decisions += 1
-                final_go &= decision.go == Decision.APPROVED
+                final_go &= decision.go == Decision.Approval.APPROVED
 
         if all_decisions == closed_decisions:
             self.go = final_go
@@ -103,7 +89,7 @@ def update_go(self, last_decision=None):
                     # in an uWSGI environment, in which it errors.
                     from reviews.utils import start_assignment_phase
                     start_assignment_phase(self.proposal)
-                    self.stage = self.CLOSED
+                    self.stage = self.Stages.CLOSED
                 # On NO-GO, reset the Proposal status
                 else:
                     # See comment above
@@ -114,7 +100,7 @@ def update_go(self, last_decision=None):
             # For a review by commission:
             else:
                 # Set the stage to CLOSING
-                self.stage = self.CLOSING
+                self.stage = self.Stages.CLOSING
                 self.save()
         else:
             # In case there is still an unmade decision, make sure to
@@ -127,14 +113,11 @@ def get_continuation_display(self):
         # If this review hasn't concluded, this will only return 'Approved' as
         # this is the default. Thus, we return 'unknown' if we are still pre-
         # conclusion.
-        if self.stage <= Review.COMMISSION:
+        if self.stage <= Review.Stages.COMMISSION:
             return _("Onbekend")
 
         # Get the human readable string
-        continuation = dict(self.CONTINUATIONS).get(
-            self.continuation,
-            self.continuation
-        )
+        continuation = dict(self.Continuations.choices)[self.continuation]
 
         if self.proposal.has_minor_revision:
             continuation += str(_(', met revisie'))
@@ -170,21 +153,19 @@ def __str__(self):
 
 
 class Decision(models.Model):
-    APPROVED = 'Y'
-    NOT_APPROVED = 'N'
-    NEEDS_REVISION = '?'
-    APPROVAL = (
-        (APPROVED, _('goedgekeurd')),
-        (NOT_APPROVED, _('niet goedgekeurd')),
-        (NEEDS_REVISION, _('revisie noodzakelijk')),
-    )
+    class Approval(models.TextChoices):
+        APPROVED = 'Y', _('goedgekeurd')
+        NOT_APPROVED = 'N', _('niet goedgekeurd')
+        NEEDS_REVISION = '?', _('revisie noodzakelijk')
 
     go = models.CharField(
         _('Beslissing'),
         max_length=1,
-        choices=APPROVAL,
+        choices=Approval.choices,
         blank=True)
+    
     date_decision = models.DateTimeField(blank=True, null=True)
+
     comments = models.TextField(
         _('Ruimte voor eventuele opmerkingen'),
         blank=True)
diff --git a/reviews/tests.py b/reviews/tests.py
index 60a4de5dc..ed9839527 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -153,7 +153,7 @@ def test_start_supervisor_review(self):
         """
         # If the Relation on a Proposal requires a supervisor, a Review for the supervisor should be started.
         review = start_review(self.proposal)
-        self.assertEqual(review.stage, Review.SUPERVISOR)
+        self.assertEqual(review.stage, Review.Stages.SUPERVISOR)
         self.assertEqual(review.is_committee_review, False)
         self.assertEqual(Decision.objects.filter(reviewer=self.supervisor).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
@@ -170,7 +170,7 @@ def test_start_review(self):
         self.proposal.save()
 
         review = start_review(self.proposal)
-        self.assertEqual(review.stage, Review.ASSIGNMENT)
+        self.assertEqual(review.stage, Review.Stages.ASSIGNMENT)
         self.assertEqual(review.is_committee_review, True)
         self.assertEqual(Decision.objects.filter(reviewer=self.secretary).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
@@ -194,7 +194,7 @@ def test_decision_supervisor(self):
         mail.outbox = []
 
         decision = Decision.objects.filter(review=review)[0]
-        decision.go = Decision.APPROVED
+        decision.go = Decision.Approval.APPROVED
         decision.save()
         review.refresh_from_db()
         self.assertEqual(review.go, True)
@@ -221,12 +221,12 @@ def test_decision_commission(self):
         self.proposal.relation = Relation.objects.get(pk=5)
         self.proposal.save()
         review = start_review(self.proposal)
-        self.assertEqual(review.stage, Review.ASSIGNMENT)
+        self.assertEqual(review.stage, Review.Stages.ASSIGNMENT)
         self.assertEqual(review.go, None)
 
         # Create a Decision for a member of the commission group
         Decision.objects.create(review=review, reviewer=self.c1)
-        review.stage = Review.COMMISSION
+        review.stage = Review.Stages.COMMISSION
         review.refresh_from_db()
 
         self.assertEqual(len(mail.outbox), 2)
@@ -234,12 +234,12 @@ def test_decision_commission(self):
         decisions = Decision.objects.filter(review=review)
         self.assertEqual(len(decisions), 2)
 
-        decisions[0].go = Decision.APPROVED
+        decisions[0].go = Decision.Approval.APPROVED
         decisions[0].save()
         review.refresh_from_db()
         self.assertEqual(review.go, None)  # undecided
 
-        decisions[1].go = Decision.NOT_APPROVED
+        decisions[1].go = Decision.Approval.NOT_APPROVED
         c = 'Let\'s test "escaping" of < and >'
         decisions[1].comments = c
         decisions[1].save()
@@ -250,7 +250,7 @@ def test_decision_commission(self):
         self.assertEqual(len(mail.outbox), 3)
         self.assertIn(c, mail.outbox[2].body)
 
-        decisions[1].go = Decision.APPROVED
+        decisions[1].go = Decision.Approval.APPROVED
         decisions[1].save()
         review.refresh_from_db()
         self.assertEqual(review.go, True)  # go
@@ -413,7 +413,7 @@ def test_decision(self):
         previous_review_date = copy(self.proposal.date_reviewed)
         form_values = {
             # We choose GO_POST_HOC because GO (0) is already the default
-            "continuation": self.review.GO_POST_HOC,
+            "continuation": self.review.Continuations.GO_POST_HOC,
         }
         self.client.force_login(self.secretary)
         page = self.post(form_values)
@@ -438,7 +438,7 @@ def test_long_route(self):
         self.review.short_route = True
         self.review.save()
         form_values = {
-            "continuation": self.review.LONG_ROUTE,
+            "continuation": self.review.Continuations.LONG_ROUTE,
         }
         self.client.force_login(self.secretary)
         page = self.post(form_values)
@@ -446,7 +446,7 @@ def test_long_route(self):
         # Assertions
         self.assertEqual(
             self.review.stage,
-            self.review.CLOSED,
+            self.review.Stages.CLOSED,
         )
         # A new review should have been created
         # with a decision
@@ -463,7 +463,7 @@ def test_metc(self):
         """When posted with review.METC, check that proposal is turned back
         into a Draft and its WMO gets flagged."""
         form_values = {
-            "continuation": self.review.METC,
+            "continuation": self.review.Continuations.METC,
         }
         self.client.force_login(self.secretary)
         self.post(form_values)
diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py
index 41801ca66..14d4cf5c0 100644
--- a/reviews/utils/review_actions.py
+++ b/reviews/utils/review_actions.py
@@ -199,9 +199,9 @@ def is_available(self):
         if not settings.GROUP_SECRETARY in user_groups:
             return False
 
-        if self.review.stage not in [Review.REVISION,
-                                     Review.NO_GO,
-                                     Review.CLOSING,
+        if self.review.stage not in [Review.Continuations.REVISION,
+                                     Review.Continuations.NO_GO,
+                                     Review.Stages.CLOSING,
                                      ]:
             return False
 
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index d0a568fd0..157d27ee8 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -41,7 +41,7 @@ def start_supervisor_phase(proposal):
     - send an e-mail to other applicants
     """
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
-    review.stage = Review.SUPERVISOR
+    review.stage = Review.Stages.SUPERVISOR
     review.is_committee_review = False
     review.save()
 
@@ -106,7 +106,7 @@ def start_assignment_phase(proposal):
     short_route = len(reasons) == 0
 
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
-    review.stage = Review.ASSIGNMENT
+    review.stage = Review.Stages.ASSIGNMENT
     review.short_route = short_route
 
     if short_route:
@@ -169,7 +169,7 @@ def remind_reviewers():
     next_two_days = today + datetime.timedelta(days=2)
 
     decisions = Decision.objects.filter(
-        review__stage=Review.COMMISSION,
+        review__stage=Review.Stages.COMMISSION,
         review__short_route=True,
         review__date_should_end__gte=today,
         review__date_should_end__lte=next_two_days,
@@ -204,7 +204,7 @@ def start_review_pre_assessment(proposal):
     :param proposal: the current Proposal
     """
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
-    review.stage = Review.ASSIGNMENT
+    review.stage = Review.Stages.ASSIGNMENT
     review.short_route = True
     review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.PREASSESSMENT_ROUTE_WEEKS)
     review.save()
diff --git a/reviews/views.py b/reviews/views.py
index 260438ca5..cfd42a8be 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -143,7 +143,7 @@ def get_all_open_decisions(self):
         open_decisions = (
             self.get_committee_decisions()
             .filter(
-                review__stage=Review.COMMISSION,
+                review__stage=Review.Stages.COMMISSION,
             )
             .order_by("reviewer", "review__date_start")
         )
@@ -160,7 +160,7 @@ def get_review_counts_last_year(self):
         base_filter = Q(
             decision__review__date_start__gt=self.start_date,
             decision__review__date_start__lt=self.end_date,
-            decision__review__stage__gt=Review.SUPERVISOR,
+            decision__review__stage__gt=Review.Stages.SUPERVISOR,
         )
         return reviewers.annotate(
             total=Count("decision", filter=base_filter),
@@ -353,7 +353,7 @@ def form_valid(self, form):
         else:
             # Directly mark this Proposal as closed: applicants should start a revision Proposal
             for decision in Decision.objects.filter(review=review):
-                decision.go = Decision.NEEDS_REVISION
+                decision.go = Decision.Approval.NEEDS_REVISION
                 decision.date_decision = timezone.now()
                 decision.save()
 
@@ -364,9 +364,9 @@ def form_valid(self, form):
             proposal.date_reviewed = timezone.now()
             proposal.save()
 
-            form.instance.continuation = Review.REVISION
+            form.instance.continuation = Review.Continuations.REVISION
             form.instance.date_end = timezone.now()
-            form.instance.stage = Review.CLOSED
+            form.instance.stage = Review.Stages.CLOSED
 
         return super(ReviewAssignView, self).form_valid(form)
 
@@ -434,13 +434,13 @@ def get_initial(self):
         review = self.get_object()
 
         initial = super(ReviewCloseView, self).get_initial()
-        initial["continuation"] = Review.GO if review.go else Review.NO_GO
+        initial["continuation"] = Review.Continuations.GO if review.go else Review.Continuations.NO_GO
 
         if review.proposal.date_start and review.proposal.date_start < date.today():
             initial["continuation"] = (
-                Review.GO_POST_HOC
-                if initial["continuation"] == Review.GO
-                else Review.NO_GO_POST_HOC
+                Review.Continuations.GO_POST_HOC
+                if initial["continuation"] == Review.Continuations.GO
+                else Review.Continuations.NO_GO_POST_HOC
             )
 
         initial["in_archive"] = not review.proposal.is_pre_assessment
@@ -450,18 +450,18 @@ def form_valid(self, form):
         proposal = form.instance.proposal
 
         if form.instance.continuation in [
-            Review.GO,
-            Review.NO_GO,
-            Review.GO_POST_HOC,
-            Review.NO_GO_POST_HOC,
-            Review.REVISION,
+            Review.Continuations.GO,
+            Review.Continuations.NO_GO,
+            Review.Continuations.GO_POST_HOC,
+            Review.Continuations.NO_GO_POST_HOC,
+            Review.Continuations.REVISION,
         ]:
             proposal.mark_reviewed(form.instance.continuation)
-        elif form.instance.continuation == Review.LONG_ROUTE:
+        elif form.instance.continuation == Review.Continuations.LONG_ROUTE:
             # Create a new review
             review = Review.objects.create(
                 proposal=proposal,
-                stage=Review.COMMISSION,
+                stage=Review.Stages.COMMISSION,
                 short_route=False,
                 date_start=timezone.now(),
             )
@@ -469,7 +469,7 @@ def form_valid(self, form):
             Decision.objects.create(review=review, reviewer=get_secretary())
             # Start the long review route
             start_review_route(review, get_reviewers(), False)
-        elif form.instance.continuation == Review.METC:
+        elif form.instance.continuation == Review.Continuations.METC:
             proposal.enforce_wmo()
 
         proposal.in_archive = form.cleaned_data["in_archive"]
@@ -479,7 +479,7 @@ def form_valid(self, form):
         ]
         proposal.save()
 
-        form.instance.stage = Review.CLOSED
+        form.instance.stage = Review.Stages.CLOSED
 
         return super(ReviewCloseView, self).form_valid(form)
 

From a325ff6ca2267ff0fd8a39786bfd5ee47dada4e8 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 22 Nov 2023 15:12:33 +0100
Subject: [PATCH 093/148] Refactor of all choices in main/models.py (incl.
 YES_NO_DOUBT)

---
 docs/_build/html/_modules/core/models.html    |  2 +-
 .../_build/html/_modules/proposals/forms.html | 12 +++----
 .../html/_modules/proposals/models.html       |  8 ++---
 docs/_build/html/_modules/studies/forms.html  | 12 +++----
 docs/_build/html/_modules/studies/models.html | 12 +++----
 main/models.py                                | 35 ++++++++-----------
 proposals/forms.py                            | 14 ++++----
 proposals/models.py                           |  8 ++---
 proposals/tests.py                            |  6 ++--
 proposals/utils/pdf_diff_logic.py             |  4 +--
 proposals/views/wmo_views.py                  |  6 ++--
 reviews/tests.py                              |  6 ++--
 reviews/utils/review_utils.py                 |  8 ++---
 studies/forms.py                              | 20 +++++------
 studies/models.py                             | 12 +++----
 15 files changed, 79 insertions(+), 86 deletions(-)

diff --git a/docs/_build/html/_modules/core/models.html b/docs/_build/html/_modules/core/models.html
index 812faa697..ec2ec10d6 100644
--- a/docs/_build/html/_modules/core/models.html
+++ b/docs/_build/html/_modules/core/models.html
@@ -158,7 +158,7 @@ <h1>Source code for core.models</h1><div class="highlight"><pre>
 <span class="n">YES</span> <span class="o">=</span> <span class="s1">&#39;Y&#39;</span>
 <span class="n">NO</span> <span class="o">=</span> <span class="s1">&#39;N&#39;</span>
 <span class="n">DOUBT</span> <span class="o">=</span> <span class="s1">&#39;?&#39;</span>
-<span class="n">YES_NO_DOUBT</span> <span class="o">=</span> <span class="p">(</span>
+<span class="n">YesNoDoubt.choices</span> <span class="o">=</span> <span class="p">(</span>
     <span class="p">(</span><span class="n">YES</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;ja&#39;</span><span class="p">)),</span>
     <span class="p">(</span><span class="n">NO</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;nee&#39;</span><span class="p">)),</span>
     <span class="p">(</span><span class="n">DOUBT</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;twijfel&#39;</span><span class="p">)),</span>
diff --git a/docs/_build/html/_modules/proposals/forms.html b/docs/_build/html/_modules/proposals/forms.html
index 6581e514d..b0404e95d 100644
--- a/docs/_build/html/_modules/proposals/forms.html
+++ b/docs/_build/html/_modules/proposals/forms.html
@@ -161,7 +161,7 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.forms</span> <span class="k">import</span> <span class="n">ConditionalModelForm</span><span class="p">,</span> <span class="n">SoftValidationMixin</span>
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">NO</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">NO</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YesNoDoubt.choices</span>
 <span class="kn">from</span> <span class="nn">core.utils</span> <span class="k">import</span> <span class="n">YES_NO</span><span class="p">,</span> <span class="n">get_users_as_list</span>
 <span class="kn">from</span> <span class="nn">.models</span> <span class="k">import</span> <span class="n">Proposal</span><span class="p">,</span> <span class="n">Relation</span><span class="p">,</span> <span class="n">Wmo</span>
 <span class="kn">from</span> <span class="nn">.utils</span> <span class="k">import</span> <span class="n">check_local_facilities</span>
@@ -476,11 +476,11 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="nb">super</span><span class="p">(</span><span class="n">WmoForm</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;metc&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;metc&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;metc&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span></div>
 
 <div class="viewcode-block" id="WmoForm.clean"><a class="viewcode-back" href="../../reference/proposals.forms.html#proposals.forms.WmoForm.clean">[docs]</a>    <span class="k">def</span> <span class="nf">clean</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;</span>
@@ -524,9 +524,9 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="nb">super</span><span class="p">(</span><span class="n">WmoCheckForm</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span></div></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span></div></div>
 
 
 <div class="viewcode-block" id="WmoApplicationForm"><a class="viewcode-back" href="../../reference/proposals.forms.html#proposals.forms.WmoApplicationForm">[docs]</a><span class="k">class</span> <span class="nc">WmoApplicationForm</span><span class="p">(</span><span class="n">ConditionalModelForm</span><span class="p">):</span>
diff --git a/docs/_build/html/_modules/proposals/models.html b/docs/_build/html/_modules/proposals/models.html
index b39325fdd..6eb92e1cd 100644
--- a/docs/_build/html/_modules/proposals/models.html
+++ b/docs/_build/html/_modules/proposals/models.html
@@ -161,7 +161,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YesNoDoubt.choices</span>
 <span class="kn">from</span> <span class="nn">core.validators</span> <span class="k">import</span> <span class="n">MaxWordsValidator</span><span class="p">,</span> <span class="n">validate_pdf_or_doc</span>
 <span class="kn">from</span> <span class="nn">.utils</span> <span class="k">import</span> <span class="n">available_urls</span>
 
@@ -616,7 +616,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Vindt de dataverzameling plaats binnen het UMC Utrecht of </span><span class="se">\</span>
 <span class="s1">andere instelling waar toetsing door een METC verplicht is gesteld?&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
         <span class="n">default</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
     <span class="p">)</span>
@@ -645,7 +645,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
 <span class="s1">onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk </span><span class="se">\</span>
 <span class="s1">onderzoek, 2005, ccmo.nl)&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
     <span class="p">)</span>
 
@@ -659,7 +659,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
 <span class="s1">worden in hun leven zoals het ook had plaatsgevonden zonder de observatie, </span><span class="se">\</span>
 <span class="s1">slechts dan kan &quot;nee&quot; ingevuld worden.&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
     <span class="p">)</span>
 
diff --git a/docs/_build/html/_modules/studies/forms.html b/docs/_build/html/_modules/studies/forms.html
index 80d8d54c7..856f20c00 100644
--- a/docs/_build/html/_modules/studies/forms.html
+++ b/docs/_build/html/_modules/studies/forms.html
@@ -158,7 +158,7 @@ <h1>Source code for studies.forms</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.forms</span> <span class="k">import</span> <span class="n">ConditionalModelForm</span><span class="p">,</span> <span class="n">SoftValidationMixin</span>
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YesNoDoubt.choices</span>
 <span class="kn">from</span> <span class="nn">core.utils</span> <span class="k">import</span> <span class="n">YES_NO</span>
 <span class="kn">from</span> <span class="nn">.models</span> <span class="k">import</span> <span class="n">AgeGroup</span><span class="p">,</span> <span class="n">Documents</span><span class="p">,</span> <span class="n">Study</span>
 <span class="kn">from</span> <span class="nn">.utils</span> <span class="k">import</span> <span class="n">check_necessity_required</span>
@@ -205,7 +205,7 @@ <h1>Source code for studies.forms</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;legally_incapable&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">label</span> <span class="o">=</span> <span class="s2">&quot;Geert&quot;</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;compensation&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;necessity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;necessity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;necessity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;age_groups&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">queryset</span> <span class="o">=</span> <span class="n">AgeGroup</span><span class="o">.</span><span class="n">objects</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span>
             <span class="n">is_active</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span></div>
@@ -349,13 +349,13 @@ <h1>Source code for studies.forms</h1><div class="highlight"><pre>
         <span class="nb">super</span><span class="p">(</span><span class="n">StudyEndForm</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;deception&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;deception&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;deception&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;stressful&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;stressful&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;stressful&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;risk&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;risk&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;risk&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">label</span> <span class="o">=</span> <span class="n">mark_safe</span><span class="p">(</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">label</span><span class="p">)</span>
diff --git a/docs/_build/html/_modules/studies/models.html b/docs/_build/html/_modules/studies/models.html
index 48a066f0e..7815845fd 100644
--- a/docs/_build/html/_modules/studies/models.html
+++ b/docs/_build/html/_modules/studies/models.html
@@ -160,7 +160,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
 
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YES_NO_DOUBT</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YesNoDoubt.choices</span>
 <span class="kn">from</span> <span class="nn">core.validators</span> <span class="k">import</span> <span class="n">validate_pdf_or_doc</span>
 <span class="kn">from</span> <span class="nn">proposals.models</span> <span class="k">import</span> <span class="n">Proposal</span>
 
@@ -312,7 +312,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">of zou u de vraag ook kunnen beantwoorden door volwassen deelnemers </span><span class="se">\</span>
 <span class="s1">te testen?&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">necessity_reason</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Leg uit waarom&#39;</span><span class="p">),</span>
@@ -385,7 +385,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: </span><span class="se">\</span>
 <span class="s1">het gaat hierbij niet om fillers.&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">deception_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Geef een toelichting en beschrijf hoe en wanneer de deelnemer </span><span class="se">\</span>
@@ -398,7 +398,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of </span><span class="se">\</span>
 <span class="s1">(heel) saaie taken.&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">negativity_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Licht uw antwoord toe.&#39;</span><span class="p">),</span>
@@ -417,7 +417,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade </span><span class="se">\</span>
 <span class="s1">door het onderzoek.&#39;</span><span class="p">)),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">stressful_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Licht uw antwoord toe. Geef concrete voorbeelden van de relevante </span><span class="se">\</span>
@@ -447,7 +447,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">inspanning; dit alles, waar relevant, onder begeleiding van adequaat </span><span class="se">\</span>
 <span class="s1">geschoolde specialisten).&#39;</span><span class="p">)),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">risk_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Licht toe&#39;</span><span class="p">),</span>
diff --git a/main/models.py b/main/models.py
index 05f9105a2..109fdcc38 100644
--- a/main/models.py
+++ b/main/models.py
@@ -3,39 +3,32 @@
 from django.db import models
 from django.utils.translation import ugettext_lazy as _
 
-YES = 'Y'
-NO = 'N'
-DOUBT = '?'
-YES_NO_DOUBT = (
-    (YES, _('ja')),
-    (NO, _('nee')),
-    (DOUBT, _('twijfel')),
-)
 
+class YesNoDoubt(models.TextChoices):
+    YES = 'Y', _('ja')
+    NO = 'N', _('nee')
+    DOUBT = '?', _('twijfel')
 
 class SystemMessage(models.Model):
-    URGENT = 1
-    ATTENTION = 2
-    INFO = 3
-    # Not translated, as it's backend only
-    LEVELS = (
-        (URGENT, "Urgent"),
-        (ATTENTION, "Attention"),
-        (INFO, "Info")
-    )
+
+    class Levels(models.IntegerChoices):
+        # Not translated, as it's backend only
+        URGENT = 1, "Urgent"
+        ATTENTION = 2, "Attention"
+        INFO = 3, "Info"
 
     message = models.TextField()
-    level = models.IntegerField(choices=LEVELS)
+    level = models.IntegerField(choices=Levels.choices)
     not_before = models.DateTimeField()
     not_after = models.DateTimeField()
 
     @property
     def css_class(self):
-        if self.level == self.URGENT:
+        if self.level == self.Levels.URGENT:
             return 'failed'
-        if self.level == self.ATTENTION:
+        if self.level == self.Levels.ATTENTION:
             return 'warning'
-        if self.level == self.INFO:
+        if self.level == self.Levels.INFO:
             return 'info'
 
         return ''
diff --git a/proposals/forms.py b/proposals/forms.py
index 21cabcf24..7bd16fff5 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -13,7 +13,7 @@
 mark_safe_lazy = lazy(mark_safe, str)
 
 from main.forms import ConditionalModelForm, SoftValidationMixin
-from main.models import DOUBT, NO, YES, YES_NO_DOUBT
+from main.models import YesNoDoubt
 from main.utils import YES_NO, get_users_as_list
 from .field import ParentChoiceModelField
 from .models import Proposal, Relation, Wmo
@@ -412,9 +412,9 @@ def __init__(self, *args, **kwargs):
         """
         super(WmoForm, self).__init__(*args, **kwargs)
         self.fields['metc'].empty_label = None
-        self.fields['metc'].choices = YES_NO_DOUBT
+        self.fields['metc'].choices = YesNoDoubt.choices
         self.fields['is_medical'].empty_label = None
-        self.fields['is_medical'].choices = YES_NO_DOUBT
+        self.fields['is_medical'].choices = YesNoDoubt.choices
 
     def clean(self):
         """
@@ -429,13 +429,13 @@ def clean(self):
                                      'gaan.'))
 
         self.check_dependency(cleaned_data, 'metc', 'metc_details',
-                              f1_value=YES)
+                              f1_value=YesNoDoubt.YES)
         self.check_dependency(cleaned_data, 'metc', 'metc_institution',
-                              f1_value=YES,
+                              f1_value=YesNoDoubt.YES,
                               error_message=_(
                                   'Je dient een instelling op te geven.'))
         self.check_dependency_list(cleaned_data, 'metc', 'is_medical',
-                                   f1_value_list=[NO, DOUBT])
+                                   f1_value_list=[YesNoDoubt.NO, YesNoDoubt.DOUBT])
 
 
 class WmoCheckForm(forms.ModelForm):
@@ -455,7 +455,7 @@ def __init__(self, *args, **kwargs):
         """
         super(WmoCheckForm, self).__init__(*args, **kwargs)
         self.fields['is_medical'].empty_label = None
-        self.fields['is_medical'].choices = YES_NO_DOUBT
+        self.fields['is_medical'].choices = YesNoDoubt.choices
 
 
 class WmoApplicationForm(SoftValidationMixin, ConditionalModelForm):
diff --git a/proposals/models.py b/proposals/models.py
index c0576899a..c68bcbd75 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -13,7 +13,7 @@
 from django.utils.safestring import mark_safe
 mark_safe_lazy = lazy(mark_safe, str)
 
-from main.models import YES, YES_NO_DOUBT
+from main.models import YesNoDoubt
 from main.validators import MaxWordsValidator, validate_pdf_or_doc
 from .utils import available_urls, FilenameFactory, OverwriteStorage
 from datetime import date, timedelta
@@ -727,7 +727,7 @@ class Wmo(models.Model):
         _('Vindt de dataverzameling plaats binnen het UMC Utrecht of \
 andere instelling waar toetsing door een METC verplicht is gesteld?'),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True,
         default=None,
     )
@@ -756,7 +756,7 @@ class Wmo(models.Model):
 onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk \
 onderzoek, 2005, ccmo.nl)'),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True,
     )
 
@@ -803,7 +803,7 @@ def save(self, *args, **kwargs):
         super(Wmo, self).save(*args, **kwargs)
 
     def update_status(self):
-        if self.metc == YES or self.is_medical == YES or self.enforced_by_commission:
+        if self.metc == YesNoDoubt.YES or self.is_medical == YesNoDoubt.YES or self.enforced_by_commission:
             if self.metc_decision and self.metc_decision_pdf:
                 self.status = self.JUDGED
             else:
diff --git a/proposals/tests.py b/proposals/tests.py
index 2e4192ca8..50837f3cc 100644
--- a/proposals/tests.py
+++ b/proposals/tests.py
@@ -5,7 +5,7 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.conf import settings
 
-from main.models import Setting, YES, NO
+from main.models import Setting, YesNoDoubt.YES, NO
 from interventions.models import Intervention
 from observations.models import Observation
 from tasks.models import Session, Task, Registration
@@ -139,7 +139,7 @@ def test_status(self):
         proposal = self.p1
         self.assertEqual(proposal.status, Proposal.DRAFT)
 
-        wmo = Wmo.objects.create(proposal=proposal, metc=YES)
+        wmo = Wmo.objects.create(proposal=proposal, metc=YesNoDoubt.YES)
         self.assertEqual(proposal.wmo.status, Wmo.WAITING)
         wmo.metc = NO
         wmo.save()
@@ -281,7 +281,7 @@ def setUp(self):
     def test_status(self):
         self.assertEqual(self.wmo.status, Wmo.NO_WMO)
 
-        self.wmo.metc = YES
+        self.wmo.metc = YesNoDoubt.YES
         self.wmo.save()
 
         self.assertEqual(self.wmo.status, Wmo.WAITING)
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 9ac7cdd57..311e616ed 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -286,9 +286,9 @@ def handle_field_file(self, field_file):
         return output
 
     def yes_no_doubt(self, value):
-        from main.models import YES_NO_DOUBT
+        from main.models import YesNoDoubt
 
-        d = dict(YES_NO_DOUBT)
+        d = dict(YesNoDoubt.choices)
         return d[value]
 
 
diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index a3669f6eb..1b0cb4be5 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -6,7 +6,7 @@
 from django.views.decorators.csrf import csrf_exempt
 from django.utils.translation import ugettext_lazy as _
 
-from main.models import YES, DOUBT
+from main.models import YesNoDoubt
 from main.views import CreateView, UpdateView, AllowErrorsOnBackbuttonMixin
 from main.utils import get_secretary
 
@@ -139,8 +139,8 @@ def check_wmo(request):
     """
     This call checks which WMO message should be generated.
     """
-    is_metc = request.POST.get('metc') == YES
-    is_medical = request.POST.get('medical') == YES
+    is_metc = request.POST.get('metc') == YesNoDoubt.YES
+    is_medical = request.POST.get('medical') == YesNoDoubt.YES
 
     doubt = request.POST.get('metc') == DOUBT or request.POST.get('medical') == DOUBT
 
diff --git a/reviews/tests.py b/reviews/tests.py
index ed9839527..645d709f5 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -8,7 +8,7 @@
 
 from .models import Review, Decision
 from .utils import start_review, auto_review, auto_review_observation, auto_review_task, notify_secretary
-from main.models import YES, NO, DOUBT
+from main.models import YesNoDoubt
 from proposals.models import Proposal, Relation, Wmo
 from proposals.utils import generate_ref_number
 from studies.models import Study, Compensation, AgeGroup
@@ -291,13 +291,13 @@ def test_auto_review(self):
         reasons = auto_review(self.proposal)
         self.assertEqual(len(reasons), 5)
 
-        self.study.stressful = YES
+        self.study.stressful = YesNoDoubt.YES
         self.study.save()
 
         reasons = auto_review(self.proposal)
         self.assertEqual(len(reasons), 6)
 
-        self.study.risk = YES
+        self.study.risk = YesNoDoubt.YES
         self.study.save()
 
         reasons = auto_review(self.proposal)
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 157d27ee8..a955c2822 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -8,7 +8,7 @@
 from django.utils.translation import ugettext_lazy as _
 from django.utils import timezone
 
-from main.models import YES, DOUBT
+from main.models import YesNoDoubt
 from main.utils import get_secretary
 from proposals.models import Proposal
 from tasks.models import Task
@@ -338,7 +338,7 @@ def auto_review(proposal: Proposal):
         if study.legally_incapable:
             reasons.append(_('De aanvraag bevat het gebruik van wilsonbekwame volwassenen.'))
 
-        if study.deception in [YES, DOUBT]:
+        if study.deception in [YesNoDoubt.YES, DOUBT]:
             reasons.append(_('De aanvraag bevat het gebruik van misleiding.'))
 
         if study.hierarchy:
@@ -353,11 +353,11 @@ def auto_review(proposal: Proposal):
         for task in Task.objects.filter(session__study=study):
             reasons.extend(auto_review_task(study, task))
 
-        if study.stressful in [YES, DOUBT]:
+        if study.stressful in [YesNoDoubt.YES, DOUBT]:
             reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
 als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen.'))
 
-        if study.risk in [YES, DOUBT]:
+        if study.risk in [YesNoDoubt.YES, DOUBT]:
             reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) de risico\'s op psychische of \
 fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn.'))
 
diff --git a/studies/forms.py b/studies/forms.py
index 6da3d4296..b71d4a61c 100644
--- a/studies/forms.py
+++ b/studies/forms.py
@@ -6,7 +6,7 @@
 from django.utils.translation import ugettext_lazy as _
 
 from main.forms import ConditionalModelForm, SoftValidationMixin
-from main.models import DOUBT, YES, YES_NO_DOUBT
+from main.models import YesNoDoubt
 from main.utils import YES_NO
 from .models import AgeGroup, Documents, Study
 from .utils import check_necessity_required
@@ -56,7 +56,7 @@ def __init__(self, *args, **kwargs):
         super(StudyForm, self).__init__(*args, **kwargs)
         self.fields['compensation'].empty_label = None
         self.fields['necessity'].empty_label = None
-        self.fields['necessity'].choices = YES_NO_DOUBT
+        self.fields['necessity'].choices = YesNoDoubt.choices
 
         self.fields['age_groups'].queryset = AgeGroup.objects.filter(
             is_active=True)
@@ -183,13 +183,13 @@ def __init__(self, *args, **kwargs):
         super(StudyEndForm, self).__init__(*args, **kwargs)
 
         self.fields['deception'].empty_label = None
-        self.fields['deception'].choices = YES_NO_DOUBT
+        self.fields['deception'].choices = YesNoDoubt.choices
         self.fields['negativity'].empty_label = None
-        self.fields['negativity'].choices = YES_NO_DOUBT
+        self.fields['negativity'].choices = YesNoDoubt.choices
         self.fields['stressful'].empty_label = None
-        self.fields['stressful'].choices = YES_NO_DOUBT
+        self.fields['stressful'].choices = YesNoDoubt.choices
         self.fields['risk'].empty_label = None
-        self.fields['risk'].choices = YES_NO_DOUBT
+        self.fields['risk'].choices = YesNoDoubt.choices
 
         self.fields['negativity'].label = mark_safe(
             self.fields['negativity'].label)
@@ -224,15 +224,15 @@ def clean(self):
 
         self.check_dependency_list(cleaned_data, 'deception',
                                    'deception_details',
-                                   f1_value_list=[YES, DOUBT])
+                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
         self.check_dependency_list(cleaned_data, 'negativity',
                                    'negativity_details',
-                                   f1_value_list=[YES, DOUBT])
+                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
         self.check_dependency_list(cleaned_data, 'stressful',
                                    'stressful_details',
-                                   f1_value_list=[YES, DOUBT])
+                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
         self.check_dependency_list(cleaned_data, 'risk', 'risk_details',
-                                   f1_value_list=[YES, DOUBT])
+                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
 
 
 class StudyUpdateAttachmentsForm(forms.ModelForm):
diff --git a/studies/models.py b/studies/models.py
index 9d6c02a7f..806b32042 100644
--- a/studies/models.py
+++ b/studies/models.py
@@ -12,7 +12,7 @@
 from django.utils.safestring import mark_safe
 mark_safe_lazy = lazy(mark_safe, str)
 
-from main.models import YES_NO_DOUBT
+from main.models import YesNoDoubt
 from main.validators import validate_pdf_or_doc
 from proposals.models import Proposal
 from studies.utils import study_urls
@@ -216,7 +216,7 @@ class Study(models.Model):
 of zou je de vraag ook kunnen beantwoorden door volwassen deelnemers \
 te testen?'),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True)
     necessity_reason = models.TextField(
         _('Leg uit waarom'),
@@ -290,7 +290,7 @@ class Study(models.Model):
 geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: \
 het gaat hierbij niet om fillers.'),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True)
     deception_details = models.TextField(
         _('Geef een toelichting en beschrijf hoe en wanneer de deelnemer \
@@ -303,7 +303,7 @@ class Study(models.Model):
 uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of \
 (heel) saaie taken.'),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True)
     negativity_details = models.TextField(
         _('Licht je antwoord toe.'),
@@ -322,7 +322,7 @@ class Study(models.Model):
 tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade \
 door het onderzoek.')),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True)
     stressful_details = models.TextField(
         _('Licht je antwoord toe. Geef concrete voorbeelden van de relevante \
@@ -352,7 +352,7 @@ class Study(models.Model):
 inspanning; dit alles, waar relevant, onder begeleiding van adequaat \
 geschoolde specialisten).')),
         max_length=1,
-        choices=YES_NO_DOUBT,
+        choices=YesNoDoubt.choices,
         blank=True)
     risk_details = models.TextField(
         _('Licht toe'),

From f14001e06d6b35c63fe53ba1309cc8a684f8e660 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Wed, 22 Nov 2023 16:46:44 +0100
Subject: [PATCH 094/148] Refactor of all choices in proposals/models.py

---
 fetc/settings.py                    |  6 ++-
 main/views.py                       | 10 ++---
 proposals/api/views.py              | 12 +++---
 proposals/copy.py                   |  2 +-
 proposals/forms.py                  |  6 +--
 proposals/models.py                 | 61 +++++++++++------------------
 proposals/tests.py                  | 16 ++++----
 proposals/utils/statistics_utils.py |  2 +-
 proposals/views/proposal_views.py   |  8 ++--
 proposals/views/wmo_views.py        |  6 +--
 reviews/api/views.py                |  8 ++--
 reviews/models.py                   |  2 +-
 reviews/tests.py                    |  6 +--
 reviews/utils/review_actions.py     |  2 +-
 reviews/views.py                    |  2 +-
 15 files changed, 68 insertions(+), 81 deletions(-)

diff --git a/fetc/settings.py b/fetc/settings.py
index 45697d112..b1a7feb1f 100644
--- a/fetc/settings.py
+++ b/fetc/settings.py
@@ -152,8 +152,10 @@
 MEDIA_URL = '/media/'
 
 # E-mail settings
-EMAIL_HOST = 'localhost'
-EMAIL_PORT = 2525
+EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
+EMAIL_FILE_PATH = "email/"
+# EMAIL_HOST = 'localhost'
+# EMAIL_PORT = 2525
 EMAIL_FROM = 'T.D.Mees@uu.nl'
 EMAIL_LOCAL_STAFF = 'T.D.Mees@uu.nl'
 
diff --git a/main/views.py b/main/views.py
index c4d13e7fa..b37d99a1e 100644
--- a/main/views.py
+++ b/main/views.py
@@ -113,7 +113,7 @@ def get_user_reviews(self):
         reviews = {}
         objects = Review.objects.filter(
             stage__gte=Review.Stages.ASSIGNMENT,
-            proposal__status__gte=Proposal.SUBMITTED,
+            proposal__status__gte=Proposal.Statuses.SUBMITTED,
             proposal__created_by=self.get_object()
         )
 
@@ -375,10 +375,10 @@ def get_object(self, queryset=None):
             commission |= get_user_model().objects.filter(
                 groups__name=settings.GROUP_GENERAL_CHAMBER)
 
-        if proposal.status >= Proposal.SUBMITTED:
+        if proposal.status >= Proposal.Statuses.SUBMITTED:
             if self.request.user not in commission:
                 raise PermissionDenied
-        elif proposal.status >= Proposal.SUBMITTED_TO_SUPERVISOR:
+        elif proposal.status >= Proposal.Statuses.SUBMITTED_TO_SUPERVISOR:
             if self.request.user not in supervisor:
                 raise PermissionDenied
         else:
@@ -432,10 +432,10 @@ def check_allowed(self):
                     groups__name=settings.GROUP_GENERAL_CHAMBER
                 )
 
-            if proposal.status >= Proposal.SUBMITTED:
+            if proposal.status >= Proposal.Statuses.SUBMITTED:
                 if self.request.user not in commission:
                     raise PermissionDenied
-            elif proposal.status >= Proposal.SUBMITTED_TO_SUPERVISOR:
+            elif proposal.status >= Proposal.Statuses.SUBMITTED_TO_SUPERVISOR:
                 if self.request.user not in supervisor:
                     raise PermissionDenied
             else:
diff --git a/proposals/api/views.py b/proposals/api/views.py
index 059d6357b..19ef2f458 100644
--- a/proposals/api/views.py
+++ b/proposals/api/views.py
@@ -51,8 +51,8 @@ def get_context(self):
 
         context['is_secretary'] = is_secretary(self.request.user)
         context['proposal'] = {
-            'SUBMITTED_TO_SUPERVISOR': Proposal.SUBMITTED_TO_SUPERVISOR,
-            'DECISION_MADE': Proposal.DECISION_MADE,
+            'SUBMITTED_TO_SUPERVISOR': Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
+            'DECISION_MADE': Proposal.Statuses.DECISION_MADE,
         }
         context['review'] = {
             'REVISION': Review.Continuations.REVISION,
@@ -81,7 +81,7 @@ class MyConceptsApiView(BaseProposalsApiView):
     def get_queryset(self):
         """Returns all non-submitted Proposals for the current User"""
         return self.get_my_proposals().filter(
-            status__lt=Proposal.SUBMITTED_TO_SUPERVISOR
+            status__lt=Proposal.Statuses.SUBMITTED_TO_SUPERVISOR
         )
 
 
@@ -101,8 +101,8 @@ class MySubmittedApiView(BaseProposalsApiView):
     def get_queryset(self):
         """Returns all submitted Proposals for the current User"""
         return self.get_my_proposals().filter(
-            status__gte=Proposal.SUBMITTED_TO_SUPERVISOR,
-            status__lt=Proposal.DECISION_MADE
+            status__gte=Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
+            status__lt=Proposal.Statuses.DECISION_MADE
         )
 
 
@@ -111,7 +111,7 @@ class MyCompletedApiView(BaseProposalsApiView):
     def get_queryset(self):
         """Returns all completed Proposals for the current User"""
         return self.get_my_proposals().filter(
-            status__gte=Proposal.DECISION_MADE
+            status__gte=Proposal.Statuses.DECISION_MADE
         )
 
 
diff --git a/proposals/copy.py b/proposals/copy.py
index 461164d81..9b866be53 100644
--- a/proposals/copy.py
+++ b/proposals/copy.py
@@ -29,7 +29,7 @@ def copy_proposal(original_proposal, is_revision, created_by_user):
         copy_proposal.reference_number = generate_ref_number()
 
     copy_proposal.created_by = created_by_user
-    copy_proposal.status = Proposal.DRAFT
+    copy_proposal.status = Proposal.Statuses.DRAFT
     copy_proposal.status_review = None
     copy_proposal.pdf = None
     copy_proposal.date_created = timezone.now()
diff --git a/proposals/forms.py b/proposals/forms.py
index 7bd16fff5..5f4f373b1 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -264,7 +264,7 @@ def clean(self):
 class ProposalStartPracticeForm(forms.Form):
     practice_reason = forms.ChoiceField(
         label=_('Ik maak een oefenaanvraag aan'),
-        choices=Proposal.PRACTICE_REASONS,
+        choices=Proposal.PracticeReasons.choices,
         widget=forms.RadioSelect())
 
 
@@ -302,7 +302,7 @@ def _get_parent_queryset(self):
         ).filter(
             Q(applicants=self.user, ) | Q(supervisor=self.user)
         ).filter(
-            Q(status=Proposal.DRAFT) | Q(status__gte=Proposal.DECISION_MADE)
+            Q(status=Proposal.Statuses.DRAFT) | Q(status__gte=Proposal.Statuses.DECISION_MADE)
         ).distinct()
 
 
@@ -346,7 +346,7 @@ def _get_parent_queryset(self):
         # Those are eligible for revisions
         return Proposal.objects.filter(
             is_pre_assessment=False,
-            status=Proposal.DECISION_MADE,
+            status=Proposal.Statuses.DECISION_MADE,
             status_review=False,
             children__isnull=True,
         ).filter(
diff --git a/proposals/models.py b/proposals/models.py
index c68bcbd75..e0b051de4 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -133,28 +133,17 @@ class Proposal(models.Model):
 
     objects = ProposalQuerySet.as_manager()
 
-    DRAFT = 1
-    SUBMITTED_TO_SUPERVISOR = 40
-    SUBMITTED = 50
-    DECISION_MADE = 55
-    WMO_DECISION_MADE = 60
-    STATUSES = (
-        (DRAFT, _('Concept')),
+    class Statuses(models.IntegerChoices):
+        DRAFT = 1, _('Concept')
+        SUBMITTED_TO_SUPERVISOR = 40, _('Opgestuurd ter beoordeling door eindverantwoordelijke')
+        SUBMITTED = 50, _('Opgestuurd ter beoordeling door FETC-GW')
+        DECISION_MADE = 55, _('Aanvraag is beoordeeld door FETC-GW')
+        WMO_DECISION_MADE = 60, _('Aanvraag is beoordeeld door FETC-GW')
 
-        (SUBMITTED_TO_SUPERVISOR,
-         _('Opgestuurd ter beoordeling door eindverantwoordelijke')),
-        (SUBMITTED, _('Opgestuurd ter beoordeling door FETC-GW')),
+    class PracticeReasons(models.IntegerChoices):
+        COURSE = 1, _('om de portal te exploreren')
+        EXPLORATION = 2, _('in het kader van een cursus')
 
-        (DECISION_MADE, _('Aanvraag is beoordeeld door FETC-GW')),
-        (WMO_DECISION_MADE, _('Aanvraag is beoordeeld door FETC-GW')),
-    )
-
-    COURSE = 1
-    EXPLORATION = 2
-    PRACTICE_REASONS = (
-        (COURSE, _('in het kader van een cursus')),
-        (EXPLORATION, _('om de portal te exploreren')),
-    )
 
     # Fields of a proposal
     reference_number = models.CharField(
@@ -388,8 +377,8 @@ class Proposal(models.Model):
 
     # Status
     status = models.PositiveIntegerField(
-        choices=STATUSES,
-        default=DRAFT,
+        choices=Statuses.choices,
+        default=Statuses.DRAFT,
     )
 
     status_review = models.BooleanField(
@@ -638,7 +627,7 @@ def supervisor_decision(self):
         """Returns the Decision of the supervisor for this Proposal (if any and in current stage)"""
         from reviews.models import Review, Decision
 
-        if self.supervisor and self.status == Proposal.SUBMITTED_TO_SUPERVISOR:
+        if self.supervisor and self.status == Proposal.Statuses.SUBMITTED_TO_SUPERVISOR:
             decisions = Decision.objects.filter(
                 review__proposal=self,
                 review__stage=Review.Stages.SUPERVISOR
@@ -659,7 +648,7 @@ def latest_review(self):
 
     def enforce_wmo(self):
         """Send proposal back to draft phase with WMO enforced."""
-        self.status = self.DRAFT
+        self.status = self.Statuses.DRAFT
         self.save()
         self.wmo.enforced_by_commission = True
         self.wmo.save()
@@ -668,7 +657,7 @@ def mark_reviewed(self, continuation, time=None):
         """Finalize a proposal after a decision has been made."""
         if time is None:
             time = timezone.now()
-        self.status = self.DECISION_MADE
+        self.status = self.Statuses.DECISION_MADE
         # Importing here to prevent circular import
         from reviews.models import Review
         self.status_review = continuation in [
@@ -714,14 +703,10 @@ def __str__(self):
 
 
 class Wmo(models.Model):
-    NO_WMO = 0
-    WAITING = 1
-    JUDGED = 2
-    WMO_STATUSES = (
-        (NO_WMO, _('Geen beoordeling door METC noodzakelijk')),
-        (WAITING, _('In afwachting beslissing METC')),
-        (JUDGED, _('Beslissing METC geüpload')),
-    )
+    class WMOStatuses(models.IntegerChoices):
+        NO_WMO = 0, _('Geen beoordeling door METC noodzakelijk')
+        WAITING = 1, _('In afwachting beslissing METC')
+        JUDGED = 2, _('Beslissing METC geüpload')
 
     metc = models.CharField(
         _('Vindt de dataverzameling plaats binnen het UMC Utrecht of \
@@ -784,8 +769,8 @@ class Wmo(models.Model):
 
     # Status
     status = models.PositiveIntegerField(
-        choices=WMO_STATUSES,
-        default=NO_WMO,
+        choices=WMOStatuses.choices,
+        default=WMOStatuses.NO_WMO,
     )
 
     enforced_by_commission = models.BooleanField(default=False)
@@ -805,11 +790,11 @@ def save(self, *args, **kwargs):
     def update_status(self):
         if self.metc == YesNoDoubt.YES or self.is_medical == YesNoDoubt.YES or self.enforced_by_commission:
             if self.metc_decision and self.metc_decision_pdf:
-                self.status = self.JUDGED
+                self.status = self.WMOStatuses.JUDGED
             else:
-                self.status = self.WAITING
+                self.status = self.WMOStatuses.WAITING
         else:
-            self.status = self.NO_WMO
+            self.status = self.WMOStatuses.NO_WMO
 
     def __str__(self):
         return _('WMO {title}, status {status}').format(
diff --git a/proposals/tests.py b/proposals/tests.py
index 50837f3cc..42f85e8e8 100644
--- a/proposals/tests.py
+++ b/proposals/tests.py
@@ -137,13 +137,13 @@ def test_revision_reference_number(self):
 
     def test_status(self):
         proposal = self.p1
-        self.assertEqual(proposal.status, Proposal.DRAFT)
+        self.assertEqual(proposal.status, Proposal.Statuses.DRAFT)
 
         wmo = Wmo.objects.create(proposal=proposal, metc=YesNoDoubt.YES)
-        self.assertEqual(proposal.wmo.status, Wmo.WAITING)
+        self.assertEqual(proposal.wmo.status, Wmo.WMOStatuses.WAITING)
         wmo.metc = NO
         wmo.save()
-        self.assertEqual(proposal.wmo.status, Wmo.NO_WMO)
+        self.assertEqual(proposal.wmo.status, Wmo.WMOStatuses.NO_WMO)
         #self.assertEqual(proposal.continue_url(), '/studies/create/1/')
 
         s = Study.objects.create(proposal=proposal, order=1)
@@ -279,22 +279,22 @@ def setUp(self):
         self.wmo = Wmo.objects.create(proposal=self.p1, metc=NO)
 
     def test_status(self):
-        self.assertEqual(self.wmo.status, Wmo.NO_WMO)
+        self.assertEqual(self.wmo.status, Wmo.WMOStatuses.NO_WMO)
 
         self.wmo.metc = YesNoDoubt.YES
         self.wmo.save()
 
-        self.assertEqual(self.wmo.status, Wmo.WAITING)
+        self.assertEqual(self.wmo.status, Wmo.WMOStatuses.WAITING)
 
         self.wmo.metc_decision = True
         self.wmo.save()
 
-        self.assertEqual(self.wmo.status, Wmo.WAITING)
+        self.assertEqual(self.wmo.status, Wmo.WMOStatuses.WAITING)
 
         self.wmo.metc_decision_pdf = SimpleUploadedFile('test.pdf', b'contents')
         self.wmo.save()
 
-        self.assertEqual(self.wmo.status, Wmo.JUDGED)
+        self.assertEqual(self.wmo.status, Wmo.WMOStatuses.JUDGED)
 
 
 class CopyTestCase(BaseProposalTestCase):
@@ -304,7 +304,7 @@ def setUp(self):
 
         self.wmo_1 = Wmo.objects.create(
             proposal=self.p1,
-            metc=Wmo.JUDGED,
+            metc=Wmo.WMOStatuses.JUDGED,
         )
 
         self.study_1 = Study.objects.create(
diff --git a/proposals/utils/statistics_utils.py b/proposals/utils/statistics_utils.py
index c15f5e803..bf630fd1a 100644
--- a/proposals/utils/statistics_utils.py
+++ b/proposals/utils/statistics_utils.py
@@ -27,7 +27,7 @@ def get_qs_for_year(year: int) -> QuerySet:
     return Proposal.objects.filter(
         date_submitted__year=year,
         is_revision=False,
-        status__gte=Proposal.DECISION_MADE,
+        status__gte=Proposal.Statuses.DECISION_MADE,
     )
 
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index ad4ccebbb..c170f12c0 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -446,7 +446,7 @@ def form_valid(self, form):
         if 'save_back' not in self.request.POST and 'js-redirect-submit' not in self.request.POST:
             proposal = self.get_object()
             proposal.generate_pdf()
-            if not proposal.is_practice() and proposal.status == Proposal.DRAFT:
+            if not proposal.is_practice() and proposal.status == Proposal.Statuses.DRAFT:
                 start_review(proposal)
         return success_url
 
@@ -762,14 +762,14 @@ def get_context_data(self, **kwargs):
     def get_form_kwargs(self):
         """Sets in_course as a form kwarg"""
         kwargs = super(ProposalCreatePractice, self).get_form_kwargs()
-        kwargs['in_course'] = self.kwargs['reason'] == Proposal.COURSE
+        kwargs['in_course'] = self.kwargs['reason'] == Proposal.PracticeReasons.COURSE
         return kwargs
 
     def form_valid(self, form):
         """Sets in_course and is_exploration"""
-        form.instance.in_course = self.kwargs['reason'] == Proposal.COURSE
+        form.instance.in_course = self.kwargs['reason'] == Proposal.PracticeReasons.COURSE
         form.instance.is_exploration = self.kwargs[
-                                           'reason'] == Proposal.EXPLORATION
+                                           'reason'] == Proposal.PracticeReasons.EXPLORATION
         return super(ProposalCreatePractice, self).form_valid(form)
 
 
diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index 1b0cb4be5..06ce56296 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -33,7 +33,7 @@ def get_next_url(self):
         else, start the Wmo application.
         """
         wmo = self.object
-        if wmo.status == Wmo.NO_WMO:
+        if wmo.status == Wmo.WMOStatuses.NO_WMO:
             return reverse('proposals:study_start', args=(wmo.proposal.pk,))
         else:
             return reverse('proposals:wmo_application', args=(wmo.pk,))
@@ -86,7 +86,7 @@ def get_context_data(self, **kwargs):
     def get_next_url(self):
         """Continue to the definition of a Study if we have completed the Wmo application"""
         wmo = self.object
-        if wmo.status == Wmo.WAITING:
+        if wmo.status == Wmo.WMOStatuses.WAITING:
             return reverse('proposals:wmo_application', args=(wmo.pk,))
         else:
             return reverse('proposals:study_start', args=(wmo.proposal.pk,))
@@ -108,7 +108,7 @@ class PreAssessmentMixin(object):
     def get_next_url(self):
         """Different continue URL for pre-assessment Proposals"""
         wmo = self.object
-        if wmo.status == Wmo.NO_WMO:
+        if wmo.status == Wmo.WMOStatuses.NO_WMO:
             return reverse('proposals:submit_pre', args=(self.object.proposal.pk,))
         else:
             return reverse('proposals:wmo_application_pre', args=(wmo.pk,))
diff --git a/reviews/api/views.py b/reviews/api/views.py
index 881eb348e..29409d76c 100644
--- a/reviews/api/views.py
+++ b/reviews/api/views.py
@@ -293,7 +293,7 @@ def get_queryset(self):
         objects = Decision.objects.filter(
             go='',
             review__stage=Review.Stages.SUPERVISOR,
-            review__proposal__status=Proposal.SUBMITTED_TO_SUPERVISOR,
+            review__proposal__status=Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
             review__proposal__reviewing_committee=self.committee
         )
 
@@ -376,7 +376,7 @@ def get_queryset(self):
         reviews = {}
         objects = Review.objects.filter(
             stage__gte=Review.Stages.CLOSING,
-            proposal__status__gte=Proposal.SUBMITTED,
+            proposal__status__gte=Proposal.Statuses.SUBMITTED,
             proposal__date_confirmed=None,
             proposal__reviewing_committee=self.committee,
         ).filter(
@@ -463,7 +463,7 @@ def get_queryset(self):
         objects = Review.objects.filter(
             stage__gte=Review.Stages.ASSIGNMENT,
             stage__lte=Review.Stages.CLOSING,
-            proposal__status__gte=Proposal.SUBMITTED,
+            proposal__status__gte=Proposal.Statuses.SUBMITTED,
             proposal__reviewing_committee=self.committee,
         ).select_related(
             'proposal',
@@ -509,7 +509,7 @@ def get_queryset(self):
         reviews = OrderedDict()
         objects = Review.objects.filter(
             stage__gte=Review.Stages.ASSIGNMENT,
-            proposal__status__gte=Proposal.SUBMITTED,
+            proposal__status__gte=Proposal.Statuses.SUBMITTED,
             proposal__reviewing_committee=self.committee,
         ).select_related(
             'proposal',
diff --git a/reviews/models.py b/reviews/models.py
index e376c3081..6b3fc9b95 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -95,7 +95,7 @@ def update_go(self, last_decision=None):
                     # See comment above
                     from reviews.utils import notify_supervisor_nogo
                     notify_supervisor_nogo(last_decision)
-                    self.proposal.status = Proposal.DRAFT
+                    self.proposal.status = Proposal.Statuses.DRAFT
                     self.proposal.save()
             # For a review by commission:
             else:
diff --git a/reviews/tests.py b/reviews/tests.py
index 645d709f5..1e0967df2 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -402,7 +402,7 @@ def test_open_review(self):
         )
         self.assertGreaterEqual(
             p.status,
-            p.SUBMITTED_TO_SUPERVISOR,
+            p.Statuses.SUBMITTED_TO_SUPERVISOR,
         )
 
     def test_decision(self):
@@ -425,7 +425,7 @@ def test_decision(self):
         )
         self.assertEqual(
             self.proposal.status,
-            self.proposal.DECISION_MADE,
+            self.proposal.Statuses.DECISION_MADE,
         )
         self.assertEqual(
             self.proposal.status_review,
@@ -471,7 +471,7 @@ def test_metc(self):
         # Assertions
         self.assertEqual(
             self.proposal.status,
-            self.proposal.DRAFT,
+            self.proposal.Statuses.DRAFT,
         )
         self.assertEqual(
             self.proposal.wmo.enforced_by_commission,
diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py
index 14d4cf5c0..60f8a7a55 100644
--- a/reviews/utils/review_actions.py
+++ b/reviews/utils/review_actions.py
@@ -265,7 +265,7 @@ def is_available(self):
            review.proposal.embargo_end_date > datetime.date.today():
             return False
         
-        if review.proposal.status < Proposal.DECISION_MADE:
+        if review.proposal.status < Proposal.Statuses.DECISION_MADE:
             return False
 
         return True
diff --git a/reviews/views.py b/reviews/views.py
index cfd42a8be..70ed8550f 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -359,7 +359,7 @@ def form_valid(self, form):
 
             # Mark the proposal as finished
             proposal = form.instance.proposal
-            proposal.status = Proposal.DECISION_MADE
+            proposal.status = Proposal.Statuses.DECISION_MADE
             proposal.status_review = False
             proposal.date_reviewed = timezone.now()
             proposal.save()

From af87f9786c5863bbebf53705487f63a373058288 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 23 Nov 2023 10:30:53 +0100
Subject: [PATCH 095/148] Removed DESIGNS from studies, because they are unused

---
 studies/models.py | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/studies/models.py b/studies/models.py
index 806b32042..e39884d16 100644
--- a/studies/models.py
+++ b/studies/models.py
@@ -136,14 +136,6 @@ class Study(models.Model):
     A model to store a study within a Proposal.
     A Study consists of participant details, experiment design and consent forms.
     """
-    OBSERVATION = 0
-    INTERVENTION = 1
-    SESSIONS = 2
-    DESIGNS = (
-        (OBSERVATION, _('Observatieonderzoek')),
-        (INTERVENTION, _('Interventieonderzoek')),
-        (SESSIONS, _('Taakonderzoek en interviews')),
-    )
 
     order = models.PositiveIntegerField()
     name = models.CharField(

From d25a7bca26c8867710fff30945ee26b6f8229f7c Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 23 Nov 2023 11:28:26 +0100
Subject: [PATCH 096/148] Undid some accidentally committed changes

---
 docs/_build/html/_modules/core/models.html      |  2 +-
 docs/_build/html/_modules/proposals/forms.html  | 12 ++++++------
 docs/_build/html/_modules/proposals/models.html |  8 ++++----
 docs/_build/html/_modules/studies/forms.html    | 12 ++++++------
 docs/_build/html/_modules/studies/models.html   | 12 ++++++------
 fetc/settings.py                                |  6 ++----
 proposals/tests.py                              |  2 +-
 7 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/docs/_build/html/_modules/core/models.html b/docs/_build/html/_modules/core/models.html
index ec2ec10d6..812faa697 100644
--- a/docs/_build/html/_modules/core/models.html
+++ b/docs/_build/html/_modules/core/models.html
@@ -158,7 +158,7 @@ <h1>Source code for core.models</h1><div class="highlight"><pre>
 <span class="n">YES</span> <span class="o">=</span> <span class="s1">&#39;Y&#39;</span>
 <span class="n">NO</span> <span class="o">=</span> <span class="s1">&#39;N&#39;</span>
 <span class="n">DOUBT</span> <span class="o">=</span> <span class="s1">&#39;?&#39;</span>
-<span class="n">YesNoDoubt.choices</span> <span class="o">=</span> <span class="p">(</span>
+<span class="n">YES_NO_DOUBT</span> <span class="o">=</span> <span class="p">(</span>
     <span class="p">(</span><span class="n">YES</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;ja&#39;</span><span class="p">)),</span>
     <span class="p">(</span><span class="n">NO</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;nee&#39;</span><span class="p">)),</span>
     <span class="p">(</span><span class="n">DOUBT</span><span class="p">,</span> <span class="n">_</span><span class="p">(</span><span class="s1">&#39;twijfel&#39;</span><span class="p">)),</span>
diff --git a/docs/_build/html/_modules/proposals/forms.html b/docs/_build/html/_modules/proposals/forms.html
index b0404e95d..6581e514d 100644
--- a/docs/_build/html/_modules/proposals/forms.html
+++ b/docs/_build/html/_modules/proposals/forms.html
@@ -161,7 +161,7 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.forms</span> <span class="k">import</span> <span class="n">ConditionalModelForm</span><span class="p">,</span> <span class="n">SoftValidationMixin</span>
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">NO</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YesNoDoubt.choices</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">NO</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>
 <span class="kn">from</span> <span class="nn">core.utils</span> <span class="k">import</span> <span class="n">YES_NO</span><span class="p">,</span> <span class="n">get_users_as_list</span>
 <span class="kn">from</span> <span class="nn">.models</span> <span class="k">import</span> <span class="n">Proposal</span><span class="p">,</span> <span class="n">Relation</span><span class="p">,</span> <span class="n">Wmo</span>
 <span class="kn">from</span> <span class="nn">.utils</span> <span class="k">import</span> <span class="n">check_local_facilities</span>
@@ -476,11 +476,11 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="nb">super</span><span class="p">(</span><span class="n">WmoForm</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;metc&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;metc&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;metc&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span></div>
 
 <div class="viewcode-block" id="WmoForm.clean"><a class="viewcode-back" href="../../reference/proposals.forms.html#proposals.forms.WmoForm.clean">[docs]</a>    <span class="k">def</span> <span class="nf">clean</span><span class="p">(</span><span class="bp">self</span><span class="p">):</span>
         <span class="sd">&quot;&quot;&quot;</span>
@@ -524,9 +524,9 @@ <h1>Source code for proposals.forms</h1><div class="highlight"><pre>
 <span class="sd">        &quot;&quot;&quot;</span>
         <span class="nb">super</span><span class="p">(</span><span class="n">WmoCheckForm</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_medical&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span></div></div>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;is_behavioristic&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span></div></div>
 
 
 <div class="viewcode-block" id="WmoApplicationForm"><a class="viewcode-back" href="../../reference/proposals.forms.html#proposals.forms.WmoApplicationForm">[docs]</a><span class="k">class</span> <span class="nc">WmoApplicationForm</span><span class="p">(</span><span class="n">ConditionalModelForm</span><span class="p">):</span>
diff --git a/docs/_build/html/_modules/proposals/models.html b/docs/_build/html/_modules/proposals/models.html
index 6eb92e1cd..b39325fdd 100644
--- a/docs/_build/html/_modules/proposals/models.html
+++ b/docs/_build/html/_modules/proposals/models.html
@@ -161,7 +161,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YesNoDoubt.choices</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>
 <span class="kn">from</span> <span class="nn">core.validators</span> <span class="k">import</span> <span class="n">MaxWordsValidator</span><span class="p">,</span> <span class="n">validate_pdf_or_doc</span>
 <span class="kn">from</span> <span class="nn">.utils</span> <span class="k">import</span> <span class="n">available_urls</span>
 
@@ -616,7 +616,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Vindt de dataverzameling plaats binnen het UMC Utrecht of </span><span class="se">\</span>
 <span class="s1">andere instelling waar toetsing door een METC verplicht is gesteld?&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
         <span class="n">default</span><span class="o">=</span><span class="kc">None</span><span class="p">,</span>
     <span class="p">)</span>
@@ -645,7 +645,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
 <span class="s1">onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk </span><span class="se">\</span>
 <span class="s1">onderzoek, 2005, ccmo.nl)&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
     <span class="p">)</span>
 
@@ -659,7 +659,7 @@ <h1>Source code for proposals.models</h1><div class="highlight"><pre>
 <span class="s1">worden in hun leven zoals het ook had plaatsgevonden zonder de observatie, </span><span class="se">\</span>
 <span class="s1">slechts dan kan &quot;nee&quot; ingevuld worden.&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">,</span>
     <span class="p">)</span>
 
diff --git a/docs/_build/html/_modules/studies/forms.html b/docs/_build/html/_modules/studies/forms.html
index 856f20c00..80d8d54c7 100644
--- a/docs/_build/html/_modules/studies/forms.html
+++ b/docs/_build/html/_modules/studies/forms.html
@@ -158,7 +158,7 @@ <h1>Source code for studies.forms</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 
 <span class="kn">from</span> <span class="nn">core.forms</span> <span class="k">import</span> <span class="n">ConditionalModelForm</span><span class="p">,</span> <span class="n">SoftValidationMixin</span>
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YesNoDoubt.choices</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">DOUBT</span><span class="p">,</span> <span class="n">YES</span><span class="p">,</span> <span class="n">YES_NO_DOUBT</span>
 <span class="kn">from</span> <span class="nn">core.utils</span> <span class="k">import</span> <span class="n">YES_NO</span>
 <span class="kn">from</span> <span class="nn">.models</span> <span class="k">import</span> <span class="n">AgeGroup</span><span class="p">,</span> <span class="n">Documents</span><span class="p">,</span> <span class="n">Study</span>
 <span class="kn">from</span> <span class="nn">.utils</span> <span class="k">import</span> <span class="n">check_necessity_required</span>
@@ -205,7 +205,7 @@ <h1>Source code for studies.forms</h1><div class="highlight"><pre>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;legally_incapable&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">label</span> <span class="o">=</span> <span class="s2">&quot;Geert&quot;</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;compensation&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;necessity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;necessity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;necessity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;age_groups&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">queryset</span> <span class="o">=</span> <span class="n">AgeGroup</span><span class="o">.</span><span class="n">objects</span><span class="o">.</span><span class="n">filter</span><span class="p">(</span>
             <span class="n">is_active</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span></div>
@@ -349,13 +349,13 @@ <h1>Source code for studies.forms</h1><div class="highlight"><pre>
         <span class="nb">super</span><span class="p">(</span><span class="n">StudyEndForm</span><span class="p">,</span> <span class="bp">self</span><span class="p">)</span><span class="o">.</span><span class="fm">__init__</span><span class="p">(</span><span class="o">*</span><span class="n">args</span><span class="p">,</span> <span class="o">**</span><span class="n">kwargs</span><span class="p">)</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;deception&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;deception&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;deception&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;stressful&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;stressful&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;stressful&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;risk&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">empty_label</span> <span class="o">=</span> <span class="kc">None</span>
-        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;risk&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YesNoDoubt.choices</span>
+        <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;risk&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">choices</span> <span class="o">=</span> <span class="n">YES_NO_DOUBT</span>
 
         <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">label</span> <span class="o">=</span> <span class="n">mark_safe</span><span class="p">(</span>
             <span class="bp">self</span><span class="o">.</span><span class="n">fields</span><span class="p">[</span><span class="s1">&#39;negativity&#39;</span><span class="p">]</span><span class="o">.</span><span class="n">label</span><span class="p">)</span>
diff --git a/docs/_build/html/_modules/studies/models.html b/docs/_build/html/_modules/studies/models.html
index 7815845fd..48a066f0e 100644
--- a/docs/_build/html/_modules/studies/models.html
+++ b/docs/_build/html/_modules/studies/models.html
@@ -160,7 +160,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="kn">from</span> <span class="nn">django.utils.translation</span> <span class="k">import</span> <span class="n">ugettext_lazy</span> <span class="k">as</span> <span class="n">_</span>
 <span class="kn">from</span> <span class="nn">django.utils.encoding</span> <span class="k">import</span> <span class="n">python_2_unicode_compatible</span>
 
-<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YesNoDoubt.choices</span>
+<span class="kn">from</span> <span class="nn">core.models</span> <span class="k">import</span> <span class="n">YES_NO_DOUBT</span>
 <span class="kn">from</span> <span class="nn">core.validators</span> <span class="k">import</span> <span class="n">validate_pdf_or_doc</span>
 <span class="kn">from</span> <span class="nn">proposals.models</span> <span class="k">import</span> <span class="n">Proposal</span>
 
@@ -312,7 +312,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">of zou u de vraag ook kunnen beantwoorden door volwassen deelnemers </span><span class="se">\</span>
 <span class="s1">te testen?&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">necessity_reason</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Leg uit waarom&#39;</span><span class="p">),</span>
@@ -385,7 +385,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: </span><span class="se">\</span>
 <span class="s1">het gaat hierbij niet om fillers.&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">deception_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Geef een toelichting en beschrijf hoe en wanneer de deelnemer </span><span class="se">\</span>
@@ -398,7 +398,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of </span><span class="se">\</span>
 <span class="s1">(heel) saaie taken.&#39;</span><span class="p">),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">negativity_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Licht uw antwoord toe.&#39;</span><span class="p">),</span>
@@ -417,7 +417,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade </span><span class="se">\</span>
 <span class="s1">door het onderzoek.&#39;</span><span class="p">)),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">stressful_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Licht uw antwoord toe. Geef concrete voorbeelden van de relevante </span><span class="se">\</span>
@@ -447,7 +447,7 @@ <h1>Source code for studies.models</h1><div class="highlight"><pre>
 <span class="s1">inspanning; dit alles, waar relevant, onder begeleiding van adequaat </span><span class="se">\</span>
 <span class="s1">geschoolde specialisten).&#39;</span><span class="p">)),</span>
         <span class="n">max_length</span><span class="o">=</span><span class="mi">1</span><span class="p">,</span>
-        <span class="n">choices</span><span class="o">=</span><span class="n">YesNoDoubt.choices</span><span class="p">,</span>
+        <span class="n">choices</span><span class="o">=</span><span class="n">YES_NO_DOUBT</span><span class="p">,</span>
         <span class="n">blank</span><span class="o">=</span><span class="kc">True</span><span class="p">)</span>
     <span class="n">risk_details</span> <span class="o">=</span> <span class="n">models</span><span class="o">.</span><span class="n">TextField</span><span class="p">(</span>
         <span class="n">_</span><span class="p">(</span><span class="s1">&#39;Licht toe&#39;</span><span class="p">),</span>
diff --git a/fetc/settings.py b/fetc/settings.py
index b1a7feb1f..45697d112 100644
--- a/fetc/settings.py
+++ b/fetc/settings.py
@@ -152,10 +152,8 @@
 MEDIA_URL = '/media/'
 
 # E-mail settings
-EMAIL_BACKEND = "django.core.mail.backends.filebased.EmailBackend"
-EMAIL_FILE_PATH = "email/"
-# EMAIL_HOST = 'localhost'
-# EMAIL_PORT = 2525
+EMAIL_HOST = 'localhost'
+EMAIL_PORT = 2525
 EMAIL_FROM = 'T.D.Mees@uu.nl'
 EMAIL_LOCAL_STAFF = 'T.D.Mees@uu.nl'
 
diff --git a/proposals/tests.py b/proposals/tests.py
index 42f85e8e8..b146365ed 100644
--- a/proposals/tests.py
+++ b/proposals/tests.py
@@ -5,7 +5,7 @@
 from django.core.files.uploadedfile import SimpleUploadedFile
 from django.conf import settings
 
-from main.models import Setting, YesNoDoubt.YES, NO
+from main.models import Setting, YesNoDoubt
 from interventions.models import Intervention
 from observations.models import Observation
 from tasks.models import Session, Task, Registration

From 28411f1536d992a69e41d952c1606e1bf4e192f3 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 23 Nov 2023 16:49:24 +0100
Subject: [PATCH 097/148] Ty's fixes

---
 proposals/utils/pdf_diff_logic.py | 3 +--
 reviews/forms.py                  | 3 ++-
 reviews/models.py                 | 2 +-
 reviews/utils/review_utils.py     | 6 +++---
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 311e616ed..488e29282 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -288,8 +288,7 @@ def handle_field_file(self, field_file):
     def yes_no_doubt(self, value):
         from main.models import YesNoDoubt
 
-        d = dict(YesNoDoubt.choices)
-        return d[value]
+        return YesNoDoubt(value).label
 
 
 class SubTitle:
diff --git a/reviews/forms.py b/reviews/forms.py
index f7b66609f..56fc4eea2 100644
--- a/reviews/forms.py
+++ b/reviews/forms.py
@@ -102,7 +102,8 @@ def __init__(self, *args, **kwargs):
         allow_long_route_continuation = kwargs.pop('allow_long_route_continuation', False)
         super(ReviewCloseForm, self).__init__(*args, **kwargs)
         if not allow_long_route_continuation:
-            self.fields['continuation'].choices = [x for x in Review.Continuations.choices if x != Review.Continuations.LONG_ROUTE]
+            self.fields['continuation'].choices = [x for x in Review.Continuations.choices 
+                                                   if x[0] != Review.Continuations.LONG_ROUTE]
 
         self.fields['in_archive'].label = _('Voeg deze aanvraag toe aan het archief')
         self.fields['in_archive'].widget = forms.RadioSelect(choices=YES_NO)
diff --git a/reviews/models.py b/reviews/models.py
index 6b3fc9b95..49b821a71 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -117,7 +117,7 @@ def get_continuation_display(self):
             return _("Onbekend")
 
         # Get the human readable string
-        continuation = dict(self.Continuations.choices)[self.continuation]
+        continuation = self.Continuations(self.continuation).label
 
         if self.proposal.has_minor_revision:
             continuation += str(_(', met revisie'))
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index a955c2822..8a45073ed 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -338,7 +338,7 @@ def auto_review(proposal: Proposal):
         if study.legally_incapable:
             reasons.append(_('De aanvraag bevat het gebruik van wilsonbekwame volwassenen.'))
 
-        if study.deception in [YesNoDoubt.YES, DOUBT]:
+        if study.deception in [YesNoDoubt.YES, YesNoDoubt.DOUBT]:
             reasons.append(_('De aanvraag bevat het gebruik van misleiding.'))
 
         if study.hierarchy:
@@ -353,11 +353,11 @@ def auto_review(proposal: Proposal):
         for task in Task.objects.filter(session__study=study):
             reasons.extend(auto_review_task(study, task))
 
-        if study.stressful in [YesNoDoubt.YES, DOUBT]:
+        if study.stressful in [YesNoDoubt.YES, YesNoDoubt.DOUBT]:
             reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
 als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen.'))
 
-        if study.risk in [YesNoDoubt.YES, DOUBT]:
+        if study.risk in [YesNoDoubt.YES, YesNoDoubt.DOUBT]:
             reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) de risico\'s op psychische of \
 fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn.'))
 

From 95f4f7ef68e54a510bb71b69de96ca7aaf5678e2 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 28 Nov 2023 14:05:35 +0100
Subject: [PATCH 098/148] Things I missed ...

---
 proposals/tests.py                | 4 ++--
 proposals/utils/pdf_diff_logic.py | 4 ++--
 proposals/views/wmo_views.py      | 2 +-
 reviews/tests.py                  | 4 ++--
 reviews/utils/review_utils.py     | 4 ++--
 5 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/proposals/tests.py b/proposals/tests.py
index b146365ed..5c9631519 100644
--- a/proposals/tests.py
+++ b/proposals/tests.py
@@ -141,7 +141,7 @@ def test_status(self):
 
         wmo = Wmo.objects.create(proposal=proposal, metc=YesNoDoubt.YES)
         self.assertEqual(proposal.wmo.status, Wmo.WMOStatuses.WAITING)
-        wmo.metc = NO
+        wmo.metc = YesNoDoubt.NO
         wmo.save()
         self.assertEqual(proposal.wmo.status, Wmo.WMOStatuses.NO_WMO)
         #self.assertEqual(proposal.continue_url(), '/studies/create/1/')
@@ -276,7 +276,7 @@ def test_supervisor(self):
 class WmoTestCase(BaseProposalTestCase):
     def setUp(self):
         super(WmoTestCase, self).setUp()
-        self.wmo = Wmo.objects.create(proposal=self.p1, metc=NO)
+        self.wmo = Wmo.objects.create(proposal=self.p1, metc=YesNoDoubt.NO)
 
     def test_status(self):
         self.assertEqual(self.wmo.status, Wmo.WMOStatuses.NO_WMO)
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 488e29282..9daef35f8 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -1014,12 +1014,12 @@ def create_context_pdf(context, model):
         sections.append(WMOSection(model.wmo))
 
         if not model.is_pre_assessment:
-            if model.wmo.status != model.wmo.NO_WMO:
+            if model.wmo.status != model.wmo.WMOStatuses.NO_WMO:
                 sections.append(METCSection(model.wmo))
 
             sections.append(TrajectoriesSection(model))
 
-            if model.wmo.status == model.wmo.NO_WMO:
+            if model.wmo.status == model.wmo.WMOStatuses.NO_WMO:
                 for study in model.study_set.all():
                     sections.append(StudySection(study))
                     if study.has_intervention:
diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index 06ce56296..33eea8dd4 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -142,7 +142,7 @@ def check_wmo(request):
     is_metc = request.POST.get('metc') == YesNoDoubt.YES
     is_medical = request.POST.get('medical') == YesNoDoubt.YES
 
-    doubt = request.POST.get('metc') == DOUBT or request.POST.get('medical') == DOUBT
+    doubt = request.POST.get('metc') == YesNoDoubt.DOUBT or request.POST.get('medical') == YesNoDoubt.DOUBT
 
     # Default message: OK.
     message = _('Je onderzoek hoeft niet te worden beoordeeld door de METC.')
diff --git a/reviews/tests.py b/reviews/tests.py
index 1e0967df2..41d391576 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -104,7 +104,7 @@ def setup_proposal(self):
         )
         self.proposal.wmo = Wmo.objects.create(
             proposal=self.proposal,
-            metc=NO,
+            metc=YesNoDoubt.NO,
         )
         self.study = Study.objects.create(
             proposal=self.proposal,
@@ -267,7 +267,7 @@ def test_auto_review(self):
         reasons = auto_review(self.proposal)
         self.assertEqual(len(reasons), 1)
 
-        self.study.deception = DOUBT
+        self.study.deception = YesNoDoubt.DOUBT
         self.study.save()
 
         reasons = auto_review(self.proposal)
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 8a45073ed..4b5398f16 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -46,7 +46,7 @@ def start_supervisor_phase(proposal):
     review.save()
 
     proposal.date_submitted_supervisor = timezone.now()
-    proposal.status = proposal.SUBMITTED_TO_SUPERVISOR
+    proposal.status = proposal.Statuses.SUBMITTED_TO_SUPERVISOR
     proposal.save()
 
     decision = Decision.objects.create(review=review, reviewer=proposal.supervisor)
@@ -114,7 +114,7 @@ def start_assignment_phase(proposal):
     review.save()
 
     proposal.date_submitted = timezone.now()
-    proposal.status = proposal.SUBMITTED
+    proposal.status = proposal.Statuses.SUBMITTED
     proposal.save()
 
     secretary = get_secretary()

From 3ae6b51215dca40b5e0f821c2350492e3fdb4df4 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 27 Nov 2023 15:51:38 +0100
Subject: [PATCH 099/148] Fix #259. Removing all references to title field in
 copy forms + copy.js

---
 proposals/forms.py                            | 26 -------------------
 proposals/static/proposals/js/copy.js         | 10 -------
 .../templates/proposals/proposal_copy.html    |  6 -----
 3 files changed, 42 deletions(-)
 delete mode 100644 proposals/static/proposals/js/copy.js

diff --git a/proposals/forms.py b/proposals/forms.py
index 21cabcf24..7403d8173 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -275,11 +275,6 @@ class Meta:
         widgets = {
             'is_revision': forms.HiddenInput(),
         }
-        error_messages = {
-            'title': {
-                'unique': _('Er bestaat al een aanvraag met deze titel.'),
-            },
-        }
 
     parent = ParentChoiceModelField(
         queryset=Proposal.objects.all(),
@@ -323,17 +318,6 @@ class RevisionProposalCopyForm(BaseProposalCopyForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-
-        if 'title' in self.fields:
-            self.fields['title'].label = _('Je kan de titel van je aanvraag nu, '
-                                           'indien nodig, wijzigen.')
-            self.fields['title'].help_text = _('De titel die je hier opgeeft is '
-                                               'zichtbaar voor de FETC-GW-leden en,'
-                                               ' wanneer de aanvraag is goedgekeurd,'
-                                               ' ook voor alle medewerkers die in'
-                                               ' het archief van deze portal '
-                                               'kijken.')
-
         self.fields['parent'].label = _('Te reviseren aanvraag')
         self.fields['parent'].help_text = _('Dit veld toont enkel ingediende,'
                                             ' (nog) niet goedgekeurde aanvragen '
@@ -359,16 +343,6 @@ class AmendmentProposalCopyForm(BaseProposalCopyForm):
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        if 'title' in self.fields:
-            self.fields['title'].label = _('Je kan de titel van je aanvraag nu, '
-                                           'indien nodig, wijzigen.')
-            self.fields['title'].help_text = _('De titel die je hier opgeeft is '
-                                               'zichtbaar voor de FETC-GW-leden en,'
-                                               ' wanneer de aanvraag is goedgekeurd,'
-                                               ' ook voor alle medewerkers die in'
-                                               ' het archief van deze portal '
-                                               'kijken.')
-
         self.fields['parent'].label = _('Te amenderen aanvraag')
         self.fields['parent'].help_text = _('Dit veld toont enkel goedgekeurde'
                                             ' aanvragen waar je zelf een '
diff --git a/proposals/static/proposals/js/copy.js b/proposals/static/proposals/js/copy.js
deleted file mode 100644
index cedf6f664..000000000
--- a/proposals/static/proposals/js/copy.js
+++ /dev/null
@@ -1,10 +0,0 @@
-$(function () {
-     $('#id_parent').change(function () {
-         // Get the displayed value
-         let chosen = $( "#id_parent option:selected" ).text();
-         // Split on the ( and trim to remove the user part
-         chosen = chosen.split('(')[0].trim();
-         // Set it as the new title
-         $('#id_title').val(chosen);
-     })
-});
\ No newline at end of file
diff --git a/proposals/templates/proposals/proposal_copy.html b/proposals/templates/proposals/proposal_copy.html
index 5513bb8d9..deffbfe14 100644
--- a/proposals/templates/proposals/proposal_copy.html
+++ b/proposals/templates/proposals/proposal_copy.html
@@ -14,12 +14,6 @@
     - {{ block.super }}
 {% endblock %}
 
-{% block html_head %}
-    {% if is_revision or is_amendment %}
-        <script src="{% static 'proposals/js/copy.js' %}"></script>
-    {% endif %}
-{% endblock %}
-
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">

From 779cb580bc22d29e709854fa09c40891cc020e7b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 28 Nov 2023 15:04:29 +0100
Subject: [PATCH 100/148] fix #536. Link to revise on list page.

---
 locale/en/LC_MESSAGES/django.po               | 210 +++++++++---------
 proposals/api/serializers.py                  |   4 +-
 .../templates/proposals/proposal_list.html    |  13 +-
 .../vue_templates/proposal_list.html          |  14 +-
 4 files changed, 123 insertions(+), 118 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 4f89bcc22..444d514aa 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-21 16:02+0100\n"
+"POT-Creation-Date: 2023-11-28 14:55+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -186,7 +186,7 @@ msgstr "Intervention saved"
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:570 proposals/forms.py:653 proposals/forms.py:668
+#: proposals/forms.py:544 proposals/forms.py:627 proposals/forms.py:642
 #: studies/forms.py:104 tasks/forms.py:87
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
@@ -294,7 +294,7 @@ msgstr "Phase"
 #: proposals/api/views.py:92 proposals/api/views.py:122
 #: proposals/api/views.py:172
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:102
-#: proposals/templates/proposals/vue_templates/proposal_list.html:153
+#: proposals/templates/proposals/vue_templates/proposal_list.html:157
 #: reviews/api/views.py:49 reviews/api/views.py:280 reviews/api/views.py:342
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
@@ -328,7 +328,7 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:140
+#: main/templates/auth/user_detail.html:75 reviews/models.py:142
 msgid ", met revisie"
 msgstr ", with revision"
 
@@ -823,7 +823,7 @@ msgstr "Log out"
 
 #: main/templates/registration/logged_out.html:12
 msgid "Je bent succesvol uitgelogd."
-msgstr ""
+msgstr "You have logged out succesfully"
 
 #: main/templates/registration/logged_out.html:17
 #, python-format
@@ -850,7 +850,7 @@ msgid "Wachtwoord"
 msgstr "Password"
 
 #: main/templatetags/compare_tags.py:80
-#: proposals/templates/proposals/vue_templates/proposal_list.html:49
+#: proposals/templates/proposals/vue_templates/proposal_list.html:51
 #: reviews/templates/reviews/review_detail_sidebar.html:34
 #: reviews/templates/reviews/simple_compare_link.html:8
 #: reviews/templates/reviews/vue_templates/decision_list.html:53
@@ -1080,7 +1080,7 @@ msgstr "Date reviewed"
 #: proposals/api/views.py:96 proposals/api/views.py:134
 #: proposals/api/views.py:155
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:71
-#: proposals/templates/proposals/vue_templates/proposal_list.html:108
+#: proposals/templates/proposals/vue_templates/proposal_list.html:112
 msgid "Laatst bijgewerkt"
 msgstr "Last edited"
 
@@ -1097,7 +1097,7 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:64 proposals/forms.py:280 proposals/validators.py:25
+#: proposals/forms.py:64 proposals/validators.py:25
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
@@ -1161,33 +1161,19 @@ msgstr ""
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:286 proposals/models.py:546
+#: proposals/forms.py:281 proposals/models.py:546
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:288 proposals/models.py:548
+#: proposals/forms.py:283 proposals/models.py:548
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:328 proposals/forms.py:363
-msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen."
-msgstr "You can, if necessary, change the title of your application here."
-
-#: proposals/forms.py:330 proposals/forms.py:365
-msgid ""
-"De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
-"de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
-"deze portal kijken."
-msgstr ""
-"The title you submit here will be visible to the FEtC-H members and, if the "
-"application is approved, also to employees viewing the archive of this "
-"portal."
-
-#: proposals/forms.py:337
+#: proposals/forms.py:321
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:338
+#: proposals/forms.py:322
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1195,70 +1181,70 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:372
+#: proposals/forms.py:346
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:373
+#: proposals/forms.py:347
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:428 proposals/forms.py:558 proposals/forms.py:587
-#: proposals/forms.py:701
+#: proposals/forms.py:402 proposals/forms.py:532 proposals/forms.py:561
+#: proposals/forms.py:675
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:436
+#: proposals/forms.py:410
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:494
+#: proposals/forms.py:468
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:502
+#: proposals/forms.py:476
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:504
+#: proposals/forms.py:478
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:506
+#: proposals/forms.py:480
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:508
+#: proposals/forms.py:482
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:510
+#: proposals/forms.py:484
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:512
+#: proposals/forms.py:486
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:514
+#: proposals/forms.py:488
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:516
+#: proposals/forms.py:490
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:518
+#: proposals/forms.py:492
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:520
+#: proposals/forms.py:494
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:564
+#: proposals/forms.py:538
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1266,19 +1252,19 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:598
+#: proposals/forms.py:572
 msgid "Nieuwe beoogde startdatum"
 msgstr "New intended start date"
 
-#: proposals/forms.py:660
+#: proposals/forms.py:634
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:664
+#: proposals/forms.py:638
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:676
+#: proposals/forms.py:650
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1286,7 +1272,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:707
+#: proposals/forms.py:681
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1635,7 +1621,7 @@ msgstr ""
 "proposals."
 
 #: proposals/models.py:430 proposals/utils/pdf_diff_logic.py:990
-#: reviews/models.py:189
+#: reviews/models.py:191
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
@@ -1701,7 +1687,7 @@ msgstr ""
 
 #: proposals/models.py:525
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
-#: proposals/templates/proposals/vue_templates/proposal_list.html:166
+#: proposals/templates/proposals/vue_templates/proposal_list.html:170
 msgid "Promotor/Begeleider"
 msgstr "Promotor/Supervisor"
 
@@ -1914,14 +1900,14 @@ msgid "Weet je zeker dat je de aanvraag <em>%(title)s</em> wilt verwijderen?"
 msgstr "Are you sure you want to delete the application <em>%(title)s</em>?"
 
 #: proposals/templates/proposals/proposal_confirm_delete.html:19
-#: proposals/templates/proposals/vue_templates/proposal_list.html:64
+#: proposals/templates/proposals/vue_templates/proposal_list.html:66
 #: tasks/templates/tasks/session_confirm_delete.html:18
 #: tasks/templates/tasks/task_confirm_delete.html:17
 msgid "Verwijderen"
 msgstr "Delete"
 
 #: proposals/templates/proposals/proposal_confirm_delete.html:21
-#: proposals/templates/proposals/proposal_copy.html:99
+#: proposals/templates/proposals/proposal_copy.html:93
 #: tasks/templates/tasks/session_confirm_delete.html:19
 #: tasks/templates/tasks/task_confirm_delete.html:18
 msgid "Annuleren"
@@ -1941,21 +1927,21 @@ msgstr ""
 "    "
 
 #: proposals/templates/proposals/proposal_copy.html:8
-#: proposals/templates/proposals/proposal_copy.html:28
+#: proposals/templates/proposals/proposal_copy.html:22
 msgid "Revisie starten"
 msgstr "Start a revision"
 
 #: proposals/templates/proposals/proposal_copy.html:10
-#: proposals/templates/proposals/proposal_copy.html:30
+#: proposals/templates/proposals/proposal_copy.html:24
 msgid "Amendement aanmaken"
 msgstr "Create an amendment"
 
 #: proposals/templates/proposals/proposal_copy.html:12
-#: proposals/templates/proposals/proposal_copy.html:32
+#: proposals/templates/proposals/proposal_copy.html:26
 msgid "Een geheel nieuwe aanvraag indienen op basis van een oude studie"
 msgstr "Submit an entirely new application from a copy of an old application"
 
-#: proposals/templates/proposals/proposal_copy.html:37
+#: proposals/templates/proposals/proposal_copy.html:31
 msgid ""
 "Je kan hier op basis van de vorige versie van een aanvraag een revisie "
 "starten. Alleen studies die door de commissie als 'revisie noodzakelijk' "
@@ -1965,7 +1951,7 @@ msgstr ""
 "application. Only applications that have been marked as 'revision necessary' "
 "by the committee can be selected here. "
 
-#: proposals/templates/proposals/proposal_copy.html:43
+#: proposals/templates/proposals/proposal_copy.html:37
 msgid ""
 "Als je supervisor je heeft gevraagd revisies te maken, dien je je huidige "
 "versie aan te passen. (Als je dat niet kan, vraag dan aan je supervisor of "
@@ -1975,7 +1961,7 @@ msgstr ""
 "original application. (If you can't, ask your supervisor if they have "
 "correctly marked your study as 'revision necessary') "
 
-#: proposals/templates/proposals/proposal_copy.html:50
+#: proposals/templates/proposals/proposal_copy.html:44
 msgid ""
 "Let op! Er kan maar één revisie tegelijk bestaan. Mocht je jouw aanvraag "
 "hier niet zien als optie om te reviseren, bekijk dan of je aanvraag niet al "
@@ -1985,7 +1971,7 @@ msgstr ""
 "application in the list of options on this page, please check if your "
 "application is not already in your list of draft applications."
 
-#: proposals/templates/proposals/proposal_copy.html:58
+#: proposals/templates/proposals/proposal_copy.html:52
 msgid ""
 "Je kan hier op basis van een reeds goedgekeurde aanvraag een amendement "
 "indienen. Je studie moet eerst goedgekeurd en afgehandeld zijn voordat die "
@@ -1995,7 +1981,7 @@ msgstr ""
 "been approved. Your application must have been approved by the committee "
 "before it can be selected here. "
 
-#: proposals/templates/proposals/proposal_copy.html:64
+#: proposals/templates/proposals/proposal_copy.html:58
 msgid ""
 "Let op! Er kan maar één amendement tegelijk bestaan. Mocht je jouw aanvraag "
 "hier niet zien als optie om te reviseren, bekijk dan of je aanvraag niet al "
@@ -2006,14 +1992,14 @@ msgstr ""
 "check if your application is not already in the your list of draft "
 "applications."
 
-#: proposals/templates/proposals/proposal_copy.html:74
+#: proposals/templates/proposals/proposal_copy.html:68
 msgid ""
 "Je kan hier een aanvraag kopiëren. Alle velden kunnen na het kopiëren "
 "aangepast worden."
 msgstr ""
 "Here you can copy an application. All fields can be edited after copying."
 
-#: proposals/templates/proposals/proposal_copy.html:77
+#: proposals/templates/proposals/proposal_copy.html:71
 msgid ""
 "Deze pagina is alleen bedoeld voor het geval je een geheel nieuwe aanvraag "
 "gaat doen op basis van een eerder uitgevoerde aanvraag. Aanvragen t.b.v. "
@@ -2022,7 +2008,7 @@ msgstr ""
 "This page is only intended for creating an entirely new application based on "
 "a previous application. Applications for grant applications cannot be copied."
 
-#: proposals/templates/proposals/proposal_copy.html:83
+#: proposals/templates/proposals/proposal_copy.html:77
 #, python-format
 msgid ""
 "Als je gevraagd is om een revisie te maken van een eerder ingediende "
@@ -2031,7 +2017,7 @@ msgstr ""
 "If you have been asked to revise a previously submitted application, you can "
 "do so <a href=\"%(revision_url)s\">here</a>. "
 
-#: proposals/templates/proposals/proposal_copy.html:89
+#: proposals/templates/proposals/proposal_copy.html:83
 #, python-format
 msgid ""
 "Indien je wijzigingen hebt in een al goedgekeurde aanvraag die daarom "
@@ -2042,7 +2028,7 @@ msgstr ""
 "to be re-reviewed, please make an amendment <a "
 "href=\"%(amendment_url)s\">here</a>."
 
-#: proposals/templates/proposals/proposal_copy.html:101
+#: proposals/templates/proposals/proposal_copy.html:95
 msgid "Kopiëren"
 msgstr "Copy"
 
@@ -2279,13 +2265,13 @@ msgstr ""
 "different committee. If this is not the case, you are required to fill in "
 "the <a href=\"%(proposal_url)s\">full form</a>."
 
-#: proposals/templates/proposals/proposal_list.html:43
+#: proposals/templates/proposals/proposal_list.html:45
 #: proposals/templates/proposals/proposal_private_archive.html:43
 #: reviews/templates/reviews/action_explaination.html:19
 msgid "Uitleg"
 msgstr "Explanation"
 
-#: proposals/templates/proposals/proposal_list.html:47
+#: proposals/templates/proposals/proposal_list.html:49
 #: proposals/templates/proposals/proposal_private_archive.html:47
 #, python-format
 msgid ""
@@ -2295,7 +2281,7 @@ msgstr ""
 "Click <img src=\"%(img_next)s\" title=\"To next step\"> to move on to the "
 "next step in the progress."
 
-#: proposals/templates/proposals/proposal_list.html:54
+#: proposals/templates/proposals/proposal_list.html:56
 #: proposals/templates/proposals/proposal_private_archive.html:54
 #, python-format
 msgid ""
@@ -2307,7 +2293,7 @@ msgstr ""
 "differences between a previous version (only available for revisions/"
 "amendments)."
 
-#: proposals/templates/proposals/proposal_list.html:61
+#: proposals/templates/proposals/proposal_list.html:63
 #: proposals/templates/proposals/proposal_private_archive.html:61
 #, python-format
 msgid ""
@@ -2317,7 +2303,7 @@ msgstr ""
 "Click <img src=\"%(img_delete)s\" title=\"Delete\"> to delete your "
 "application."
 
-#: proposals/templates/proposals/proposal_list.html:68
+#: proposals/templates/proposals/proposal_list.html:70
 #: proposals/templates/proposals/proposal_private_archive.html:68
 #, python-format
 msgid ""
@@ -2328,6 +2314,14 @@ msgstr ""
 "application."
 
 #: proposals/templates/proposals/proposal_list.html:75
+msgid ""
+"Klik op <img src=\"%(img_revise)s\" title=\"Maak revisie\"> om een revisie "
+"aan te maken van je aanvraag."
+msgstr ""
+"Click <img src=\"%(img_revise)s\" title=\"Show\"> to create a revision "
+"for an application."
+
+#: proposals/templates/proposals/proposal_list.html:82
 #: proposals/templates/proposals/proposal_private_archive.html:75
 #, python-format
 msgid ""
@@ -2337,7 +2331,7 @@ msgstr ""
 "Click <img src=\"%(img_decide)s\" title=\"Decide\"> to make your decision "
 "(as a supervisor)."
 
-#: proposals/templates/proposals/proposal_list.html:82
+#: proposals/templates/proposals/proposal_list.html:89
 #: proposals/templates/proposals/proposal_private_archive.html:82
 #, python-format
 msgid ""
@@ -2347,7 +2341,7 @@ msgstr ""
 "Click <img src=\"%(img_hide)s\" title=\"Hide\"> to hide a submitted "
 "application from the archive."
 
-#: proposals/templates/proposals/proposal_list.html:88
+#: proposals/templates/proposals/proposal_list.html:95
 #: proposals/templates/proposals/proposal_private_archive.html:88
 #: reviews/templates/reviews/action_explaination.html:56
 #, python-format
@@ -3012,60 +3006,60 @@ msgstr ""
 "can be done after approval, or during a minimal revision."
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:43
-#: proposals/templates/proposals/vue_templates/proposal_list.html:73
+#: proposals/templates/proposals/vue_templates/proposal_list.html:75
 msgid "Inzien"
 msgstr "Show"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:50
-#: proposals/templates/proposals/vue_templates/proposal_list.html:87
+#: proposals/templates/proposals/vue_templates/proposal_list.html:91
 msgid "Soort aanvraag"
 msgstr "Type of application"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:57
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:65
-#: proposals/templates/proposals/vue_templates/proposal_list.html:94
-#: proposals/templates/proposals/vue_templates/proposal_list.html:102
+#: proposals/templates/proposals/vue_templates/proposal_list.html:98
+#: proposals/templates/proposals/vue_templates/proposal_list.html:106
 msgid "Besloten op"
 msgstr "Concluded on"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:78
-#: proposals/templates/proposals/vue_templates/proposal_list.html:115
+#: proposals/templates/proposals/vue_templates/proposal_list.html:119
 msgid "Status"
 msgstr "State"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:110
-#: proposals/templates/proposals/vue_templates/proposal_list.html:161
+#: proposals/templates/proposals/vue_templates/proposal_list.html:165
 msgid "Nog niet ingediend"
 msgstr "Not yet submitted"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:129
-#: proposals/templates/proposals/vue_templates/proposal_list.html:180
+#: proposals/templates/proposals/vue_templates/proposal_list.html:184
 msgid "Route:"
 msgstr "Route:"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:136
-#: proposals/templates/proposals/vue_templates/proposal_list.html:187
+#: proposals/templates/proposals/vue_templates/proposal_list.html:191
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
 #: reviews/templates/reviews/vue_templates/review_list.html:190
 msgid "Indieners"
 msgstr "Applicants"
 
-#: proposals/templates/proposals/vue_templates/proposal_list.html:41
+#: proposals/templates/proposals/vue_templates/proposal_list.html:43
 #: reviews/templates/reviews/vue_templates/decision_list.html:68
 #: reviews/templates/reviews/vue_templates/decision_list.html:71
 msgid "Beslissen"
 msgstr "Decide"
 
-#: proposals/templates/proposals/vue_templates/proposal_list.html:60
+#: proposals/templates/proposals/vue_templates/proposal_list.html:62
 msgid "Naar volgende stap"
 msgstr "To next step"
 
-#: proposals/templates/proposals/vue_templates/proposal_list.html:80
-msgid "Verberg"
-msgstr "Hide"
+#: proposals/templates/proposals/vue_templates/proposal_list.html:85
+msgid "Maak revisie"
+msgstr "Create revision"
 
-#: proposals/templates/proposals/vue_templates/proposal_list.html:139
+#: proposals/templates/proposals/vue_templates/proposal_list.html:143
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
 #: reviews/templates/reviews/vue_templates/review_list.html:145
@@ -3118,7 +3112,7 @@ msgstr ""
 "This section was present in the original application, but was removed for "
 "the revision."
 
-#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:131
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:133
 msgid "Onbekend"
 msgstr "Unknown"
 
@@ -3355,11 +3349,11 @@ msgstr "Route"
 msgid "Start datum"
 msgstr "Start date review"
 
-#: reviews/forms.py:14 reviews/models.py:147
+#: reviews/forms.py:14 reviews/models.py:149
 msgid "korte (2-weken) route"
 msgstr "short (2-week) route"
 
-#: reviews/forms.py:15 reviews/models.py:146
+#: reviews/forms.py:15 reviews/models.py:148
 msgid "lange (4-weken) route"
 msgstr "long (4-week) route"
 
@@ -3491,24 +3485,24 @@ msgstr "Post hoc negative advice by FETC-H"
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:183
+#: reviews/models.py:51 reviews/models.py:185
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:148
+#: reviews/models.py:150
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:177
+#: reviews/models.py:179
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:178
+#: reviews/models.py:180
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:179
+#: reviews/models.py:181
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
 
@@ -4234,31 +4228,31 @@ msgstr "FEtC-H {}: new application submitted"
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:325
+#: reviews/utils/review_utils.py:352
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:351
+#: reviews/utils/review_utils.py:378
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:354
+#: reviews/utils/review_utils.py:381
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:357
+#: reviews/utils/review_utils.py:384
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:360
+#: reviews/utils/review_utils.py:387
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:363
+#: reviews/utils/review_utils.py:390
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4266,7 +4260,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:369
+#: reviews/utils/review_utils.py:396
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4276,7 +4270,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:373
+#: reviews/utils/review_utils.py:400
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4286,7 +4280,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:380
+#: reviews/utils/review_utils.py:407
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4297,14 +4291,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:397
+#: reviews/utils/review_utils.py:424
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:401
+#: reviews/utils/review_utils.py:428
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4312,7 +4306,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:403
+#: reviews/utils/review_utils.py:430
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4322,11 +4316,11 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:408
+#: reviews/utils/review_utils.py:435
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:429
+#: reviews/utils/review_utils.py:456
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""
diff --git a/proposals/api/serializers.py b/proposals/api/serializers.py
index 2ddb94171..d1706f221 100644
--- a/proposals/api/serializers.py
+++ b/proposals/api/serializers.py
@@ -66,9 +66,9 @@ class Meta:
         fields = ['pk', 'reference_number', 'title', 'is_revision', 'type',
                   'date_confirmed', 'date_submitted',
                   'date_submitted_supervisor', 'date_reviewed', 'date_modified',
-                  'parent', 'latest_review', 'supervisor_decision',
+                  'parent', 'children', 'latest_review', 'supervisor_decision',
                   'applicants', 'status', 'supervisor', 'continue_url',
-                  'pdf', 'in_archive']
+                  'pdf', 'in_archive', 'is_pre_assessment', 'status_review']
 
     parent = serializers.SerializerMethodField()
 
diff --git a/proposals/templates/proposals/proposal_list.html b/proposals/templates/proposals/proposal_list.html
index 2c540360c..03664fc49 100644
--- a/proposals/templates/proposals/proposal_list.html
+++ b/proposals/templates/proposals/proposal_list.html
@@ -37,6 +37,8 @@ <h2>{{ title }}</h2>
             {% static "proposals/images/folder_delete.png" as img_hide %}
             {% static "proposals/images/folder_add.png" as img_add %}
             {% static 'reviews/images/scale.png' as img_decide %}
+            {% static 'proposals/images/pencil.png' as img_revise %}
+
             <p>
                 {{ body }}
             </p>
@@ -62,11 +64,16 @@ <h3>{% trans "Uitleg" %}</h3>
                             Klik op <img src="{{ img_delete }}" title="Verwijderen"> om je aanvraag te verwijderen.
                         {% endblocktrans %}
                     </li>
-                {% endif %}
-                {% if submitted %}
+                    {% endif %}
+                    {% if submitted %}
+                    <li>
+                        {% blocktrans trimmed %}
+                        Klik op <img src="{{ img_pdf }}" title="Inzien"> om een ingediende aanvraag in te zien.
+                        {% endblocktrans %}
+                    </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_pdf }}" title="Inzien"> om een ingediende aanvraag in te zien.
+                            Klik op <img src="{{ img_revise }}" title="Maak revisie"> om een revisie aan te maken van je aanvraag.
                         {% endblocktrans %}
                     </li>
                 {% endif %}
diff --git a/proposals/templates/proposals/vue_templates/proposal_list.html b/proposals/templates/proposals/vue_templates/proposal_list.html
index 53edb90be..a80c4f53d 100644
--- a/proposals/templates/proposals/vue_templates/proposal_list.html
+++ b/proposals/templates/proposals/vue_templates/proposal_list.html
@@ -7,6 +7,8 @@
 {% static "main/images/page_white_acrobat.png" as img_pdf %}
 {% static "proposals/images/folder_delete.png" as img_hide %}
 {% static 'reviews/images/scale.png' as img_decide %}
+{% static 'proposals/images/pencil.png' as img_revise %}
+
 
 <script type="text/x-template" id="proposalsUFLList">
     <FancyList
@@ -73,15 +75,17 @@ <h4>
                      title="{% trans 'Inzien' %}">
             </a>
             <a
-                :href="$url('proposals:archive_status', [proposal.pk])"
-                v-if="proposal.in_archive && context.is_secretary"
+                v-if="!proposal.is_pre_assessment &&
+                proposal.status == context.proposal.DECISION_MADE &&
+                !proposal.status_review &&
+                proposal.children.length === 0"
+                :href="$url('proposals:copy_revision')"
             >
-                <img src="{{ img_hide }}"
-                     title="{% trans 'Verberg' %}">
+                <img src="{{ img_revise }}"
+                     title="{% trans 'Maak revisie' %}">
             </a>
         </template>
 
-
         <template #undertitle="{ item: proposal, context }">
             <div class="ufl-undertitle-line">
                 {% trans 'Soort aanvraag' %}:

From 54c4d1ad6a3940381ae39cb1eb77ede4dd2ed39b Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 28 Nov 2023 15:36:00 +0100
Subject: [PATCH 101/148] fix #584. Minor textual change

---
 locale/en/LC_MESSAGES/django.po | 11 ++++++-----
 reviews/utils/review_actions.py |  2 +-
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 444d514aa..130581fcb 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-28 14:55+0100\n"
+"POT-Creation-Date: 2023-11-28 15:08+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -2314,12 +2314,13 @@ msgstr ""
 "application."
 
 #: proposals/templates/proposals/proposal_list.html:75
+#, python-format
 msgid ""
 "Klik op <img src=\"%(img_revise)s\" title=\"Maak revisie\"> om een revisie "
 "aan te maken van je aanvraag."
 msgstr ""
-"Click <img src=\"%(img_revise)s\" title=\"Show\"> to create a revision "
-"for an application."
+"Click <img src=\"%(img_revise)s\" title=\"Show\"> to create a revision for "
+"an application."
 
 #: proposals/templates/proposals/proposal_list.html:82
 #: proposals/templates/proposals/proposal_private_archive.html:75
@@ -4175,8 +4176,8 @@ msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
 #: reviews/utils/review_actions.py:156
-msgid "Deze aanvraag afsluiten"
-msgstr "Conclude this application"
+msgid "Deze versie afhandelen"
+msgstr "Conclude this version"
 
 #: reviews/utils/review_actions.py:186
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py
index 41801ca66..3734c6e5c 100644
--- a/reviews/utils/review_actions.py
+++ b/reviews/utils/review_actions.py
@@ -153,7 +153,7 @@ def action_url(self):
 
     def description(self):
 
-        return _('Deze aanvraag afsluiten')
+        return _('Deze versie afhandelen')
 
 
 class DiscontinueReview(ReviewAction):

From 7ba8d6024efb12c74c211d3b1a158e4a0925dadc Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 30 Nov 2023 11:10:47 +0100
Subject: [PATCH 102/148] forgotten refactors for proposals/models.py

---
 proposals/templates/proposals/wmo_application.html | 2 +-
 proposals/utils/pdf_diff_logic.py                  | 8 ++++----
 proposals/utils/validate_proposal.py               | 2 +-
 proposals/views/proposal_views.py                  | 2 +-
 reviews/templatetags/documents_list.py             | 2 +-
 reviews/utils/review_utils.py                      | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/proposals/templates/proposals/wmo_application.html b/proposals/templates/proposals/wmo_application.html
index a34a74eb1..70cefa2df 100644
--- a/proposals/templates/proposals/wmo_application.html
+++ b/proposals/templates/proposals/wmo_application.html
@@ -28,7 +28,7 @@ <h2>
             </h2>
             <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
                 <table>{{ form.as_table }}</table>
-                {% if wmo.status == wmo.WAITING %}
+                {% if wmo.status == wmo.WMOStatuses.WAITING %}
                     <div class="warning">
                         {% trans "Zolang je aanvraag nog niet is beoordeeld door de METC, kan je niet verder in het aanmeldingsproces." %}
                     </div>
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 9daef35f8..6956158c0 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -1095,8 +1095,8 @@ def create_context_diff(context, old_proposal, new_proposal):
         
         if new_proposal.is_pre_assessment:
             if (
-                new_proposal.wmo.status != new_proposal.wmo.NO_WMO
-                or old_proposal.wmo.status != old_proposal.wmo.NO_WMO
+                new_proposal.wmo.status != new_proposal.wmo.WMOStatuses.NO_WMO
+                or old_proposal.wmo.status != old_proposal.wmo.WMOStatuses.NO_WMO
             ):
                 sections.append(
                     DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
@@ -1109,8 +1109,8 @@ def create_context_diff(context, old_proposal, new_proposal):
             )
 
             if (
-                new_proposal.wmo.status == new_proposal.wmo.NO_WMO
-                or new_proposal.wmo.status == new_proposal.wmo.JUDGED
+                new_proposal.wmo.status == new_proposal.wmo.WMOStatuses.NO_WMO
+                or new_proposal.wmo.status == new_proposal.wmo.WMOStatuses.JUDGED
             ):
                 for old_study, new_study in zip_equalize_lists(
                     old_proposal.study_set.all(), new_proposal.study_set.all()
diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 7e6ee914f..427d9b870 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -69,7 +69,7 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
             _('Ethische toetsing nodig door een METC?'),
             proposal.wmo,
         )
-        if proposal.wmo.status != proposal.wmo.NO_WMO:
+        if proposal.wmo.status != proposal.wmo.WMOStatuses.NO_WMO:
             forms['wmo_application'] = (
                 WmoApplicationForm,
                 reverse(wmo_application_url, args=[proposal.pk]),
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index c170f12c0..13a13fe5d 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -431,7 +431,7 @@ def check_start_date(self):
         return start_date <= two_weeks_from_now
 
     def is_supervisor_edit_phase(self):
-        if self.object.status == self.object.SUBMITTED_TO_SUPERVISOR:
+        if self.object.status == self.object.Statuses.SUBMITTED_TO_SUPERVISOR:
             return True
 
         return False
diff --git a/reviews/templatetags/documents_list.py b/reviews/templatetags/documents_list.py
index 19b5972b4..7533a0347 100644
--- a/reviews/templatetags/documents_list.py
+++ b/reviews/templatetags/documents_list.py
@@ -252,7 +252,7 @@ def documents_list(review, user):
         pdf_container.items.append(dmp_file)
 
     # WMO
-    if hasattr(proposal, 'wmo') and proposal.wmo.status == proposal.wmo.JUDGED:
+    if hasattr(proposal, 'wmo') and proposal.wmo.status == proposal.wmo.WMOStatuses.JUDGED:
 
         metc_decision = DocItem(_('Beslissing METC'))
         metc_decision.field = proposal.wmo.metc_decision_pdf
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index b5025984e..01bc52e86 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -222,7 +222,7 @@ def start_review_pre_assessment(proposal):
     review.save()
 
     proposal.date_submitted = timezone.now()
-    proposal.status = proposal.SUBMITTED
+    proposal.status = proposal.Statuses.SUBMITTED
     proposal.save()
 
     secretary = get_secretary()
@@ -466,7 +466,7 @@ def discontinue_review(review):
 
     # Set review continuation
     review.continuation = review.DISCONTINUED
-    review.proposal.status = review.proposal.DECISION_MADE
+    review.proposal.status = review.proposal.Statuses.DECISION_MADE
     review.stage = review.CLOSED
     review.date_end = datetime.datetime.now()
     review.save()

From 5bbbbaf1f35447cf6125d1ed8bf0169cd594e16a Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 30 Nov 2023 11:41:09 +0100
Subject: [PATCH 103/148] forgotten refactors for reviews/models.py

---
 main/templates/auth/user_detail.html               | 10 +++++-----
 .../templates/reviews/review_detail_sidebar.html   |  2 +-
 .../templates/reviews/review_discontinue_form.html |  2 +-
 reviews/utils/review_actions.py                    | 14 +++++++-------
 reviews/utils/review_utils.py                      |  8 ++++----
 reviews/views.py                                   |  6 +++---
 6 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/main/templates/auth/user_detail.html b/main/templates/auth/user_detail.html
index 2fd0f3175..922bf06f4 100644
--- a/main/templates/auth/user_detail.html
+++ b/main/templates/auth/user_detail.html
@@ -70,7 +70,7 @@ <h3>{% trans 'Ingediende aanvragen' %}</h3>
                         <td data-order="{{ review.date_start|date:'c' }}">{{ review.date_should_end|date:"j M Y" }}</td>
                         <td>{{ decision.get_go_display|default:"" }}</td>
                         <td>
-                            {% if review.stage == review.CLOSED %}
+                            {% if review.stage == review.Stages.CLOSED %}
                                 {% if review.proposal.has_minor_revision %}
                                     {{ review.get_continuation_display }}{% trans ', met revisie' %}
                                 {% else %}
@@ -84,15 +84,15 @@ <h3>{% trans 'Ingediende aanvragen' %}</h3>
                                     title="{% trans 'Aanvraag inzien' %}"></a>
                             <a href="{% url 'reviews:detail' review.pk %}"><img
                                     src="{% static 'main/images/zoom.png' %}" title="{% trans 'Details' %}"></a>
-                            {% if user|is_secretary and review.stage == review.ASSIGNMENT %}
+                            {% if user|is_secretary and review.stage == review.Stages.ASSIGNMENT %}
                                 <a href="{% url 'reviews:assign' review.pk %}"><img
                                         src="{% static 'reviews/images/user_add.png' %}"
                                         title="{% trans 'Aanstellen' %}"></a>
-                            {% elif user|is_secretary and review.stage == review.CLOSING %}
+                            {% elif user|is_secretary and review.stage == review.Stages.CLOSING %}
                                 <a href="{% url 'reviews:close' review.pk %}"><img
                                         src="{% static 'reviews/images/accept.png' %}" title="{% trans 'Afsluiten' %}"></a>
-                            {% elif user|is_secretary and review.stage == review.CLOSED %}
-                                {% if review.continuation == review.GO or review.continuation == review.GO_POST_HOC %}
+                            {% elif user|is_secretary and review.stage == review.Stages.CLOSED %}
+                                {% if review.continuation == review.Continuations.GO or review.continuation == review.Continuations.GO_POST_HOC %}
                                     <a href="{% url 'proposals:archive_export' review.proposal.pk %}">
                                         <img src="{% static 'reviews/images/website.png' %}"
                                              title="{% trans 'Website export tekst' %}">
diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html
index da68c5636..8c2e1b004 100644
--- a/reviews/templates/reviews/review_detail_sidebar.html
+++ b/reviews/templates/reviews/review_detail_sidebar.html
@@ -62,7 +62,7 @@ <h3>
                 {% endblocktrans %}
             </li>
         {% endif %}
-        {% if review.stage == review.CLOSED %}
+        {% if review.stage == review.Stages.CLOSED %}
             <li>
                 {% blocktrans with continuation=review.get_continuation_display %}
                     Afhandeling:<br/> {{ continuation }}.
diff --git a/reviews/templates/reviews/review_discontinue_form.html b/reviews/templates/reviews/review_discontinue_form.html
index c0ee9b92f..f12e40821 100644
--- a/reviews/templates/reviews/review_discontinue_form.html
+++ b/reviews/templates/reviews/review_discontinue_form.html
@@ -48,7 +48,7 @@ <h2>
                 in de lijst met "alle ingediende aanvragen".
                 {% endblocktrans %}
             </p>
-            {% if review.stage == review.CLOSED %}
+            {% if review.stage == review.Stages.CLOSED %}
             <p>
                 <strong>
                     {% trans "Attentie" %}
diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py
index 60f8a7a55..ac8e6c107 100644
--- a/reviews/utils/review_actions.py
+++ b/reviews/utils/review_actions.py
@@ -94,7 +94,7 @@ def get_available_decision(self):
         user = self.user
         review = self.review
 
-        if review.stage != review.COMMISSION:
+        if review.stage != review.Stages.COMMISSION:
             return False
 
         try:
@@ -138,7 +138,7 @@ def is_available(self):
 
         review = self.review
 
-        if review.stage != review.CLOSING:
+        if review.stage != review.Stages.CLOSING:
             return False
 
         user_groups = self.user.groups.values_list("name", flat=True)
@@ -169,9 +169,9 @@ def is_available(self):
         if not settings.GROUP_SECRETARY in user_groups:
             return False
 
-        if review.continuation in [review.DISCONTINUED,
-                                   review.GO,
-                                   review.GO_POST_HOC,
+        if review.continuation in [review.Continuations.DISCONTINUED,
+                                   review.Continuations.GO,
+                                   review.Continuations.GO_POST_HOC,
                                    ]:
             return False
 
@@ -228,10 +228,10 @@ def is_available(self):
         if not settings.GROUP_SECRETARY in user_groups:
             return False
         
-        if review.stage < review.CLOSED:
+        if review.stage < review.Stages.CLOSED:
             return False
         
-        if not review.continuation in [review.GO, review.GO_POST_HOC]:
+        if not review.continuation in [review.Continuations.GO, review.Continuations.GO_POST_HOC]:
             return False
         
         return True
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 01bc52e86..ec0d2ee18 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -465,9 +465,9 @@ def discontinue_review(review):
     and set DECISION_MADE on its proposal. """
 
     # Set review continuation
-    review.continuation = review.DISCONTINUED
+    review.continuation = review.Continuations.DISCONTINUED
     review.proposal.status = review.proposal.Statuses.DECISION_MADE
-    review.stage = review.CLOSED
+    review.stage = review.Stages.CLOSED
     review.date_end = datetime.datetime.now()
     review.save()
     review.proposal.save()
@@ -478,9 +478,9 @@ def assign_reviewers(review, list_of_users, route):
 
     # Set stage to commission if users are assigned
     if len(list_of_users) > 0:
-        review.stage = review.COMMISSION
+        review.stage = review.Stages.COMMISSION
     else:
-        review.stage = review.ASSIGNMENT
+        review.stage = review.Stages.ASSIGNMENT
 
     current_reviewers = set(review.current_reviewers())
     new_reviewers = list_of_users - current_reviewers
diff --git a/reviews/views.py b/reviews/views.py
index 70ed8550f..8ac4761f8 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -382,9 +382,9 @@ def dispatch(self, request, *args, **kwargs):
         review = self.get_object()
 
         if review.continuation in [
-            review.DISCONTINUED,
-            review.GO,
-            review.GO_POST_HOC,
+            review.Continuations.DISCONTINUED,
+            review.Continuations.GO,
+            review.Continuations.GO_POST_HOC,
         ]:
             return HttpResponseRedirect(self.get_success_url())
 

From c8ca97c8eb3ba603eed1703d73ae52060112e460 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 30 Nov 2023 15:56:21 +0100
Subject: [PATCH 104/148] created is_revisable propery method on proposal

---
 proposals/api/serializers.py                         |  4 ++--
 proposals/models.py                                  | 12 ++++++++++++
 .../proposals/vue_templates/proposal_list.html       | 12 ++++++++----
 3 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/proposals/api/serializers.py b/proposals/api/serializers.py
index d1706f221..173e5270a 100644
--- a/proposals/api/serializers.py
+++ b/proposals/api/serializers.py
@@ -66,9 +66,9 @@ class Meta:
         fields = ['pk', 'reference_number', 'title', 'is_revision', 'type',
                   'date_confirmed', 'date_submitted',
                   'date_submitted_supervisor', 'date_reviewed', 'date_modified',
-                  'parent', 'children', 'latest_review', 'supervisor_decision',
+                  'parent', 'latest_review', 'supervisor_decision',
                   'applicants', 'status', 'supervisor', 'continue_url',
-                  'pdf', 'in_archive', 'is_pre_assessment', 'status_review']
+                  'pdf', 'in_archive', 'is_revisable']
 
     parent = serializers.SerializerMethodField()
 
diff --git a/proposals/models.py b/proposals/models.py
index 4c18b8dbb..6805206d6 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -546,6 +546,18 @@ class PracticeReasons(models.IntegerChoices):
         default=False,
     )
 
+    @property
+    def is_revisable(self):
+        """A check to see if a proposal is revisable. For use in Querysets,
+        keep in mind to also check if the user is one of the applicants 
+        or the supervisor."""
+        if not self.is_pre_assessment and \
+           not self.status_review and \
+           self.status == self.Statuses.DECISION_MADE and \
+           not self.children.all():
+            return True
+        return False
+
     def is_practice(self):
         return self.in_course or self.is_exploration
 
diff --git a/proposals/templates/proposals/vue_templates/proposal_list.html b/proposals/templates/proposals/vue_templates/proposal_list.html
index a80c4f53d..7e36396f3 100644
--- a/proposals/templates/proposals/vue_templates/proposal_list.html
+++ b/proposals/templates/proposals/vue_templates/proposal_list.html
@@ -75,10 +75,14 @@ <h4>
                      title="{% trans 'Inzien' %}">
             </a>
             <a
-                v-if="!proposal.is_pre_assessment &&
-                proposal.status == context.proposal.DECISION_MADE &&
-                !proposal.status_review &&
-                proposal.children.length === 0"
+            :href="$url('proposals:archive_status', [proposal.pk])"
+            v-if="proposal.in_archive && context.is_secretary"
+            >
+            <img src="{{ img_hide }}"
+                 title="{% trans 'Verberg' %}">
+            </a>
+            <a
+                v-if="proposal.is_revisable"
                 :href="$url('proposals:copy_revision')"
             >
                 <img src="{{ img_revise }}"

From 06382582085150231de89ad924ee68e7e258a0da Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 5 Dec 2023 11:36:54 +0100
Subject: [PATCH 105/148] Fixes #590. Minor textual change + migration

---
 locale/en/LC_MESSAGES/django.po               | 400 +++++++++---------
 .../0052_alter_proposal_studies_similar.py    |  18 +
 proposals/models.py                           |   4 +-
 3 files changed, 222 insertions(+), 200 deletions(-)
 create mode 100644 proposals/migrations/0052_alter_proposal_studies_similar.py

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 130581fcb..1d0d2c780 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-11-28 15:08+0100\n"
+"POT-Creation-Date: 2023-12-05 11:33+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -37,7 +37,7 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 #: faqs/menus.py:17 main/templates/main/index.html:209
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
-#: proposals/utils/pdf_diff_logic.py:869
+#: proposals/utils/pdf_diff_logic.py:868
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -144,12 +144,12 @@ msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
 #: interventions/templates/interventions/intervention_form.html:49
-#: proposals/utils/pdf_diff_logic.py:596
+#: proposals/utils/pdf_diff_logic.py:595
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
 #: interventions/templates/interventions/intervention_form.html:17
-#: main/models.py:57
+#: main/models.py:50
 #: observations/templates/observations/observation_form.html:27
 #: studies/templates/studies/study_end.html:67
 #: studies/templates/studies/study_end.html:98
@@ -174,7 +174,7 @@ msgstr ""
 "research\" on the previous page to answer the required task questions "
 "related to tasks."
 
-#: interventions/utils.py:11 studies/models.py:144 studies/models.py:262
+#: interventions/utils.py:11 studies/models.py:254
 #: studies/templates/studies/study_end.html:58
 msgid "Interventieonderzoek"
 msgstr "Interventional research"
@@ -204,29 +204,29 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:10 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
+#: main/models.py:8 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:11 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
+#: main/models.py:9 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
 msgid "nee"
 msgstr "no"
 
-#: main/models.py:12
+#: main/models.py:10
 msgid "twijfel"
 msgstr "uncertain"
 
-#: main/models.py:66
+#: main/models.py:59
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:70 observations/models.py:129 proposals/models.py:263
-#: studies/models.py:208 studies/models.py:244 tasks/models.py:157
+#: main/models.py:63 observations/models.py:129 proposals/models.py:252
+#: studies/models.py:200 studies/models.py:236 tasks/models.py:157
 #: tasks/models.py:169
 msgid "Namelijk"
 msgstr "Please specify"
 
-#: main/models.py:75
+#: main/models.py:68
 msgid ""
 "Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of "
 "een ander persoon die bevoegd is?"
@@ -234,13 +234,13 @@ msgstr ""
 "Will the task be conducted under the supervision of the teacher or another "
 "qualified person?"
 
-#: main/models.py:81
+#: main/models.py:74
 msgid "Is de testleider in het bezit van een VOG?"
 msgstr ""
 "Does the test leader hold a Certificate of Conduct (Verklaring Omtrent "
 "Gedrag, VOG)?"
 
-#: main/models.py:82
+#: main/models.py:75
 msgid ""
 "Iedereen die op een school werkt moet in het bezit         zijn van een "
 "Verklaring Omtrent Gedrag (VOG, zie         <a href=\"https://www.justis.nl/"
@@ -294,7 +294,7 @@ msgstr "Phase"
 #: proposals/api/views.py:92 proposals/api/views.py:122
 #: proposals/api/views.py:172
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:102
-#: proposals/templates/proposals/vue_templates/proposal_list.html:157
+#: proposals/templates/proposals/vue_templates/proposal_list.html:161
 #: reviews/api/views.py:49 reviews/api/views.py:280 reviews/api/views.py:342
 #: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
@@ -317,7 +317,7 @@ msgid "Mijn besluit"
 msgstr "My decision"
 
 #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
-#: reviews/models.py:57
+#: reviews/models.py:43
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
 #: reviews/templates/reviews/vue_templates/review_list.html:137
 msgid "Afhandeling"
@@ -328,7 +328,7 @@ msgstr "Conclusion"
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:142
+#: main/templates/auth/user_detail.html:75 reviews/models.py:125
 msgid ", met revisie"
 msgstr ", with revision"
 
@@ -921,8 +921,8 @@ msgid ""
 msgstr "As might happen on forums where the researcher also has an account."
 
 #: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:745 studies/models.py:172
-#: studies/models.py:228 studies/models.py:358
+#: observations/models.py:88 proposals/models.py:742 studies/models.py:164
+#: studies/models.py:220 studies/models.py:350
 msgid "Licht toe"
 msgstr "Explain"
 
@@ -1005,7 +1005,7 @@ msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
 #: observations/templates/observations/observation_form.html:44
-#: proposals/utils/pdf_diff_logic.py:652
+#: proposals/utils/pdf_diff_logic.py:651
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
@@ -1062,7 +1062,7 @@ msgstr ""
 msgid "Terug naar de vorige pagina"
 msgstr "Back to the previous page"
 
-#: observations/utils.py:8 studies/models.py:143 studies/models.py:265
+#: observations/utils.py:8 studies/models.py:257
 #: studies/templates/studies/study_end.html:89
 msgid "Observatieonderzoek"
 msgstr "Observational research"
@@ -1080,7 +1080,7 @@ msgstr "Date reviewed"
 #: proposals/api/views.py:96 proposals/api/views.py:134
 #: proposals/api/views.py:155
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:71
-#: proposals/templates/proposals/vue_templates/proposal_list.html:112
+#: proposals/templates/proposals/vue_templates/proposal_list.html:116
 msgid "Laatst bijgewerkt"
 msgstr "Last edited"
 
@@ -1088,7 +1088,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:43 proposals/models.py:229
+#: proposals/forms.py:43 proposals/models.py:218
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1161,11 +1161,11 @@ msgstr ""
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:281 proposals/models.py:546
+#: proposals/forms.py:281 proposals/models.py:535
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:283 proposals/models.py:548
+#: proposals/forms.py:283 proposals/models.py:537
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
@@ -1361,40 +1361,40 @@ msgstr "Archive"
 msgid "Aanvraag %(title)s bewerkt"
 msgstr "Application %(title)s edited"
 
-#: proposals/models.py:142
+#: proposals/models.py:137
 msgid "Concept"
 msgstr "Draft"
 
-#: proposals/models.py:145
+#: proposals/models.py:138
 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke"
 msgstr "Sent for assessment by the researcher with final responsibility"
 
-#: proposals/models.py:146
+#: proposals/models.py:139
 msgid "Opgestuurd ter beoordeling door FETC-GW"
 msgstr "Sent for assessment by FEtC-H"
 
-#: proposals/models.py:148 proposals/models.py:149
+#: proposals/models.py:140 proposals/models.py:141
 msgid "Aanvraag is beoordeeld door FETC-GW"
 msgstr "Application has been assessed by FEtC-H"
 
-#: proposals/models.py:155
-msgid "in het kader van een cursus"
-msgstr "in the context of a course"
-
-#: proposals/models.py:156
+#: proposals/models.py:144
 msgid "om de portal te exploreren"
 msgstr "to explore the portal"
 
+#: proposals/models.py:145
+msgid "in het kader van een cursus"
+msgstr "in the context of a course"
+
 # Not actually used in the interface
-#: proposals/models.py:168
+#: proposals/models.py:157
 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?"
 msgstr "Which chamber should be reviewing this application?"
 
-#: proposals/models.py:177
+#: proposals/models.py:166
 msgid "Aan welk onderzoeksinstituut ben je verbonden?"
 msgstr "To which research institute are you affiliated?"
 
-#: proposals/models.py:183
+#: proposals/models.py:172
 msgid ""
 "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt "
 "ingediend?"
@@ -1402,7 +1402,7 @@ msgstr ""
 "What is the desired starting date of the actual research for which this "
 "application is being submitted?"
 
-#: proposals/models.py:184
+#: proposals/models.py:173
 msgid ""
 "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW "
 "de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer gegeven "
@@ -1412,7 +1412,7 @@ msgstr ""
 "has approved it cannot receive formal approval; in such cases, the FEtC-H "
 "only provides a post-hoc advice."
 
-#: proposals/models.py:193
+#: proposals/models.py:182
 msgid ""
 "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle "
 "formele correspondentie."
@@ -1420,7 +1420,7 @@ msgstr ""
 "What is the title of your application? This title will be used in all formal "
 "correspondence."
 
-#: proposals/models.py:198
+#: proposals/models.py:187
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1432,7 +1432,7 @@ msgstr ""
 "portal. The title cannot be identical to that of a study you have previously "
 "submitted."
 
-#: proposals/models.py:206
+#: proposals/models.py:195
 msgid ""
 "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. "
 "Gebruik maximaal 200 woorden."
@@ -1440,7 +1440,7 @@ msgstr ""
 "Give a clear, concise description of the research question or questions. Use "
 "a maximum of 200 words."
 
-#: proposals/models.py:214
+#: proposals/models.py:203
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd "
 "zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?"
@@ -1448,7 +1448,7 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:217
+#: proposals/models.py:206
 msgid ""
 "Werk je samen met een onderzoeker of organisatie buiten de UU en is je "
 "onderzoek niet strikt anoniem? Neem dan contact op met de <a href=\"mailto:"
@@ -1460,11 +1460,11 @@ msgstr ""
 "gw@uu.nl\">privacy officer</a>. Agreements may then have to be made about "
 "the processing of personal data."
 
-#: proposals/models.py:237
+#: proposals/models.py:226
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:242
+#: proposals/models.py:231
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
 "Nederlands of Engels?"
@@ -1472,30 +1472,30 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:249
+#: proposals/models.py:238
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:258
+#: proposals/models.py:247
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:269
+#: proposals/models.py:258
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:273
+#: proposals/models.py:262
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:279
+#: proposals/models.py:268
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:285
+#: proposals/models.py:274
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
 "faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS "
@@ -1518,7 +1518,7 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:305
+#: proposals/models.py:294
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
 "ervoor kiezen je applicatie pas later op te laten nemen in het           "
@@ -1530,16 +1530,16 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:316
+#: proposals/models.py:305
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:326
+#: proposals/models.py:315
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:334
+#: proposals/models.py:323
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
 "deze FETC-GW commissie?"
@@ -1547,11 +1547,11 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:342
+#: proposals/models.py:331
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:350
+#: proposals/models.py:339
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
 "doc(x)-formaat)"
@@ -1559,22 +1559,22 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:358
+#: proposals/models.py:347
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:363
+#: proposals/models.py:352
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:375
+#: proposals/models.py:364
 msgid ""
-"Kan voor alle deelnemersgroepen dezelfde informatiebrief en         "
-"toestemmingsverklaring gebruikt worden?"
+"Kan voor alle deelnemers dezelfde informatiebrief en, indien van           "
+"toepassing, dezelfde toestemmingsverklaring gebruikt worden?"
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:377
+#: proposals/models.py:366
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
 "sprake van in essentie hetzelfde traject, en voldoet één set documenten voor "
@@ -1598,11 +1598,11 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:393
+#: proposals/models.py:382
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:411
+#: proposals/models.py:400
 msgid ""
 "Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de "
 "privacy officer."
@@ -1610,7 +1610,7 @@ msgstr ""
 "I discussed my application and documents for participants with the privacy "
 "officer."
 
-#: proposals/models.py:418
+#: proposals/models.py:407
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
 "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het "
@@ -1620,24 +1620,24 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:430 proposals/utils/pdf_diff_logic.py:990
-#: reviews/models.py:191
+#: proposals/models.py:419 proposals/utils/pdf_diff_logic.py:989
+#: reviews/models.py:172
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:442
+#: proposals/models.py:431
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:447 reviews/forms.py:110
+#: proposals/models.py:436 reviews/forms.py:111
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:452
+#: proposals/models.py:441
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:458
+#: proposals/models.py:447
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
 "kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden."
@@ -1646,23 +1646,23 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:472
+#: proposals/models.py:461
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:480
+#: proposals/models.py:469
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:487
+#: proposals/models.py:476
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:494
+#: proposals/models.py:483
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:501
+#: proposals/models.py:490
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
 "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met "
@@ -1676,7 +1676,7 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:518
+#: proposals/models.py:507
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
 "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
@@ -1685,13 +1685,13 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:525
+#: proposals/models.py:514
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
-#: proposals/templates/proposals/vue_templates/proposal_list.html:170
+#: proposals/templates/proposals/vue_templates/proposal_list.html:174
 msgid "Promotor/Begeleider"
 msgstr "Promotor/Supervisor"
 
-#: proposals/models.py:528
+#: proposals/models.py:517
 msgid ""
 "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
 "                    naar je promotor of begeleider gestuurd worden. Deze "
@@ -1721,53 +1721,53 @@ msgstr ""
 "you wait for them to do this, but remember to come back and fill in this "
 "field before submitting."
 
-#: proposals/models.py:555
+#: proposals/models.py:544
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:627
+#: proposals/models.py:628
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:627 reviews/api/views.py:39 reviews/api/views.py:328
+#: proposals/models.py:628 reviews/api/views.py:39 reviews/api/views.py:328
 #: reviews/templates/reviews/committee_members_workload.html:36
 #: reviews/templates/reviews/committee_members_workload.html:82
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:633
+#: proposals/models.py:634
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:638
+#: proposals/models.py:639
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:640
+#: proposals/models.py:641
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:642
+#: proposals/models.py:643
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:730
+#: proposals/models.py:728
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:731
+#: proposals/models.py:729
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:732
+#: proposals/models.py:730
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:736
+#: proposals/models.py:733
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1775,11 +1775,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:750
+#: proposals/models.py:747
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:756
+#: proposals/models.py:753
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1787,7 +1787,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:758
+#: proposals/models.py:755
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1808,7 +1808,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:774
+#: proposals/models.py:771
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1817,15 +1817,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:781
+#: proposals/models.py:778
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:786
+#: proposals/models.py:783
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:824
+#: proposals/models.py:821
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -2054,7 +2054,7 @@ msgstr ""
 "follow with regard to data."
 
 #: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/utils/pdf_diff_logic.py:964
+#: proposals/utils/pdf_diff_logic.py:963
 #: reviews/templatetags/documents_list.py:245
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
@@ -2203,7 +2203,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_form.html:76
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:81
-#: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40
+#: proposals/utils/pdf_diff_logic.py:418 proposals/utils/proposal_utils.py:40
 #: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
 #: proposals/utils/validate_proposal.py:43
 #: proposals/utils/validate_proposal.py:50
@@ -2472,7 +2472,7 @@ msgstr ""
 #: proposals/templates/proposals/proposal_start.html:53
 #: proposals/templates/proposals/proposal_start_practice.html:55
 #: proposals/templates/proposals/study_start.html:73
-#: proposals/utils/pdf_diff_logic.py:328
+#: proposals/utils/pdf_diff_logic.py:327
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Traject"
 msgstr "Trajectory"
@@ -2799,7 +2799,7 @@ msgid "Concept-aanmelding versturen"
 msgstr "Submit draft application"
 
 #: proposals/templates/proposals/proposal_submit.html:181
-#: proposals/utils/pdf_diff_logic.py:972
+#: proposals/utils/pdf_diff_logic.py:971
 msgid "Aanmelding versturen"
 msgstr "Submit application"
 
@@ -2947,7 +2947,7 @@ msgstr "Additional forms"
 
 #: proposals/templates/proposals/study_start.html:7
 #: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/pdf_diff_logic.py:521
+#: proposals/utils/pdf_diff_logic.py:520
 #: proposals/utils/validate_proposal.py:87
 msgid "Eén of meerdere trajecten?"
 msgstr "One or more trajectories?"
@@ -3012,34 +3012,34 @@ msgid "Inzien"
 msgstr "Show"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:50
-#: proposals/templates/proposals/vue_templates/proposal_list.html:91
+#: proposals/templates/proposals/vue_templates/proposal_list.html:95
 msgid "Soort aanvraag"
 msgstr "Type of application"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:57
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:65
-#: proposals/templates/proposals/vue_templates/proposal_list.html:98
-#: proposals/templates/proposals/vue_templates/proposal_list.html:106
+#: proposals/templates/proposals/vue_templates/proposal_list.html:102
+#: proposals/templates/proposals/vue_templates/proposal_list.html:110
 msgid "Besloten op"
 msgstr "Concluded on"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:78
-#: proposals/templates/proposals/vue_templates/proposal_list.html:119
+#: proposals/templates/proposals/vue_templates/proposal_list.html:123
 msgid "Status"
 msgstr "State"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:110
-#: proposals/templates/proposals/vue_templates/proposal_list.html:165
+#: proposals/templates/proposals/vue_templates/proposal_list.html:169
 msgid "Nog niet ingediend"
 msgstr "Not yet submitted"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:129
-#: proposals/templates/proposals/vue_templates/proposal_list.html:184
+#: proposals/templates/proposals/vue_templates/proposal_list.html:188
 msgid "Route:"
 msgstr "Route:"
 
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:136
-#: proposals/templates/proposals/vue_templates/proposal_list.html:191
+#: proposals/templates/proposals/vue_templates/proposal_list.html:195
 #: reviews/templates/reviews/vue_templates/decision_list.html:185
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128
 #: reviews/templates/reviews/vue_templates/review_list.html:190
@@ -3056,11 +3056,15 @@ msgstr "Decide"
 msgid "Naar volgende stap"
 msgstr "To next step"
 
-#: proposals/templates/proposals/vue_templates/proposal_list.html:85
+#: proposals/templates/proposals/vue_templates/proposal_list.html:82
+msgid "Verberg"
+msgstr ""
+
+#: proposals/templates/proposals/vue_templates/proposal_list.html:89
 msgid "Maak revisie"
 msgstr "Create revision"
 
-#: proposals/templates/proposals/vue_templates/proposal_list.html:143
+#: proposals/templates/proposals/vue_templates/proposal_list.html:147
 #: reviews/templates/reviews/vue_templates/decision_list.html:141
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83
 #: reviews/templates/reviews/vue_templates/review_list.html:145
@@ -3069,7 +3073,7 @@ msgstr "Revision/amendment of"
 
 #: proposals/templates/proposals/wmo_application.html:7
 #: proposals/templates/proposals/wmo_application.html:27
-#: proposals/utils/pdf_diff_logic.py:513
+#: proposals/utils/pdf_diff_logic.py:512
 msgid "Aanmelding bij de METC"
 msgstr "Registration with the METC"
 
@@ -3092,7 +3096,7 @@ msgstr "Start again"
 
 #: proposals/templates/proposals/wmo_form.html:7
 #: proposals/templates/proposals/wmo_form.html:30
-#: proposals/utils/pdf_diff_logic.py:488
+#: proposals/utils/pdf_diff_logic.py:487
 msgid ""
 "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
 msgstr ""
@@ -3113,7 +3117,7 @@ msgstr ""
 "This section was present in the original application, but was removed for "
 "the revision."
 
-#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:133
+#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:119
 msgid "Onbekend"
 msgstr "Unknown"
 
@@ -3125,35 +3129,35 @@ msgstr "Download"
 msgid "Niet aangeleverd"
 msgstr "Not provided"
 
-#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7
+#: proposals/utils/pdf_diff_logic.py:307 tasks/templates/tasks/task_end.html:7
 #: tasks/templates/tasks/task_end.html:18
 msgid "Overzicht van het takenonderzoek"
 msgstr "Overview of task-based research"
 
-#: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348
-#: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381
+#: proposals/utils/pdf_diff_logic.py:320 proposals/utils/pdf_diff_logic.py:347
+#: proposals/utils/pdf_diff_logic.py:356 proposals/utils/pdf_diff_logic.py:380
 msgid "Traject "
 msgstr "Trajectory "
 
-#: proposals/utils/pdf_diff_logic.py:351 proposals/utils/pdf_diff_logic.py:384
+#: proposals/utils/pdf_diff_logic.py:350 proposals/utils/pdf_diff_logic.py:383
 msgid "sessie "
 msgstr "session "
 
-#: proposals/utils/pdf_diff_logic.py:364 proposals/utils/pdf_diff_logic.py:392
+#: proposals/utils/pdf_diff_logic.py:363 proposals/utils/pdf_diff_logic.py:391
 msgid "Sessie "
 msgstr "Session "
 
-#: proposals/utils/pdf_diff_logic.py:386 proposals/utils/pdf_diff_logic.py:394
+#: proposals/utils/pdf_diff_logic.py:385 proposals/utils/pdf_diff_logic.py:393
 msgid ", taak "
 msgstr ", task "
 
-#: proposals/utils/pdf_diff_logic.py:539
+#: proposals/utils/pdf_diff_logic.py:538
 #: studies/templates/studies/study_form.html:7
 #: studies/templates/studies/study_form.html:82
 msgid "De deelnemers"
 msgstr "Participants"
 
-#: proposals/utils/pdf_diff_logic.py:743
+#: proposals/utils/pdf_diff_logic.py:742
 #: studies/templates/studies/session_start.html:7
 #: studies/templates/studies/session_start.html:17
 #: tasks/templates/tasks/task_form.html:7
@@ -3163,13 +3167,13 @@ msgstr "Participants"
 msgid "Het takenonderzoek en interviews"
 msgstr "Task-based research and interviews"
 
-#: proposals/utils/pdf_diff_logic.py:831
+#: proposals/utils/pdf_diff_logic.py:830
 #: studies/templates/studies/study_end.html:7
 #: studies/templates/studies/study_end.html:28
 msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
 msgstr "Overview and self-assessment of the entire study"
 
-#: proposals/utils/pdf_diff_logic.py:940
+#: proposals/utils/pdf_diff_logic.py:939
 msgid "Extra formulieren "
 msgstr "Additional forms "
 
@@ -3339,7 +3343,7 @@ msgstr "Your application will require assessment by an METC."
 msgid "Stadium"
 msgstr "Stage"
 
-#: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45
+#: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:31
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
 #: reviews/templates/reviews/vue_templates/review_list.html:183
@@ -3350,11 +3354,11 @@ msgstr "Route"
 msgid "Start datum"
 msgstr "Start date review"
 
-#: reviews/forms.py:14 reviews/models.py:149
+#: reviews/forms.py:14 reviews/models.py:132
 msgid "korte (2-weken) route"
 msgstr "short (2-week) route"
 
-#: reviews/forms.py:15 reviews/models.py:148
+#: reviews/forms.py:15 reviews/models.py:131
 msgid "lange (4-weken) route"
 msgstr "long (4-week) route"
 
@@ -3378,23 +3382,23 @@ msgstr "Select committee members"
 msgid "Er moet tenminste één beoordelaar geselecteerd worden."
 msgstr "You must select at least one reviewer."
 
-#: reviews/forms.py:107
+#: reviews/forms.py:108
 msgid "Voeg deze aanvraag toe aan het archief"
 msgstr "Add this application to the archive"
 
-#: reviews/forms.py:113
+#: reviews/forms.py:114
 msgid "Opmerkingen over revisie"
 msgstr "Comments about this revision"
 
-#: reviews/forms.py:120
+#: reviews/forms.py:121
 msgid "Bevestig beëindiging"
 msgstr "Confirm termination of this review"
 
-#: reviews/forms.py:153
+#: reviews/forms.py:154
 msgid "Start datum periode:"
 msgstr "Start date period:"
 
-#: reviews/forms.py:154
+#: reviews/forms.py:155
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
@@ -3434,76 +3438,76 @@ msgstr "All submitted applications"
 msgid "Overzicht werkverdeling commissieleden"
 msgstr "Overview workload committee members"
 
-#: reviews/models.py:17
+#: reviews/models.py:13
 msgid "Beoordeling door eindverantwoordelijke"
 msgstr "Assessment by researcher with final responsibility"
 
-#: reviews/models.py:18
+#: reviews/models.py:14
 msgid "Aanstelling commissieleden"
 msgstr "Appointment of committee members"
 
-#: reviews/models.py:19
+#: reviews/models.py:15
 msgid "Beoordeling door commissie"
 msgstr "Assessment by committee"
 
-#: reviews/models.py:20
+#: reviews/models.py:16
 msgid "Afsluiting door secretaris"
 msgstr "Conclusion by secretary"
 
-#: reviews/models.py:21
+#: reviews/models.py:17
 msgid "Afgesloten"
 msgstr "Concluded"
 
-#: reviews/models.py:33
+#: reviews/models.py:20
 msgid "Goedkeuring door FETC-GW"
 msgstr "Approval by FEtC-H"
 
-#: reviews/models.py:34
+#: reviews/models.py:21
 msgid "Revisie noodzakelijk"
 msgstr "Revision necessary"
 
-#: reviews/models.py:35
+#: reviews/models.py:22
 msgid "Afwijzing door FETC-GW"
 msgstr "Rejection by FEtC-H"
 
-#: reviews/models.py:36
+#: reviews/models.py:23
 msgid "Open review met lange (4-weken) route"
 msgstr "Open review on long (4-week) route"
 
-#: reviews/models.py:37
+#: reviews/models.py:24
 msgid "Laat opnieuw beoordelen door METC"
 msgstr "Submit for reassessment by METC"
 
-#: reviews/models.py:38
+#: reviews/models.py:25
 msgid "Positief advies van FETC-GW, post-hoc"
 msgstr "Post hoc positive advice by FEtC-H"
 
-#: reviews/models.py:39
+#: reviews/models.py:26
 msgid "Negatief advies van FETC-GW, post-hoc"
 msgstr "Post hoc negative advice by FETC-H"
 
-#: reviews/models.py:40
+#: reviews/models.py:27
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:51 reviews/models.py:185
+#: reviews/models.py:37 reviews/models.py:164
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:150
+#: reviews/models.py:133
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:179
+#: reviews/models.py:159
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:180
+#: reviews/models.py:160
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:181
+#: reviews/models.py:161
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
 
@@ -4375,19 +4379,15 @@ msgstr "{} years old and above"
 msgid "Werving"
 msgstr "Recruitment"
 
-#: studies/models.py:145 studies/models.py:268
-msgid "Taakonderzoek en interviews"
-msgstr "Task-based research and interviews"
-
-#: studies/models.py:150
+#: studies/models.py:142
 msgid "Naam traject"
 msgstr "Trajectory title"
 
-#: studies/models.py:157
+#: studies/models.py:149
 msgid "Uit welke leeftijdscategorie(ën) bestaat je deelnemersgroep?"
 msgstr "What is/are the age category/ies of your participants?"
 
-#: studies/models.py:158
+#: studies/models.py:150
 msgid ""
 "De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet je hier hier 4-5 én "
 "6-11 invullen."
@@ -4395,14 +4395,14 @@ msgstr ""
 "If the intended age group is 5-7 year-olds, for example, then you should "
 "fill in 4-5 and 6-11."
 
-#: studies/models.py:161
+#: studies/models.py:153
 msgid ""
 "Maakt je onderzoek gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?"
 msgstr ""
 "Does your application contain the use of (adult) participants <u>incapable</"
 "u> of informed consent?"
 
-#: studies/models.py:163
+#: studies/models.py:155
 msgid ""
 "Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden "
 "aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname "
@@ -4418,11 +4418,11 @@ msgstr ""
 "express their own opinion). Here informed consent should always be obtained "
 "from a relevant representative."
 
-#: studies/models.py:176
+#: studies/models.py:168
 msgid "Worden er bijzondere persoonsgegevens verzameld?"
 msgstr "Will you collect any special or sensitive personal details?"
 
-#: studies/models.py:177
+#: studies/models.py:169
 msgid ""
 "zie de <a href='https://intranet.uu.nl/documenten-ethische-"
 "toetsingscommissie-gw'             target='_blank'>Richtlijnen</a>"
@@ -4431,12 +4431,12 @@ msgstr ""
 "nl/en/knowledgebase/documents-ethics-assessment-committee-"
 "humanities\">regulations</a>."
 
-#: studies/models.py:186
+#: studies/models.py:178
 msgid "Geef aan welke bijzondere persoonsgegevens worden verzameld:"
 msgstr ""
 "Please select which kinds of special personal details may be collected:"
 
-#: studies/models.py:191
+#: studies/models.py:183
 msgid ""
 "Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is "
 "dit in jouw onderzoek bij (een deel van) de deelnemers het geval?"
@@ -4444,7 +4444,7 @@ msgstr ""
 "Participants can be included based on particular characteristics. Is this "
 "the case with (some of) the participants in this application?"
 
-#: studies/models.py:193
+#: studies/models.py:185
 msgid ""
 "In de meeste gevallen kun je dit soort gegevens alleen verzamelen als je "
 "daar toestemming voor hebt: zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-"
@@ -4464,12 +4464,12 @@ msgstr ""
 "href='mailto:privacy.gw@uu.nl'>privacy officer</a> before submitting your "
 "application."
 
-#: studies/models.py:206
+#: studies/models.py:198
 msgid ""
 "Selecteer de medische gegevens van je proefpersonen die worden verzameld"
 msgstr "Select the medical details of your participants that are recorded"
 
-#: studies/models.py:212
+#: studies/models.py:204
 msgid ""
 "Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het "
 "geselecteerde type deelnemer aan het onderzoek te laten meedoen?"
@@ -4477,7 +4477,7 @@ msgstr ""
 "In order to answer the research question, is it necessary for the selected "
 "type of participants to participate in the study?"
 
-#: studies/models.py:215
+#: studies/models.py:207
 msgid ""
 "Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou je de vraag "
 "ook kunnen beantwoorden door volwassen deelnemers te testen?"
@@ -4485,15 +4485,15 @@ msgstr ""
 "For example, is it necessary to test children, or would it be possible to "
 "answer the research question by testing adults?"
 
-#: studies/models.py:222
+#: studies/models.py:214
 msgid "Leg uit waarom"
 msgstr "Explain why"
 
-#: studies/models.py:226
+#: studies/models.py:218
 msgid "Hoe worden de deelnemers geworven?"
 msgstr "How will the participants be recruited?"
 
-#: studies/models.py:229
+#: studies/models.py:221
 #, python-brace-format
 msgid ""
 "Er zijn specifieke voorbeelddocumenten voor het gebruik van             "
@@ -4502,12 +4502,12 @@ msgstr ""
 "There are specific template documents for using Amazon Mechanical Turk/"
 "Prolific <a href=\"{link}\">here</a>."
 
-#: studies/models.py:236
+#: studies/models.py:228
 msgid "Welke vergoeding krijgt de deelnemer voor hun deelname?"
 msgstr ""
 "What compensation will participants receive for taking part in this study?"
 
-#: studies/models.py:237
+#: studies/models.py:229
 msgid ""
 "Het standaardbedrag voor vergoeding aan de deelnemers is €10,- per uur. "
 "Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje."
@@ -4515,22 +4515,26 @@ msgstr ""
 "The standard sum for compensation of participants is €10 per hour. Minors "
 "are not permitted to receive money, but can be given a gift."
 
-#: studies/models.py:249
+#: studies/models.py:241
 msgid ""
 "Bestaat een hiërarchische relatie tussen onderzoeker(s) en deelnemer(s)?"
 msgstr ""
 "Does a hierarchal relationship between researcher(s) and participant(s) "
 "exist?"
 
-#: studies/models.py:255
+#: studies/models.py:247
 msgid "Zo ja, wat is de relatie (bijv. docent-student)?"
 msgstr "If so, what is the nature of the relationship (e.g. teacher-student)?"
 
-#: studies/models.py:273
+#: studies/models.py:260
+msgid "Taakonderzoek en interviews"
+msgstr "Task-based research and interviews"
+
+#: studies/models.py:265
 msgid "Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?"
 msgstr "How many sessions of tasks will the participants take part in?"
 
-#: studies/models.py:276
+#: studies/models.py:268
 msgid ""
 "Wanneer je bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen "
 "tijdens een eerste bezoek aan het lab en je laat de deelnemer nog een keer "
@@ -4544,7 +4548,7 @@ msgstr ""
 "experiment to consist of two sessions. If multiple tasks are executed on the "
 "same day, with breaks in between, this is still considered to be one session."
 
-#: studies/models.py:283
+#: studies/models.py:275
 msgid ""
 "Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de "
 "deelnemer?"
@@ -4552,7 +4556,7 @@ msgstr ""
 "Does the above research trajectory involve misrepresentation to the "
 "participant?"
 
-#: studies/models.py:285
+#: studies/models.py:277
 msgid ""
 "Misleiding is het doelbewust verschaffen van inaccurate informatie over het "
 "doel en/of belangrijke aspecten van de gang van zaken tijdens het onderzoek. "
@@ -4569,7 +4573,7 @@ msgstr ""
 "crucial memory task without announcing it, or giving false feedback. Fillers "
 "do not count as misrepresentation."
 
-#: studies/models.py:296
+#: studies/models.py:288
 msgid ""
 "Geef een toelichting en beschrijf hoe en wanneer de deelnemer zal worden "
 "gedebrieft."
@@ -4577,7 +4581,7 @@ msgstr ""
 "Give an explanation and describe how and when the participant will be "
 "debriefed."
 
-#: studies/models.py:300
+#: studies/models.py:292
 msgid ""
 "Bevat bovenstaand onderzoekstraject elementen die <em>tijdens</em> de "
 "deelname niet-triviale negatieve emoties kunnen opwekken? Denk hierbij "
@@ -4590,11 +4594,11 @@ msgstr ""
 "consider emotionally probing questions, insulting utterances, negative "
 "feedback, and frustrating, difficult, (very) long and/or (very) boring tasks."
 
-#: studies/models.py:309
+#: studies/models.py:301
 msgid "Licht je antwoord toe."
 msgstr "Explain your answer."
 
-#: studies/models.py:312
+#: studies/models.py:304
 msgid ""
 "Bevat bovenstaand onderzoekstraject elementen die tijdens de deelname "
 "zodanig belastend zijn dat deze <em>ondanks de verkregen informed consent</"
@@ -4607,7 +4611,7 @@ msgstr ""
 "questions (or even cause outrage), for example from colleagues, the "
 "participants themselves, or parents or other representatives?"
 
-#: studies/models.py:317
+#: studies/models.py:309
 msgid ""
 "Dit zou bijvoorbeeld het geval kunnen zijn bij een 'onmenselijk' lange en "
 "uitputtende taak, een zeer confronterende vragenlijst, of voortdurend "
@@ -4624,7 +4628,7 @@ msgstr ""
 "sessions, not distress at a later date which was caused by the research "
 "project."
 
-#: studies/models.py:328
+#: studies/models.py:320
 msgid ""
 "Licht je antwoord toe. Geef concrete voorbeelden van de relevante aspecten "
 "van jouw onderzoek (bijv. representatieve voorbeelden van mogelijk zeer "
@@ -4637,7 +4641,7 @@ msgstr ""
 "utterances in the task, or of very confrontational questions in a "
 "questionnaire), so that the committee can form a proper picture."
 
-#: studies/models.py:335
+#: studies/models.py:327
 msgid ""
 "Zijn de risico's op psychische, fysieke, of andere (bijv. economische, "
 "juridische) schade door deelname aan bovenstaand onderzoekstraject <em>meer "
@@ -4649,7 +4653,7 @@ msgstr ""
 "em> minimal? I.e. is the chance of and/or magnitude of potential damage to "
 "participants clearly <em>above</em> that of the \"background risk\"?"
 
-#: studies/models.py:340
+#: studies/models.py:332
 msgid ""
 "Achtergrondrisico is datgene dat gezonde, gemiddelde burgers in de relevante "
 "leeftijdscategorie normaalgesproken in het dagelijks leven ten deel valt. "
@@ -4676,16 +4680,16 @@ msgstr ""
 "evaluation, intelligence test, or heart rate measurement after physical "
 "exercise, all of which performed under professional supervision."
 
-#: studies/models.py:445
+#: studies/models.py:437
 #, python-format
 msgid "Study details for proposal %s"
 msgstr "Study details for proposal %s"
 
-#: studies/models.py:450
+#: studies/models.py:442
 msgid "Maak je gebruik van passieve informed consent?"
 msgstr "Will you use passive informed consent?"
 
-#: studies/models.py:451
+#: studies/models.py:443
 msgid ""
 "Wanneer je kinderen via een instelling (dus ook school) werft en je de "
 "ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die "
@@ -4701,7 +4705,7 @@ msgstr ""
 "a>."
 
 # studies/models.py:229
-#: studies/models.py:461
+#: studies/models.py:453
 msgid ""
 "Licht je antwoord toe. Wij willen je wijzen op het reglement, sectie 3.1 'd' "
 "en 'e'. Passive consent is slechts in enkele gevallen toegestaan en draagt "
@@ -4711,16 +4715,16 @@ msgstr ""
 "'d' and 'e'. Passive consent is allowed under certain situations but is not "
 "preferred by the committee."
 
-#: studies/models.py:477
+#: studies/models.py:469
 msgid "Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"
 msgstr ""
 "Please upload the declaration of consent here (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:485
+#: studies/models.py:477
 msgid "Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the information letter here (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:494
+#: studies/models.py:486
 msgid ""
 "Upload hier de toestemmingsverklaring voor de leiding of het management van "
 "de instelling (in .pdf of .doc(x)-format)"
@@ -4728,7 +4732,7 @@ msgstr ""
 "Please upload the declaration of consent for the management of the school or "
 "institution (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:497
+#: studies/models.py:489
 msgid ""
 "Upload indien mogelijk een ondertekende versie van het document. Upload als "
 "deze nog niet bestaat een blanco versie, en stuur de ondertekende versie "
@@ -4739,7 +4743,7 @@ msgstr ""
 "and follow up by sending a signed copy to the secretary of the FEtC-H once "
 "available."
 
-#: studies/models.py:504
+#: studies/models.py:496
 msgid ""
 "Upload hier de informatiebrief voor de leiding of het management van de "
 "instelling (in .pdf of .doc(x)-formaat)"
@@ -4747,7 +4751,7 @@ msgstr ""
 "Please upload the the information letter for the management of the school or "
 "institution (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:513
+#: studies/models.py:505
 msgid ""
 "Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ."
 "doc(x)-formaat)"
diff --git a/proposals/migrations/0052_alter_proposal_studies_similar.py b/proposals/migrations/0052_alter_proposal_studies_similar.py
new file mode 100644
index 000000000..4b0c0be62
--- /dev/null
+++ b/proposals/migrations/0052_alter_proposal_studies_similar.py
@@ -0,0 +1,18 @@
+# Generated by Django 3.2.20 on 2023-12-05 10:33
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('proposals', '0051_merge_20231121_1606'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='proposal',
+            name='studies_similar',
+            field=models.BooleanField(blank=True, help_text='Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject, en voldoet één set documenten voor de informed consent. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan kan dit niet en zijn dit afzonderlijke trajecten.', null=True, verbose_name='Kan voor alle deelnemers dezelfde informatiebrief en, indien van           toepassing, dezelfde toestemmingsverklaring gebruikt worden?'),
+        ),
+    ]
diff --git a/proposals/models.py b/proposals/models.py
index 6805206d6..a7d177d42 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -361,8 +361,8 @@ class PracticeReasons(models.IntegerChoices):
 
     # Fields with respect to Studies
     studies_similar = models.BooleanField(
-        _('Kan voor alle deelnemersgroepen dezelfde informatiebrief en \
-        toestemmingsverklaring gebruikt worden?'),
+        _('Kan voor alle deelnemers dezelfde informatiebrief en, indien van \
+          toepassing, dezelfde toestemmingsverklaring gebruikt worden?'),
         help_text=_('Daar waar de verschillen klein en qua belasting of \
 risico irrelevant zijn is sprake van in essentie hetzelfde traject, en \
 voldoet één set documenten voor de informed consent. Denk \

From 0611a9b5715ac1e4721b9d99ffef1bd2cc50b001 Mon Sep 17 00:00:00 2001
From: Michael Villeneuve <m.l.villeneuve@uu.nl>
Date: Tue, 12 Dec 2023 16:38:51 +0100
Subject: [PATCH 106/148] feat: Undo icon for revise action

---
 proposals/static/proposals/images/edit-undo.png   | Bin 0 -> 650 bytes
 proposals/templates/proposals/proposal_list.html  |   2 +-
 .../proposals/vue_templates/proposal_list.html    |   2 +-
 3 files changed, 2 insertions(+), 2 deletions(-)
 create mode 100644 proposals/static/proposals/images/edit-undo.png

diff --git a/proposals/static/proposals/images/edit-undo.png b/proposals/static/proposals/images/edit-undo.png
new file mode 100644
index 0000000000000000000000000000000000000000..8b0fef9a8319452009247864c41e033694859278
GIT binary patch
literal 650
zcmV;50(Jd~P)<h;3K|Lk000e1NJLTq000mG000mO1^@s6AM^iV00006VoOIv0RI60
z0RN!9r;`8x010qNS#tmY4c7nw4c7reD4Tcy000McNliru)(0924geM-mLUKD0vAa{
zK~y-)m6K0sl3^Ujzt8i&&(!7q=*Ak-h}OaK5EO(#gB1iqutRtVf?`BaT|10Ccqqq=
z9U{7PsaQb}H0e+*7Qs@CT6T(*v}g@-6I{MJ=Z5d=^E@5GrJI(0Z_gLLpXYgg&-VeE
zC^`j+7Nl-9=I)`FDafKl(b|RI$81bN*6j_on*VbGzmM5GP9x{`hJeD=&1>kSC&LBJ
zfVRcM$?V1P3B6PcAX~#mZX7Dr0E-up6>u&Ai1M4+$6px*d6g)50zu<P6`=Titli@@
zR^8qZjGxy*C`GvpfG<K{PeEIWLCTUk=sMA7wkW+e<WCRmtGtdx#WDaW6BmSD4O6Q8
zrm755N(jLrgn-~{D6gkrvY5z@u3ep-V(rlG{raOwR2cMSlG*1&Ua*dn007Q)EPVTj
z#qV*X(_iWaR@CCK_q$+jX9tFz-Qn#s7#YJt;wJXEu0Zf&U04+FB9mn(>l{6fOZfD5
zx^(<(+NuITAZTdtF*`7sbB~Mx0Ae$D>fg&k;5u>{h0Ft(%sL2>YF!TkK|`BOGW-0q
z$<55rD9F$#2!Mm7ygZedyZydz;2gN<0Fly!zty-=mBaVpcsEVu>hcW{d1#Z{npnGY
zBY*fjmK0%?8^t(;YR@+XG=oH^Fxc%lEVS$r0NiT$nf{@pT|4*Ae2zV-96O_3`)`13
k>$j#pJbyuT?P=Bf1qBx3B`dxp6aWAK07*qoM6N<$g68)pi~s-t

literal 0
HcmV?d00001

diff --git a/proposals/templates/proposals/proposal_list.html b/proposals/templates/proposals/proposal_list.html
index 03664fc49..ed621d985 100644
--- a/proposals/templates/proposals/proposal_list.html
+++ b/proposals/templates/proposals/proposal_list.html
@@ -37,7 +37,7 @@ <h2>{{ title }}</h2>
             {% static "proposals/images/folder_delete.png" as img_hide %}
             {% static "proposals/images/folder_add.png" as img_add %}
             {% static 'reviews/images/scale.png' as img_decide %}
-            {% static 'proposals/images/pencil.png' as img_revise %}
+            {% static 'proposals/images/edit-undo.png' as img_revise %}
 
             <p>
                 {{ body }}
diff --git a/proposals/templates/proposals/vue_templates/proposal_list.html b/proposals/templates/proposals/vue_templates/proposal_list.html
index 7e36396f3..2431c0d84 100644
--- a/proposals/templates/proposals/vue_templates/proposal_list.html
+++ b/proposals/templates/proposals/vue_templates/proposal_list.html
@@ -7,7 +7,7 @@
 {% static "main/images/page_white_acrobat.png" as img_pdf %}
 {% static "proposals/images/folder_delete.png" as img_hide %}
 {% static 'reviews/images/scale.png' as img_decide %}
-{% static 'proposals/images/pencil.png' as img_revise %}
+{% static 'proposals/images/edit-undo.png' as img_revise %}
 
 
 <script type="text/x-template" id="proposalsUFLList">

From 65337ed61379f7fa9689e3f3ff385c356484e4aa Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 18 Dec 2023 11:58:25 +0100
Subject: [PATCH 107/148] fix #583. Textual change

---
 locale/en/LC_MESSAGES/django.po | 51 ++++++++++++++++++++-------------
 reviews/forms.py                |  8 ++++--
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 1d0d2c780..88a2bd406 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-05 11:33+0100\n"
+"POT-Creation-Date: 2023-12-18 11:52+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -1629,7 +1629,7 @@ msgstr "Space for possible comments"
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:436 reviews/forms.py:111
+#: proposals/models.py:436 reviews/forms.py:113
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
@@ -3354,51 +3354,51 @@ msgstr "Route"
 msgid "Start datum"
 msgstr "Start date review"
 
-#: reviews/forms.py:14 reviews/models.py:132
-msgid "korte (2-weken) route"
-msgstr "short (2-week) route"
+#: reviews/forms.py:16
+msgid "korte route of revisie (2-weken)"
+msgstr "short route or revision (2-weeks)"
 
-#: reviews/forms.py:15 reviews/models.py:131
-msgid "lange (4-weken) route"
-msgstr "long (4-week) route"
+#: reviews/forms.py:17
+msgid "lange route (4-weken)"
+msgstr "long route (4-weeks)"
 
-#: reviews/forms.py:16
-msgid "direct naar revisie"
-msgstr "straight to revision"
+#: reviews/forms.py:18
+msgid "Direct terug naar aanvrager (Nog niet in behandeling)"
+msgstr "Return directly to applicant (not yet under review)"
 
-#: reviews/forms.py:31 reviews/menus.py:60 reviews/mixins.py:127
+#: reviews/forms.py:33 reviews/menus.py:60 reviews/mixins.py:127
 msgid "Algemene Kamer"
 msgstr "General Chamber"
 
-#: reviews/forms.py:32 reviews/menus.py:67 reviews/mixins.py:130
+#: reviews/forms.py:34 reviews/menus.py:67 reviews/mixins.py:130
 msgid "Linguïstiek Kamer"
 msgstr "Linguistics Chamber"
 
-#: reviews/forms.py:64
+#: reviews/forms.py:66
 msgid "Selecteer de commissieleden"
 msgstr "Select committee members"
 
-#: reviews/forms.py:73
+#: reviews/forms.py:75
 msgid "Er moet tenminste één beoordelaar geselecteerd worden."
 msgstr "You must select at least one reviewer."
 
-#: reviews/forms.py:108
+#: reviews/forms.py:110
 msgid "Voeg deze aanvraag toe aan het archief"
 msgstr "Add this application to the archive"
 
-#: reviews/forms.py:114
+#: reviews/forms.py:116
 msgid "Opmerkingen over revisie"
 msgstr "Comments about this revision"
 
-#: reviews/forms.py:121
+#: reviews/forms.py:123
 msgid "Bevestig beëindiging"
 msgstr "Confirm termination of this review"
 
-#: reviews/forms.py:154
+#: reviews/forms.py:156
 msgid "Start datum periode:"
 msgstr "Start date period:"
 
-#: reviews/forms.py:155
+#: reviews/forms.py:157
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
@@ -3495,6 +3495,14 @@ msgstr "Not to be assessed further"
 msgid "Beslissing"
 msgstr "Decision"
 
+#: reviews/models.py:131
+msgid "lange (4-weken) route"
+msgstr "long (4-week) route"
+
+#: reviews/models.py:132
+msgid "korte (2-weken) route"
+msgstr "short (2-week) route"
+
 #: reviews/models.py:133
 msgid "nog geen route"
 msgstr "no route assigned"
@@ -5507,3 +5515,6 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:50
 msgid "Taak verwijderd"
 msgstr "Task deleted"
+
+#~ msgid "direct naar revisie"
+#~ msgstr "straight to revision"
diff --git a/reviews/forms.py b/reviews/forms.py
index 56fc4eea2..923c31c47 100644
--- a/reviews/forms.py
+++ b/reviews/forms.py
@@ -11,10 +11,12 @@
 
 from django.core.exceptions import ValidationError
 
-SHORT_LONG_REVISE = [(True, _('korte (2-weken) route')),
-                     (False, _('lange (4-weken) route')),
-                     (None, _('direct naar revisie'))]
 
+SHORT_LONG_REVISE = [
+    (True, _("korte route of revisie (2-weken)")),
+    (False, _("lange route (4-weken)")),
+    (None, _("Direct terug naar aanvrager (Nog niet in behandeling)")),
+]
 
 class ChangeChamberForm(forms.ModelForm):
     class Meta:

From 15e7032ca90a51b7396e79f51a254cd5faa70277 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 19 Dec 2023 14:42:56 +0100
Subject: [PATCH 108/148] fixes #539. Added new group for chairs, po & data
 manager

---
 fetc/constants.py                 |  1 +
 main/templatetags/fetc_filters.py | 11 +++++++++++
 reviews/api/views.py              | 14 ++++++++++----
 reviews/menus.py                  | 16 ++++++++--------
 reviews/views.py                  | 20 ++++++++++----------
 5 files changed, 40 insertions(+), 22 deletions(-)

diff --git a/fetc/constants.py b/fetc/constants.py
index a35827f82..42d64370f 100644
--- a/fetc/constants.py
+++ b/fetc/constants.py
@@ -6,6 +6,7 @@
 GROUP_PRIMARY_SECRETARY = 'Primaire secretaris'
 GROUP_LINGUISTICS_CHAMBER = 'LK'
 GROUP_GENERAL_CHAMBER = 'AK'
+GROUP_CHAIR = 'Voorzitter'
 
 # Route durations
 PREASSESSMENT_ROUTE_WEEKS = 1
diff --git a/main/templatetags/fetc_filters.py b/main/templatetags/fetc_filters.py
index 340351339..d8a6db6a1 100644
--- a/main/templatetags/fetc_filters.py
+++ b/main/templatetags/fetc_filters.py
@@ -29,3 +29,14 @@ def is_secretary(current_user):
     Check whether the current user is in the 'Secretary' group
     """
     return Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+
+@register.filter
+def is_chair_or_secretary(current_user):
+    """
+    Check whether the current user is in the 'Chair' group
+    """
+    user_groups = current_user.groups.all()
+    return (
+        Group.objects.get(name=settings.GROUP_CHAIR) in user_groups
+        or Group.objects.get(name=settings.GROUP_SECRETARY) in user_groups
+    )
diff --git a/reviews/api/views.py b/reviews/api/views.py
index 29409d76c..48c2b8cde 100644
--- a/reviews/api/views.py
+++ b/reviews/api/views.py
@@ -21,6 +21,7 @@ class BaseDecisionApiView(GroupRequiredMixin, CommitteeMixin, FancyListApiView):
     serializer_class = DecisionSerializer
     group_required = [
         settings.GROUP_SECRETARY,
+        settings.GROUP_CHAIR,
         settings.GROUP_GENERAL_CHAMBER,
         settings.GROUP_LINGUISTICS_CHAMBER,
     ]
@@ -227,6 +228,7 @@ def get_queryset_for_secretary(self):
 class OpenDecisionsApiView(BaseDecisionApiView):
     group_required = [
         settings.GROUP_SECRETARY,
+        settings.GROUP_CHAIR,
     ]
 
     def get_queryset(self):
@@ -269,6 +271,7 @@ def get_queryset(self):
 class OpenSupervisorDecisionApiView(BaseDecisionApiView):
     group_required = [
         settings.GROUP_SECRETARY,
+        settings.GROUP_CHAIR,
     ]
 
     sort_definitions = [
@@ -369,7 +372,10 @@ def get_context(self):
 
 
 class ToConcludeReviewApiView(BaseReviewApiView):
-    group_required = settings.GROUP_SECRETARY
+    group_required = [
+        settings.GROUP_SECRETARY,
+        settings.GROUP_CHAIR,
+    ]
 
     def get_queryset(self):
         """Returns all open Committee Decisions of all Users"""
@@ -412,7 +418,7 @@ class InRevisionApiView(BaseReviewApiView):
     but for which a revision has not yet been submitted"""
 
     default_sort = ('date_start', 'desc')
-    group_required = [settings.GROUP_SECRETARY]
+    group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
     def get_queryset(self):
         # 1. Find reviews of revisions:
@@ -448,7 +454,7 @@ class AllOpenReviewsApiView(BaseReviewApiView):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY]
+        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
         if self.committee.name == 'AK':
             group_required += [settings.GROUP_GENERAL_CHAMBER]
@@ -495,7 +501,7 @@ class AllReviewsApiView(BaseReviewApiView):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY]
+        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
         if self.committee.name == 'AK':
             group_required += [settings.GROUP_GENERAL_CHAMBER]
diff --git a/reviews/menus.py b/reviews/menus.py
index 462d11514..c6d4983ff 100644
--- a/reviews/menus.py
+++ b/reviews/menus.py
@@ -5,7 +5,7 @@
 from menu import Menu, MenuItem
 
 from main.templatetags.fetc_filters import in_general_chamber, \
-    in_linguistics_chamber, is_secretary
+    in_linguistics_chamber, is_secretary, is_chair_or_secretary
 
 
 def create_committee_menu(commitee: str) -> List[MenuItem]:
@@ -21,37 +21,37 @@ def create_committee_menu(commitee: str) -> List[MenuItem]:
         MenuItem(
             _("Alle openstaande besluiten commissieleden"),
             reverse("reviews:open", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Alle openstaande besluiten eindverantwoordelijken"),
             reverse("reviews:open_supervisors", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Nog af te handelen aanvragen"),
             reverse("reviews:to_conclude", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Aanvragen in revisie"),
             reverse("reviews:in_revision", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Alle lopende aanvragen"),
             reverse("reviews:all_open", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Alle ingezonden aanvragen"),
             reverse("reviews:archive", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Overzicht werkverdeling commissieleden"),
             reverse("reviews:workload", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
     ]
 
diff --git a/reviews/views.py b/reviews/views.py
index 8ac4761f8..16fd124a7 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -43,6 +43,7 @@ class BaseDecisionListView(GroupRequiredMixin, CommitteeMixin, generic.TemplateV
         settings.GROUP_SECRETARY,
         settings.GROUP_GENERAL_CHAMBER,
         settings.GROUP_LINGUISTICS_CHAMBER,
+        settings.GROUP_CHAIR,
     ]
 
     def get_context_data(self, **kwargs):
@@ -74,7 +75,7 @@ def get_context_data(self, **kwargs):
 
 
 class DecisionOpenView(BaseDecisionListView):
-    group_required = settings.GROUP_SECRETARY
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -90,7 +91,7 @@ class CommitteeMembersWorkloadView(
     GroupRequiredMixin, CommitteeMixin, generic.FormView
 ):
     template_name = "reviews/committee_members_workload.html"
-    group_required = [settings.GROUP_SECRETARY]
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
     form_class = StartEndDateForm
 
     def __init__(self, **kwargs):
@@ -192,7 +193,7 @@ class SupervisorDecisionOpenView(BaseDecisionListView):
     This page displays all proposals to be reviewed by supervisors.
     """
 
-    group_required = settings.GROUP_SECRETARY
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -208,9 +209,7 @@ def get_context_data(self, **kwargs):
 
 class BaseReviewListView(GroupRequiredMixin, CommitteeMixin, generic.TemplateView):
     template_name = "reviews/ufl_list.html"
-    group_required = [
-        settings.GROUP_SECRETARY,
-    ]
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
@@ -221,7 +220,7 @@ def get_context_data(self, **kwargs):
 
 
 class ToConcludeProposalView(BaseReviewListView):
-    group_required = settings.GROUP_SECRETARY
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -233,7 +232,7 @@ def get_context_data(self, **kwargs):
 
 
 class InRevisionReviewsView(BaseReviewListView):
-    group_required = [settings.GROUP_SECRETARY]
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -258,7 +257,7 @@ def get_context_data(self, **kwargs):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY]
+        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
         if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
@@ -280,7 +279,7 @@ def get_context_data(self, **kwargs):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY]
+        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
         if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
@@ -303,6 +302,7 @@ def get_group_required(self):
         obj = self.get_object()
         group_required = [
             settings.GROUP_SECRETARY,
+            settings.GROUP_CHAIR,
             obj.proposal.reviewing_committee.name,
         ]
 

From 92cd60f68b9897b5292952d88a510694043fabda Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 19 Dec 2023 15:43:04 +0100
Subject: [PATCH 109/148] Added the new chair group to groups.json

---
 main/fixtures/groups.json | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json
index e3f8daf4d..70574198c 100644
--- a/main/fixtures/groups.json
+++ b/main/fixtures/groups.json
@@ -30,5 +30,13 @@
         },
         "model": "auth.group",
         "pk": 4
+    },
+    {
+        "fields": {
+            "name": "Voorzitter",
+            "permissions": []
+        },
+        "model": "auth.group",
+        "pk": 5
     }
 ]
\ No newline at end of file

From 27c6aed35dde6d3508ac11160ae9aae8361e1dd6 Mon Sep 17 00:00:00 2001
From: Michael Villeneuve <m.l.villeneuve@uu.nl>
Date: Tue, 2 Jan 2024 12:00:04 +0100
Subject: [PATCH 110/148] Fix/pre proposals permission denied (571) (#577)

* fix: Remove custom form_valid from ProposalSubmitPreApproved

The parent's form_valid was already being run by fetching it's output
as a success_url. Then a copy of that code was run locally, which
would raise a PermissionDenied because the proposal was already
submitted.

Because this version did nothing different, except cause an error, it
was removed.

* fix: Do not call parent form_valid in ProposalSubmitPreAssessment

The previously existing comment pointed out that this should not be
done, then the method did it anyway. The call to the parent's
form_valid was removed and the comment tweaked.

* fix: return a form_valid response rather than just the success_url

* feature: Break out the submission actions into their own method

* feat: consistently return a review in all start_review functions

* feat: Handle practice, supervised, and preassessment proposals in start_review

* feat: remove proposal-specific code in form_valid and explain why

* fix: slightly better comment

* feat: Move BaseViewTestCase to main app

* feat: Tests for proposal submission

Proposal tests were also moved to their own directory

* fix: BaseViewTestCase no longer explicitly references reviews

* fix: Fetch csrf token for any user, not just secretary

* feat: Testing submission of regular proposals

* feat: Test submission of the two alternate proposal types

* fix: Check submission status codes, and add comments

* fix: Rename the other BaseProposalTestCase to MiscProposalTestCase

* fix: Supply needed user for logged-in post() method

* fix: Typo in comment

* Load test proposals through fixtures system

* feat: New command to load all _initial_ fixtures

Moved testing fixtures to testing subdir
---
 main/management/commands/load_fixtures.py     |  46 ++++
 main/tests.py                                 |  67 ++++-
 .../fixtures/testing/test_proposals.json      | 189 ++++++++++++++
 proposals/fixtures/testing/test_users.json    |  20 ++
 proposals/tests/__init__.py                   |   2 +
 proposals/{tests.py => tests/misc_tests.py}   |  18 +-
 proposals/tests/proposal_submission_tests.py  | 245 ++++++++++++++++++
 proposals/views/proposal_views.py             |  46 +---
 reviews/tests.py                              |  75 ++----
 reviews/utils/review_utils.py                 |  22 +-
 studies/tests.py                              |   5 +-
 11 files changed, 623 insertions(+), 112 deletions(-)
 create mode 100644 main/management/commands/load_fixtures.py
 create mode 100644 proposals/fixtures/testing/test_proposals.json
 create mode 100644 proposals/fixtures/testing/test_users.json
 create mode 100644 proposals/tests/__init__.py
 rename proposals/{tests.py => tests/misc_tests.py} (96%)
 create mode 100644 proposals/tests/proposal_submission_tests.py

diff --git a/main/management/commands/load_fixtures.py b/main/management/commands/load_fixtures.py
new file mode 100644
index 000000000..9fc488a44
--- /dev/null
+++ b/main/management/commands/load_fixtures.py
@@ -0,0 +1,46 @@
+from django.core.management.base import BaseCommand, CommandError
+from django.core.management import call_command
+from django.conf import settings
+
+import os
+
+def list_fixtures_in_dir(rel_path):
+    files = os.listdir(rel_path)
+
+    def is_fixture(fn):
+        return fn.lower()[-5:] == ".json"
+
+    return [
+        os.path.join(rel_path, fn) for fn in files if is_fixture(fn)
+    ]
+
+
+fixture_dirs = {
+    "proposals": list_fixtures_in_dir("proposals/fixtures/"),
+    "studies": list_fixtures_in_dir("studies/fixtures/"),
+    "tasks": list_fixtures_in_dir("tasks/fixtures/"),
+    "observations": list_fixtures_in_dir("observations/fixtures/"),
+    "main": list_fixtures_in_dir("main/fixtures/"),
+}
+
+
+class Command(BaseCommand):
+    help = "Loads fixtures for development in the correct order."
+
+    def add_arguments(self, parser):
+        parser.add_argument("--force", action="store_true")
+
+    def handle(self, *args, **kwargs):
+        if not settings.DEBUG and not kwargs["force"]:
+            raise CommandError(
+                "Refusing to execute command unless DEBUG = True in settings.py"
+            )
+
+        print("Loading fixtures...")
+
+        for app, locations in fixture_dirs.items():
+            print(f"for {app}")
+            for loc in locations:
+                call_command("loaddata", loc)
+
+        print("Done!")
diff --git a/main/tests.py b/main/tests.py
index c9167491d..ead194952 100644
--- a/main/tests.py
+++ b/main/tests.py
@@ -1,12 +1,75 @@
-from django.core.exceptions import ValidationError
+from django.core.exceptions import ValidationError, PermissionDenied
 from django.db import models
-from django.test import TestCase
+from django.test import TestCase, RequestFactory, Client
+from django.contrib.auth.models import AnonymousUser
 
 from .models import Setting
 from .utils import is_empty
 from .validators import MaxWordsValidator
 
 
+class BaseViewTestCase():
+    """
+    Inherit from this class to test the functioning of
+    class-based views.
+    """
+
+    # This testcase supports only class-based views
+    view_class = None
+
+    # for example:
+    # "/proposals/update/1/"
+    # NOT a full URL including protocol and domain
+    view_path = None
+
+    allowed_users = []
+    disallowed_users = [AnonymousUser]
+    enforce_csrf = True
+
+    def setUp(self):
+        self.client = Client()
+        self.view = self.view_class.as_view()
+        self.factory = RequestFactory()
+        super().setUp()
+
+    def check_access(self, user):
+        request = self.factory.get(
+            self.get_view_path(),
+        )
+        request.user = user
+        try:
+            response = self.view(request, **self.get_view_args())
+        except PermissionDenied:
+            return False
+        return response.status_code == 200
+
+    def post(self, update_dict={}, user=AnonymousUser):
+        """Generic function to test form submission"""
+        post_data = {}
+        post_data.update(update_dict)
+        if self.enforce_csrf:
+            csrf_token = self.fetch_csrf_token(
+                user=user,
+            )
+            post_data["csrfmiddlewaretoken"] = csrf_token
+        response = self.client.post(
+            self.get_view_path(),
+            data=post_data,
+        )
+        return response
+
+    def fetch_csrf_token(self, user=None):
+        if user:
+            self.client.force_login(user)
+        page = self.client.get(
+            self.get_view_path(),
+        )
+        return page.context["csrf_token"]
+
+    def get_view_path(self):
+        return self.view_path
+
+
 class ValidatorTest(TestCase):
     def test_max_words_validator(self):
         class Mock(models.Model):
diff --git a/proposals/fixtures/testing/test_proposals.json b/proposals/fixtures/testing/test_proposals.json
new file mode 100644
index 000000000..874f6c230
--- /dev/null
+++ b/proposals/fixtures/testing/test_proposals.json
@@ -0,0 +1,189 @@
+[
+{
+    "model": "proposals.proposal",
+    "pk": 1,
+    "fields": {
+        "reference_number": "23-003-01",
+        "reviewing_committee": 3,
+        "institution": 2,
+        "date_start": "2025-01-01",
+        "title": "Fixture proposal",
+        "summary": "asdf",
+        "other_applicants": false,
+        "other_stakeholders": false,
+        "stakeholders": "",
+        "translated_forms": true,
+        "translated_forms_languages": "asdf",
+        "funding_details": "",
+        "funding_name": "",
+        "comments": "asdf",
+        "inform_local_staff": true,
+        "embargo": true,
+        "embargo_end_date": "2024-09-01",
+        "in_archive": false,
+        "is_pre_assessment": false,
+        "pre_assessment_pdf": "",
+        "is_pre_approved": null,
+        "pre_approval_institute": null,
+        "pre_approval_pdf": "",
+        "in_course": false,
+        "is_exploration": false,
+        "pdf": "FETC-AK-23-003-01-Proposal.pdf",
+        "studies_similar": false,
+        "studies_number": 3,
+        "status": 1,
+        "status_review": null,
+        "dmp_file": "FETC-AK-23-003-01-DMP.pdf",
+        "confirmation_comments": "",
+        "date_created": "2023-11-28T12:59:17.670Z",
+        "date_modified": "2023-11-28T13:36:55.297Z",
+        "date_submitted_supervisor": null,
+        "date_reviewed_supervisor": null,
+        "date_submitted": "2023-11-28T13:36:55.296Z",
+        "date_reviewed": null,
+        "date_confirmed": null,
+        "has_minor_revision": false,
+        "minor_revision_description": null,
+        "self_assessment": "asdf",
+        "relation": 5,
+        "student_program": "",
+        "student_context": null,
+        "student_context_details": null,
+        "student_justification": "",
+        "created_by": 5,
+        "supervisor": null,
+        "parent": null,
+        "is_revision": false,
+        "funding": [
+            1
+        ],
+        "applicants": [
+            5
+        ]
+    }
+},
+{
+    "model": "proposals.proposal",
+    "pk": 2,
+    "fields": {
+        "reference_number": "23-004-01",
+        "reviewing_committee": 3,
+        "institution": 2,
+        "date_start": "2024-08-01",
+        "title": "Fixture Preassessment",
+        "summary": "",
+        "other_applicants": false,
+        "other_stakeholders": true,
+        "stakeholders": "asdf",
+        "translated_forms": null,
+        "translated_forms_languages": null,
+        "funding_details": "",
+        "funding_name": "",
+        "comments": "asdf",
+        "inform_local_staff": null,
+        "embargo": true,
+        "embargo_end_date": "2024-11-01",
+        "in_archive": false,
+        "is_pre_assessment": true,
+        "pre_assessment_pdf": "FETC-AK-23-004-01-Preassessment.pdf",
+        "is_pre_approved": null,
+        "pre_approval_institute": null,
+        "pre_approval_pdf": "",
+        "in_course": false,
+        "is_exploration": false,
+        "pdf": "FETC-AK-23-004-01-Proposal.pdf",
+        "studies_similar": null,
+        "studies_number": 1,
+        "status": 1,
+        "status_review": null,
+        "dmp_file": "",
+        "confirmation_comments": "",
+        "date_created": "2023-11-28T14:10:12.708Z",
+        "date_modified": "2023-11-28T14:10:40.554Z",
+        "date_submitted_supervisor": null,
+        "date_reviewed_supervisor": null,
+        "date_submitted": "2023-11-28T14:10:40.554Z",
+        "date_reviewed": null,
+        "date_confirmed": null,
+        "has_minor_revision": false,
+        "minor_revision_description": null,
+        "self_assessment": "asdf",
+        "relation": 5,
+        "student_program": "",
+        "student_context": null,
+        "student_context_details": null,
+        "student_justification": "",
+        "created_by": 5,
+        "supervisor": null,
+        "parent": null,
+        "is_revision": false,
+        "funding": [],
+        "applicants": [
+            5
+        ]
+    }
+},
+{
+    "model": "proposals.proposal",
+    "pk": 3,
+    "fields": {
+        "reference_number": "23-005-01",
+        "reviewing_committee": 3,
+        "institution": 2,
+        "date_start": "2024-08-01",
+        "title": "Fixture Preapproval",
+        "summary": "asdf",
+        "other_applicants": false,
+        "other_stakeholders": false,
+        "stakeholders": "",
+        "translated_forms": null,
+        "translated_forms_languages": null,
+        "funding_details": "",
+        "funding_name": "",
+        "comments": "asdf",
+        "inform_local_staff": null,
+        "embargo": true,
+        "embargo_end_date": "2025-01-10",
+        "in_archive": false,
+        "is_pre_assessment": false,
+        "pre_assessment_pdf": "",
+        "is_pre_approved": true,
+        "pre_approval_institute": "asdf",
+        "pre_approval_pdf": "FETC-AK-23-005-01-Pre_Approval.pdf",
+        "in_course": false,
+        "is_exploration": false,
+        "pdf": "FETC-AK-23-005-01-Proposal.pdf",
+        "studies_similar": null,
+        "studies_number": 1,
+        "status": 1,
+        "status_review": null,
+        "dmp_file": "",
+        "confirmation_comments": "",
+        "date_created": "2023-11-28T14:28:19.045Z",
+        "date_modified": "2023-11-28T14:28:31.971Z",
+        "date_submitted_supervisor": null,
+        "date_reviewed_supervisor": null,
+        "date_submitted": "2023-11-28T14:28:31.971Z",
+        "date_reviewed": null,
+        "date_confirmed": null,
+        "has_minor_revision": false,
+        "minor_revision_description": null,
+        "self_assessment": "asdf",
+        "relation": 5,
+        "student_program": "",
+        "student_context": null,
+        "student_context_details": null,
+        "student_justification": "",
+        "created_by": 5,
+        "supervisor": null,
+        "parent": null,
+        "is_revision": false,
+        "funding": [
+            1
+        ],
+        "applicants": [
+            5
+        ]
+    }
+}
+]
diff --git a/proposals/fixtures/testing/test_users.json b/proposals/fixtures/testing/test_users.json
new file mode 100644
index 000000000..11188c79c
--- /dev/null
+++ b/proposals/fixtures/testing/test_users.json
@@ -0,0 +1,20 @@
+[
+{
+    "model": "auth.user",
+    "pk": 5,
+    "fields": {
+        "password": "pbkdf2_sha256$260000$So7oUMXGw1byCufugyqL0M$mE0guFb1Y34YeurnLiVJcbJrliV1FB33OnuJYlFnhf0=",
+        "last_login": "2023-11-28T12:55:06.786Z",
+        "is_superuser": false,
+        "username": "proposal_user",
+        "first_name": "Testing",
+        "last_name": "User",
+        "email": "testing@user.com",
+        "is_staff": false,
+        "is_active": true,
+        "date_joined": "2022-05-19T11:24:30.512Z",
+        "groups": [],
+        "user_permissions": []
+    }
+}
+]
diff --git a/proposals/tests/__init__.py b/proposals/tests/__init__.py
new file mode 100644
index 000000000..6bb3af1f2
--- /dev/null
+++ b/proposals/tests/__init__.py
@@ -0,0 +1,2 @@
+from .misc_tests import *
+from .proposal_submission_tests import *
diff --git a/proposals/tests.py b/proposals/tests/misc_tests.py
similarity index 96%
rename from proposals/tests.py
rename to proposals/tests/misc_tests.py
index 5c9631519..5c52f4761 100644
--- a/proposals/tests.py
+++ b/proposals/tests/misc_tests.py
@@ -10,13 +10,13 @@
 from observations.models import Observation
 from tasks.models import Session, Task, Registration
 from studies.models import Study, Recruitment
-from .api.views import MyProposalsApiView
-from .copy import copy_proposal
-from .models import Proposal, Relation, Wmo, Institution
-from .utils import generate_ref_number, check_local_facilities, generate_revision_ref_number
+from proposals.api.views import MyProposalsApiView
+from proposals.copy import copy_proposal
+from proposals.models import Proposal, Relation, Wmo, Institution
+from proposals.utils import generate_ref_number, check_local_facilities, generate_revision_ref_number
 
 
-class BaseProposalTestCase(TestCase):
+class MiscProposalTestCase(TestCase):
     fixtures = ['relations', 'compensations', 'recruitments', 'settings',
                 'registrations', 'groups', 'institutions']
 
@@ -41,7 +41,7 @@ def setUp(self):
         self.p1.save()
 
 
-class ProposalTestCase(BaseProposalTestCase):
+class ProposalTestCase(MiscProposalTestCase):
     def test_reference_number(self):
         current_year = str(datetime.now().year)
 
@@ -222,7 +222,7 @@ def test_check_local_facilities(self):
         self.assertSetEqual(facs[Registration._meta.verbose_name], set([r.description for r in registrations]))
 
 
-class ProposalsViewTestCase(BaseProposalTestCase):
+class ProposalsViewTestCase(MiscProposalTestCase):
     def setUp(self):
         super(ProposalsViewTestCase, self).setUp()
         self.factory = RequestFactory()
@@ -273,7 +273,7 @@ def test_supervisor(self):
         )
 
 
-class WmoTestCase(BaseProposalTestCase):
+class WmoTestCase(MiscProposalTestCase):
     def setUp(self):
         super(WmoTestCase, self).setUp()
         self.wmo = Wmo.objects.create(proposal=self.p1, metc=YesNoDoubt.NO)
@@ -297,7 +297,7 @@ def test_status(self):
         self.assertEqual(self.wmo.status, Wmo.WMOStatuses.JUDGED)
 
 
-class CopyTestCase(BaseProposalTestCase):
+class CopyTestCase(MiscProposalTestCase):
 
     def setUp(self):
         super().setUp()
diff --git a/proposals/tests/proposal_submission_tests.py b/proposals/tests/proposal_submission_tests.py
new file mode 100644
index 000000000..6d77a3499
--- /dev/null
+++ b/proposals/tests/proposal_submission_tests.py
@@ -0,0 +1,245 @@
+from django.contrib.auth.models import User, Group, AnonymousUser
+from django.conf import settings
+from django.test import TestCase
+from django.core.management import call_command
+
+from main.tests import BaseViewTestCase
+from proposals.models import Proposal, Relation
+from reviews.models import Review
+
+from proposals.views.proposal_views import (
+    ProposalSubmit,
+    ProposalSubmitPreApproved,
+    ProposalSubmitPreAssessment,
+)
+
+
+class BaseProposalTestCase(TestCase):
+    fixtures = [
+        "groups",
+        "settings",
+        "registrations",
+        "fundings",
+        "institutions",
+        "relations",
+        "studentcontexts",
+        "agegroups",
+        "compensations",
+        "recruitments",
+        "specialdetails",
+        "traits",
+        "registrationkinds",
+        "registrations",
+        "testing/test_users",
+        "testing/test_proposals",
+    ]
+
+    def setUp(self):
+        self.setup_users()
+        self.setup_proposal()
+
+    def setup_users(self):
+        self.secretary = User.objects.create_user(
+            "secretary",
+            "test@test.com",
+            "secret",
+            first_name="The",
+            last_name="Secretary",
+        )
+        self.c1 = User.objects.create_user("c1", "test@test.com", "secret")
+        self.c2 = User.objects.create_user("c2", "test@test.com", "secret")
+        self.user = User.objects.create_user(
+            "user", "test@test.com", "secret", first_name="John", last_name="Doe"
+        )
+        self.supervisor = User.objects.create_user(
+            "supervisor", "test@test.com", "secret", first_name="Jane", last_name="Roe"
+        )
+
+        self.secretary.groups.add(
+            Group.objects.get(
+                name=settings.GROUP_PRIMARY_SECRETARY
+            )
+        )
+        self.secretary.groups.add(
+            Group.objects.get(
+                name=settings.GROUP_SECRETARY
+            )
+        )
+
+        self.c1.groups.add(
+            Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
+        )
+        self.c2.groups.add(
+            Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
+        )
+
+    def setup_proposal(self):
+        """
+        Load our test proposals from a fixture, then add our user as
+        an applicant to each of them.
+
+        Please note, this currently uses a mish-mash of both fixtures
+        and programmatically created users and objects.
+        """
+        self.proposal = Proposal.objects.get(pk=1)
+        self.proposal.applicants.add(self.user)
+        self.proposal.save()
+        self.pre_assessment = Proposal.objects.get(pk=2)
+        self.pre_assessment.applicants.add(self.user)
+        self.pre_assessment.save()
+        self.pre_approval = Proposal.objects.get(pk=3)
+        self.pre_approval.applicants.add(self.user)
+        self.pre_approval.save()
+
+    def refresh(self):
+        """Refresh objects from DB. This is sometimes necessary if you access
+        attributes you previously read during the test and don't want to
+        receive a cached value."""
+        self.proposal.refresh_from_db()
+
+
+class ProposalSubmitTestCase(
+        BaseViewTestCase,
+        BaseProposalTestCase,
+):
+    view_class = ProposalSubmit
+
+    def get_view_path(self):
+        pk = self.proposal.pk
+        return f"/proposals/submit/{pk}/"
+
+    def get_view_args(self):
+        return {"pk": self.proposal.pk}
+
+    def get_post_data(self):
+        return {
+            "inform_local_staff": True,
+            "embargo": True,
+            "comments": "asdf",
+            "embargo_end_date": "2025-01-01",
+        }
+
+    def test_access(self,):
+        # NB: The proposal creator does not have access by default
+        # Be sure to add them to the applicants list as well.
+        self.assertEqual(
+            self.check_access(
+                self.proposal.created_by,
+            ),
+            True
+        )
+        self.assertEqual(
+            self.check_access(
+                AnonymousUser,
+            ),
+            False
+        )
+
+    def test_submission_unsupervised(self):
+        """
+        Tests the following:
+        - The current proposal is a draft
+        - An applicant can submit a proposal that has no errors
+        - Because there is no supervisor, a new review is created
+          in the assignment stage.
+        """
+        # Sanity checks to start
+        self.assertEqual(
+            self.proposal.status,
+            self.proposal.Statuses.DRAFT,
+        )
+        self.assertEqual(
+            self.proposal.latest_review(),
+            None,
+        )
+        # POST and check status code
+        self.client.force_login(self.user)
+        page = self.post(
+            self.get_post_data(),
+            user=self.user,
+        )
+        self.assertIn(
+            page.status_code,
+            [302, 200]
+        )
+        self.refresh()
+        # Post-submission tests
+        self.assertNotEqual(
+            self.proposal.status,
+            self.proposal.Statuses.DRAFT,
+        )
+        self.assertNotEqual(
+            self.proposal.latest_review(),
+            None,
+        )
+        self.assertEqual(
+            self.proposal.latest_review().stage,
+            Review.Stages.ASSIGNMENT,
+        )
+
+    def test_proposal_supervised(self):
+        """
+        Tests the following:
+        - The current proposal is a draft
+        - An applicant can submit a proposal that has no errors
+        - Because there is a supervisor, a new review is created
+          in the supervisor stage.
+        """
+        # Select the PHD relation, which needs a supervisor
+        # but doesn't check for a study/course
+        self.proposal.relation = Relation.objects.get(pk=4)
+        self.proposal.supervisor = self.supervisor
+        self.proposal.save()
+        # Sanity checks to start
+        self.assertEqual(
+            self.proposal.status,
+            self.proposal.Statuses.DRAFT,
+        )
+        self.assertEqual(
+            self.proposal.latest_review(),
+            None,
+        )
+        # POST and check status code
+        self.client.force_login(self.user)
+        page = self.post(
+            self.get_post_data(),
+            user=self.user,
+        )
+        self.assertIn(
+            page.status_code,
+            [302, 200]
+        )
+        self.refresh()
+        # Post-submission tests
+        self.assertNotEqual(
+            self.proposal.status,
+            self.proposal.Statuses.DRAFT,
+        )
+        self.assertNotEqual(
+            self.proposal.latest_review(),
+            None,
+        )
+        self.assertEqual(
+            self.proposal.latest_review().stage,
+            Review.Stages.SUPERVISOR,
+        )
+
+
+class PreassessmentSubmitTestCase(
+        ProposalSubmitTestCase,
+):
+    view_class = ProposalSubmitPreAssessment
+
+    def setUp(self):
+        super().setUp()
+        self.proposal = self.pre_assessment
+
+
+class PreapprovedSubmitTestCase(
+        ProposalSubmitTestCase,
+):
+    view_class = ProposalSubmitPreApproved
+
+    def setUp(self):
+        super().setUp()
+        self.proposal = self.pre_approval
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 13a13fe5d..5ed234b35 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -433,22 +433,22 @@ def check_start_date(self):
     def is_supervisor_edit_phase(self):
         if self.object.status == self.object.Statuses.SUBMITTED_TO_SUPERVISOR:
             return True
-
         return False
 
     def form_valid(self, form):
         """
-        - Save the PDF on the Proposal
-        - Start the review process on submission (though not for practice Proposals)
+        Start a review for this proposal and return a response.
         """
-
-        success_url = super(ProposalSubmit, self).form_valid(form)
-        if 'save_back' not in self.request.POST and 'js-redirect-submit' not in self.request.POST:
-            proposal = self.get_object()
-            proposal.generate_pdf()
-            if not proposal.is_practice() and proposal.status == Proposal.Statuses.DRAFT:
-                start_review(proposal)
-        return success_url
+        # We pick up the response from the base class first so that
+        # the fields on the Submit page get saved correctly. In the end,
+        # this is still an UpdateView
+        success_response = super().form_valid(form)
+        # We then defer all submission logic to the utility code.
+        # Checks for practice proposals and starting the right
+        # kind of review happen over there.
+        proposal = form.instance
+        start_review(proposal)
+        return success_response
 
     def get_next_url(self):
         """After submission, go to the thank-you view. Unless a supervisor is
@@ -644,19 +644,6 @@ class ProposalUpdatePreAssessment(PreAssessmentMixin, ProposalUpdate):
 
 
 class ProposalSubmitPreAssessment(ProposalSubmit):
-    def form_valid(self, form):
-        """
-        Performs actions after saving the form
-        - Save the preassessment PDF on the Proposal
-        - End the preassessment phase
-        """
-        # Note that the below method does NOT call the ProposalSubmit method, as that would generate the full PDF.
-        success_url = super(ProposalSubmitPreAssessment, self).form_valid(form)
-        if 'save_back' not in self.request.POST and 'js-redirect-submit' not in self.request.POST:
-            proposal = self.get_object()
-            proposal.generate_pdf()
-            start_review_pre_assessment(proposal)
-        return success_url
 
     def get_next_url(self):
         """After submission, go to the thank-you view"""
@@ -705,17 +692,6 @@ class ProposalUpdatePreApproved(PreApprovedMixin, ProposalUpdate):
 
 
 class ProposalSubmitPreApproved(ProposalSubmit):
-    def form_valid(self, form):
-        """
-        Performs actions after saving the form
-        - Save the pre_approved PDF on the Proposal
-        - End the draft phase and start the appropiate review phase (in super function)
-        """
-        success_url = super(ProposalSubmitPreApproved, self).form_valid(form)
-        if 'save_back' not in self.request.POST:
-            proposal = self.get_object()
-            proposal.generate_pdf()
-        return success_url
 
     def get_next_url(self):
         """After submission, go to the thank-you view"""
diff --git a/reviews/tests.py b/reviews/tests.py
index 731cfb45e..35c219715 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -8,6 +8,7 @@
 
 from .models import Review, Decision
 from .utils import start_review, auto_review, auto_review_observation, auto_review_task, notify_secretary
+from main.tests import BaseViewTestCase
 from main.models import YesNoDoubt
 from proposals.models import Proposal, Relation, Wmo
 from proposals.utils import generate_ref_number
@@ -19,62 +20,6 @@
 from .views import ReviewCloseView
 
 
-class BaseViewTestCase():
-
-    # This testcase supports only class-based views
-    view_class = None
-
-    # for example:
-    # "/proposals/update/1/"
-    # NOT a full URL including protocal and domain
-    view_path = None
-
-    allowed_users = []
-    disallowed_users = [AnonymousUser]
-    enforce_csrf = True
-
-    def setUp(self):
-        self.client = Client()
-        self.view = self.view_class.as_view()
-        self.factory = RequestFactory()
-        super().setUp()
-
-    def check_access(self, user):
-        request = self.factory.get(
-            self.get_view_path(),
-        )
-        request.user = user
-        response = self.view(request, pk=self.review.pk)
-        return response.status_code == 200
-
-    def post(self, update_dict={}):
-        """Generic function to test form submission"""
-        post_data = {}
-        post_data.update(update_dict)
-        if self.enforce_csrf:
-            csrf_token = self.fetch_csrf_token(
-                user=self.secretary,
-            )
-            post_data["csrfmiddlewaretoken"] = csrf_token
-        response = self.client.post(
-            self.get_view_path(),
-            data=post_data,
-        )
-        return response
-
-    def fetch_csrf_token(self, user=None):
-        if user:
-            self.client.force_login(user)
-        page = self.client.get(
-            self.get_view_path(),
-        )
-        return page.context["csrf_token"]
-
-    def get_view_path(self):
-        return self.view_path
-
-
-
 class BaseReviewTestCase(TestCase):
 
     fixtures = ['relations', 'compensations', 'registrations',
@@ -378,6 +323,9 @@ def get_view_path(self):
         pk = self.review.pk
         return f"/reviews/close/{pk}/"
 
+    def get_view_args(self):
+        return {"pk": self.review.pk}
+
     def test_access(self):
         """Check this view is only accessible to secretary users"""
         self.assertEqual(
@@ -416,7 +364,10 @@ def test_decision(self):
             "continuation": self.review.Continuations.GO_POST_HOC,
         }
         self.client.force_login(self.secretary)
-        page = self.post(form_values)
+        page = self.post(
+            form_values,
+            user=self.secretary,
+        )
         self.refresh()
         # Assertions
         self.assertNotEqual(
@@ -441,7 +392,10 @@ def test_long_route(self):
             "continuation": self.review.Continuations.LONG_ROUTE,
         }
         self.client.force_login(self.secretary)
-        page = self.post(form_values)
+        page = self.post(
+            form_values,
+            user=self.secretary,
+        )
         self.refresh()
         # Assertions
         self.assertEqual(
@@ -466,7 +420,10 @@ def test_metc(self):
             "continuation": self.review.Continuations.METC,
         }
         self.client.force_login(self.secretary)
-        self.post(form_values)
+        self.post(
+            form_values,
+            user=self.secretary,
+        )
         self.refresh()
         # Assertions
         self.assertEqual(
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index ec0d2ee18..166642d67 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -20,14 +20,24 @@ def start_review(proposal):
     """
     Starts a Review for the given Proposal.
 
-    If the proposal needs a supervisor, start the supervisor phase. Otherwise, start the assignment phase.
+    If the proposal needs a supervisor, start the supervisor phase.
+    Otherwise, start the assignment phase.
     """
+    if proposal.is_practice():
+        # These should never start a review
+        return None
+    if proposal.status != Proposal.Statuses.DRAFT:
+        # This prevents double submissions
+        return None
+
+    proposal.generate_pdf()
+
     if proposal.relation.needs_supervisor:
-        review = start_supervisor_phase(proposal)
+        return start_supervisor_phase(proposal)
+    elif proposal.is_pre_assessment:
+        return start_review_pre_assessment(proposal)
     else:
-        review = start_assignment_phase(proposal)
-
-    return review
+        return start_assignment_phase(proposal)
 
 
 def start_supervisor_phase(proposal):
@@ -251,6 +261,8 @@ def start_review_pre_assessment(proposal):
     msg_plain = render_to_string('mail/pre_assessment_creator.txt', params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email])
 
+    return review
+
 
 def start_review_route(review, commission_users, use_short_route):
     """
diff --git a/studies/tests.py b/studies/tests.py
index 10d42c889..029b350a6 100644
--- a/studies/tests.py
+++ b/studies/tests.py
@@ -1,11 +1,12 @@
 from __future__ import division
 
-from proposals.tests import BaseProposalTestCase
+from proposals.tests import MiscProposalTestCase
 from .models import Study
 from .utils import STUDY_PROGRESS_START, STUDY_PROGRESS_TOTAL, get_study_progress
 
 
-class ProgressTestCase(BaseProposalTestCase):
+
+class ProgressTestCase(MiscProposalTestCase):
     def test_progress_single(self):
         self.p1.studies_number = 1
         self.p1.save()

From 475b7de3c67205c8bc7e72ae8bf82331ae726537 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 8 Jan 2024 15:14:43 +0100
Subject: [PATCH 111/148] docstring fix

---
 main/templatetags/fetc_filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/templatetags/fetc_filters.py b/main/templatetags/fetc_filters.py
index d8a6db6a1..ae77631d5 100644
--- a/main/templatetags/fetc_filters.py
+++ b/main/templatetags/fetc_filters.py
@@ -33,7 +33,7 @@ def is_secretary(current_user):
 @register.filter
 def is_chair_or_secretary(current_user):
     """
-    Check whether the current user is in the 'Chair' group
+    Check whether the current user is in the 'Chair' or 'Secretary' Group
     """
     user_groups = current_user.groups.all()
     return (

From 3ece7f72280cd6408ba4bd0d282049bd52b60686 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Wed, 10 Jan 2024 13:03:54 +0100
Subject: [PATCH 112/148] feature: user-friendly page for closed supervisors
 reviews

---
 locale/en/LC_MESSAGES/django.po              | 98 +++++++++++++-------
 reviews/mixins.py                            | 74 +++++++++++----
 reviews/templates/reviews/review_closed.html | 44 +++++++++
 reviews/urls.py                              |  3 +-
 reviews/views.py                             | 68 ++++++++++----
 5 files changed, 220 insertions(+), 67 deletions(-)
 create mode 100644 reviews/templates/reviews/review_closed.html

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 1d0d2c780..4f1afa0f2 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-12-05 11:33+0100\n"
+"POT-Creation-Date: 2024-01-10 13:01+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -441,6 +441,7 @@ msgstr "If this problem persists; "
 
 #: main/templates/error/400.html:21 main/templates/error/403.html:41
 #: main/templates/error/403_csrf.html:39 main/templates/error/500.html:20
+#: reviews/templates/reviews/review_closed.html:37
 msgid ""
 "Neem dan contact op met het technisch beheer van de portal via <a "
 "href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>."
@@ -484,6 +485,7 @@ msgstr ""
 "You are not logged in, please <a href=\"%(login_url)s\"> try to log in</a>."
 
 #: main/templates/error/403.html:38 main/templates/error/403_csrf.html:36
+#: reviews/templates/reviews/review_closed.html:34
 msgid "Denk je dat dit niet klopt?"
 msgstr "Do you think this is in error?"
 
@@ -3366,11 +3368,11 @@ msgstr "long (4-week) route"
 msgid "direct naar revisie"
 msgstr "straight to revision"
 
-#: reviews/forms.py:31 reviews/menus.py:60 reviews/mixins.py:127
+#: reviews/forms.py:31 reviews/menus.py:60 reviews/mixins.py:169
 msgid "Algemene Kamer"
 msgstr "General Chamber"
 
-#: reviews/forms.py:32 reviews/menus.py:67 reviews/mixins.py:130
+#: reviews/forms.py:32 reviews/menus.py:67 reviews/mixins.py:172
 msgid "Linguïstiek Kamer"
 msgstr "Linguistics Chamber"
 
@@ -3402,7 +3404,7 @@ msgstr "Start date period:"
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
-#: reviews/menus.py:14 reviews/views.py:70
+#: reviews/menus.py:14 reviews/views.py:71
 msgid "Mijn openstaande besluiten"
 msgstr "My pending decisions"
 
@@ -3418,19 +3420,19 @@ msgstr "All pending decisions committee members"
 msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
-#: reviews/menus.py:32 reviews/views.py:229
+#: reviews/menus.py:32 reviews/views.py:230
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
-#: reviews/menus.py:37 reviews/views.py:241
+#: reviews/menus.py:37 reviews/views.py:242
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:42 reviews/views.py:253
+#: reviews/menus.py:42 reviews/views.py:254
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
-#: reviews/menus.py:47 reviews/views.py:275
+#: reviews/menus.py:47 reviews/views.py:276
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
@@ -3884,6 +3886,30 @@ msgstr "Individual decisions"
 msgid "Uiteindelijk besluit"
 msgstr "Final decision"
 
+#: reviews/templates/reviews/review_closed.html:11
+#: reviews/templates/reviews/review_closed.html:20
+msgid "Aanvraag al beoordeeld"
+msgstr "Application has already been reviewed"
+
+#: reviews/templates/reviews/review_closed.html:24
+#, python-format
+msgid ""
+"Je hebt deze aanvraag al beoordeeld. Controleer of dit inderdaad de aanvraag "
+"is die je wou beoordelen. Op <a href=\"%(my_supervised_url)s\">deze pagina</"
+"a> vind je alle aanvragen waarvan je eindverantwoordelijke bent."
+msgstr ""
+"You have already reviewed this request. Please check if this is indeed the "
+"application you wanted to review. On <a href=\"%(my_supervised_url)s\">this "
+"page</a>, you can find all your supervised applications."
+
+#: reviews/templates/reviews/review_closed.html:29
+msgid ""
+"Wil je je beoordeling veranderen? Neem dan contact op met de <a "
+"href=\"mailto:fetc-gw@uu.nl\">secretaris van de FETC</a>."
+msgstr ""
+"Do you want to change your decision? Please contact the <a "
+"href=\"mailto:fetc-gw@uu.nl\">secretary of the FEtC-H</a>."
+
 #: reviews/templates/reviews/review_detail.html:11
 #, python-format
 msgid ""
@@ -4203,61 +4229,61 @@ msgstr "Add this application to the archive"
 msgid "Startdatum wijzigen"
 msgstr "Edit start date"
 
-#: reviews/utils/review_utils.py:55
+#: reviews/utils/review_utils.py:65
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:82
+#: reviews/utils/review_utils.py:92
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:132
+#: reviews/utils/review_utils.py:142
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:231
+#: reviews/utils/review_utils.py:241
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:245
+#: reviews/utils/review_utils.py:255
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:294
+#: reviews/utils/review_utils.py:306
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:309
+#: reviews/utils/review_utils.py:321
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:352
+#: reviews/utils/review_utils.py:364
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:378
+#: reviews/utils/review_utils.py:390
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:381
+#: reviews/utils/review_utils.py:393
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:384
+#: reviews/utils/review_utils.py:396
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:387
+#: reviews/utils/review_utils.py:399
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:390
+#: reviews/utils/review_utils.py:402
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4265,7 +4291,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:396
+#: reviews/utils/review_utils.py:408
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4275,7 +4301,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:400
+#: reviews/utils/review_utils.py:412
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4285,7 +4311,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:407
+#: reviews/utils/review_utils.py:419
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4296,14 +4322,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:424
+#: reviews/utils/review_utils.py:436
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:428
+#: reviews/utils/review_utils.py:440
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4311,7 +4337,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:430
+#: reviews/utils/review_utils.py:442
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4321,29 +4347,37 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:435
+#: reviews/utils/review_utils.py:447
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:456
+#: reviews/utils/review_utils.py:468
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""
 "The application contains psychophysiological measurements on children under "
 "{} year(s) old."
 
-#: reviews/views.py:60
+#: reviews/views.py:61
 msgid "Mijn besluiten"
 msgstr "My results"
 
-#: reviews/views.py:82
+#: reviews/views.py:83
 msgid "Openstaande besluiten commissieleden"
 msgstr "Pending decisions committee members"
 
-#: reviews/views.py:200
+#: reviews/views.py:201
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
+#: reviews/views.py:567
+msgid ""
+"Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer "
+"toevoegen/aanpassen"
+msgstr ""
+"This application has already been assessed, so you cannot add/adjust your "
+"assessment"
+
 #: studies/forms.py:41
 msgid ""
 "Maakt jouw onderzoek gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?"
diff --git a/reviews/mixins.py b/reviews/mixins.py
index 0bfb53beb..51c58924c 100644
--- a/reviews/mixins.py
+++ b/reviews/mixins.py
@@ -1,6 +1,6 @@
 from django.conf import settings
 from django.contrib.auth.models import Group
-from django.core.exceptions import PermissionDenied
+from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.utils.functional import cached_property
 from django.utils.translation import ugettext as _
 from django.views.generic.base import ContextMixin
@@ -12,26 +12,69 @@
 from .utils.review_utils import auto_review
 
 
-class UserAllowedMixin(SingleObjectMixin):
-    def get_object(self, queryset=None):
+class UserAllowedToDecisionMixin(SingleObjectMixin):
+    class ReviewClosed(PermissionDenied):
         """
-        Checks whether the current User is a reviewer in this Review,
-        as well as whether the Review is still open.
+        ReviewClosed Class
+
+        Subclass of PermissionDenied that represents an exception indicating that a review has been closed and no further actions can be performed on it.
+
+        This is a subclass of PermissionDenied to ensure Django handles it like that.
+
         """
-        obj = super(UserAllowedMixin, self).get_object(queryset)
 
-        if isinstance(obj, Review):
-            if not obj.decision_set.filter(reviewer=self.request.user):
-                raise PermissionDenied
+    def handle_review_closed(self, request, exception):
+        """
+        Handle the case when a review is closed.
 
-        if isinstance(obj, Decision):
-            reviewer = obj.reviewer
-            date_end = obj.review.date_end
+        :param self: The instance of the class.
+        :param request: The request object.
+        :param exception: The exception object.
 
-            if self.request.user != reviewer or date_end:
-                raise PermissionDenied
+        :raises: The same exception object raised by the view as a fallback
+        """
+        # If unhandled by the view, re-raise the exception to ensure we do not
+        # continue
+        raise exception
 
-        return obj
+    def dispatch(self, request, *args, **kwargs):
+        """
+        Dispatches the request to the appropriate view method based on the object type and checks user permissions.
+
+        :param request: The request object.
+        :type request: HttpRequest
+        :param args: Positional arguments passed to the view method.
+        :param kwargs: Keyword arguments passed to the view method.
+        :return: The response returned by the dispatched view method.
+        :rtype: HttpResponse
+        :raises PermissionDenied: If the current user does not have permission to access the object.
+        :raises self.ReviewClosed: If the review of the object is closed and the view does not handle this exception
+        :raises ImproperlyConfigured: If the mixin is used for a non-decision object.
+        """
+        try:
+            obj = self.get_object()
+
+            if isinstance(obj, Decision):
+                reviewer = obj.reviewer
+                date_end = obj.review.date_end
+
+                if request.user != reviewer:
+                    raise PermissionDenied
+
+                if date_end:
+                    raise self.ReviewClosed
+            else:
+                raise ImproperlyConfigured(
+                    'UserAllowedToDecisionMixin used for a non-decision object!'
+                )
+        except self.ReviewClosed as e:
+            ret = self.handle_review_closed(request, e)
+            # If the handle method returns None, it deemed it fine to continue
+            # as if nothing happened
+            if ret is not None:
+                return ret
+
+        return super().dispatch(request, *args, **kwargs)
 
 
 class UserOrSecretaryAllowedMixin(SingleObjectMixin):
@@ -113,7 +156,6 @@ def dispatch(self, request, *args, **kwargs):
             request, *args, **kwargs)
 
 
-
 class CommitteeMixin(ContextMixin):
 
     @cached_property
diff --git a/reviews/templates/reviews/review_closed.html b/reviews/templates/reviews/review_closed.html
new file mode 100644
index 000000000..fad1f8e12
--- /dev/null
+++ b/reviews/templates/reviews/review_closed.html
@@ -0,0 +1,44 @@
+{% extends "base/base.html" %}
+
+{% load static %}
+{% load proposal_filters %}
+{% load fetc_filters %}
+{% load i18n %}
+{% load compare_tags %}
+{% load uil_filters %}
+
+{% block header_title %}
+    {% trans 'Aanvraag al beoordeeld' %}
+    - {{ review.proposal.reference_number }} - {{ block.super }}
+{% endblock %}
+
+{% block content %}
+    {% url 'proposals:my_supervised' as my_supervised_url %}
+    <div class="uu-inner-container">
+        <div class="col-12 col-md-9">
+            <h2>
+                {% trans 'Aanvraag al beoordeeld' %}
+                - {{ review.proposal.reference_number }}
+            </h2>
+            <p>
+                {% blocktrans trimmed %}
+                    Je hebt deze aanvraag al beoordeeld. Controleer of dit inderdaad de aanvraag is die je wou beoordelen. Op <a href="{{ my_supervised_url }}">deze pagina</a> vind je alle aanvragen waarvan je eindverantwoordelijke bent.
+                {% endblocktrans %}
+            </p>
+            <p>
+                {% blocktrans trimmed %}
+                    Wil je je beoordeling veranderen? Neem dan contact op met de <a href="mailto:fetc-gw@uu.nl">secretaris van de FETC</a>.
+                {% endblocktrans %}
+            </p>
+            <p>
+                {% blocktrans trimmed %}
+                    Denk je dat dit niet klopt?
+                {% endblocktrans %}
+                {% blocktrans trimmed %}
+                    Neem dan contact op met het technisch beheer van de portal via <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.
+                {% endblocktrans %}
+            </p>
+        </div>
+        {% include "reviews/review_detail_sidebar.html" %}
+    </div>
+{% endblock %}
diff --git a/reviews/urls.py b/reviews/urls.py
index 823d9c9ba..334cb8845 100644
--- a/reviews/urls.py
+++ b/reviews/urls.py
@@ -4,7 +4,7 @@
     AllOpenProposalReviewsView, AllProposalReviewsView, DecisionListView, \
     InRevisionReviewsView, \
     DecisionMyOpenView, \
-    SupervisorDecisionOpenView, \
+    ReviewClosedDecisionView, SupervisorDecisionOpenView, \
     DecisionOpenView, \
     ReviewDetailView, \
     ReviewAssignView, ReviewCloseView, ReviewDiscontinueView, \
@@ -41,6 +41,7 @@
     path('discontinue/<int:pk>/', ReviewDiscontinueView.as_view(), name='discontinue'),
 
     path('decide/<int:pk>/', DecisionUpdateView.as_view(), name='decide'),
+    path('decide/closed/<int:pk>/', ReviewClosedDecisionView.as_view(), name='review-closed-decision'),
     path('decide/new/<int:review>/', CreateDecisionRedirectView.as_view(),
       name='decide_new'),
 ]
diff --git a/reviews/views.py b/reviews/views.py
index 8ac4761f8..865cc5afd 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -2,6 +2,7 @@
 
 from braces.views import GroupRequiredMixin, LoginRequiredMixin
 from django.conf import settings
+from django.contrib import messages
 from django.core.exceptions import PermissionDenied
 from django.http import HttpResponseRedirect
 from django.urls import reverse
@@ -23,7 +24,7 @@
 )
 from .mixins import (
     AutoReviewMixin,
-    UserAllowedMixin,
+    UserAllowedToDecisionMixin,
     CommitteeMixin,
     UsersOrGroupsAllowedMixin,
 )
@@ -317,13 +318,13 @@ def get_context_data(self, **kwargs):
         return context
 
 
-class ChangeChamberView(LoginRequiredMixin, UserAllowedMixin, generic.UpdateView):
+class ChangeChamberView(LoginRequiredMixin, GroupRequiredMixin, generic.UpdateView):
     model = Proposal
     form_class = ChangeChamberForm
     template_name = "reviews/change_chamber_form.html"
+    group_required = settings.GROUP_SECRETARY
 
     def get_success_url(self):
-        committee = self.object.reviewing_committee.name
         return reverse("reviews:detail", args=[self.object.latest_review().pk])
 
 
@@ -524,7 +525,7 @@ def get_redirect_url(self, *args, **kwargs):
         return reverse("reviews:decide", args=[decision_pk])
 
 
-class DecisionUpdateView(LoginRequiredMixin, UserAllowedMixin, generic.UpdateView):
+class DecisionUpdateView(LoginRequiredMixin, UserAllowedToDecisionMixin, generic.UpdateView):
     """
     Allows a User to make a Decision on a Review.
     """
@@ -532,22 +533,12 @@ class DecisionUpdateView(LoginRequiredMixin, UserAllowedMixin, generic.UpdateVie
     model = Decision
     form_class = DecisionForm
 
-    def is_reviewer(self):
-        if self.request.user.is_superuser:
-            return True
-        user_groups = self.request.user.groups.values_list("name", flat=True)
-        return {
-            settings.GROUP_SECRETARY,
-            settings.GROUP_LINGUISTICS_CHAMBER,
-            settings.GROUP_GENERAL_CHAMBER,
-        }.intersection(set(user_groups))
-
     def get_success_url(self):
-        if self.is_reviewer():
-            committee = self.object.review.proposal.reviewing_committee.name
-            return reverse("reviews:detail", args=[self.object.review.pk])
+        obj = self.get_object()
+        if obj.review.is_committee_review:
+            return reverse("reviews:detail", args=[obj.review.pk])
         else:
-            return reverse("proposals:my_archive")
+            return reverse("proposals:my_supervised")
 
     def form_valid(self, form):
         """Save the decision date and send e-mail to secretary"""
@@ -560,3 +551,44 @@ def form_valid(self, form):
             notify_secretary(form.instance)
 
         return super(DecisionUpdateView, self).form_valid(form)
+
+    def handle_review_closed(self, request, exception):
+        # Redirect to our 'this review is closed' page for supervisor reviews
+        redirect_url = reverse(
+            "reviews:review-closed-decision",
+            args=[self.get_object().pk]
+        )
+        # And go to the details page for committee reviews
+        if self.get_object().review.is_committee_review:
+            # Show a message for this case.
+            messages.warning(
+                request,
+                _(
+                    'Deze aanvraag is al beoordeeld, dus je kan je beoordeling '
+                    'niet meer toevoegen/aanpassen'
+                )
+            )
+            redirect_url = self.get_success_url()
+
+        return HttpResponseRedirect(redirect_url)
+
+
+class ReviewClosedDecisionView(LoginRequiredMixin, UserAllowedToDecisionMixin,
+                       generic.DetailView):
+    """Custom page for supervisors visiting links to already concluded
+    supervisor reviews
+    """
+    template_name = "reviews/review_closed.html"
+    model = Decision
+
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        context['review'] = self.object.review
+
+        return context
+
+    def handle_review_closed(self, request, exception):
+        # Do nothing; we only use the permission check, this page is only for
+        # cases where the review is closed.
+        return None
\ No newline at end of file

From 136e94f254067be7e1113f76a2a1c404ec87f279 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Thu, 11 Jan 2024 16:40:52 +0100
Subject: [PATCH 113/148] fix: minor textual changes

---
 locale/en/LC_MESSAGES/django.po              | 12 ++++++------
 reviews/templates/reviews/review_closed.html |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 4f1afa0f2..8244158dc 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-10 13:01+0100\n"
+"POT-Creation-Date: 2024-01-11 16:40+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -3895,8 +3895,8 @@ msgstr "Application has already been reviewed"
 #, python-format
 msgid ""
 "Je hebt deze aanvraag al beoordeeld. Controleer of dit inderdaad de aanvraag "
-"is die je wou beoordelen. Op <a href=\"%(my_supervised_url)s\">deze pagina</"
-"a> vind je alle aanvragen waarvan je eindverantwoordelijke bent."
+"is die je wilde beoordelen. Op <a href=\"%(my_supervised_url)s\">deze "
+"pagina</a> vind je alle aanvragen waarvan je de eindverantwoordelijke bent."
 msgstr ""
 "You have already reviewed this request. Please check if this is indeed the "
 "application you wanted to review. On <a href=\"%(my_supervised_url)s\">this "
@@ -3907,8 +3907,8 @@ msgid ""
 "Wil je je beoordeling veranderen? Neem dan contact op met de <a "
 "href=\"mailto:fetc-gw@uu.nl\">secretaris van de FETC</a>."
 msgstr ""
-"Do you want to change your decision? Please contact the <a "
-"href=\"mailto:fetc-gw@uu.nl\">secretary of the FEtC-H</a>."
+"Do you want to change your decision? Please contact the <a href=\"mailto:"
+"fetc-gw@uu.nl\">secretary of the FEtC-H</a>."
 
 #: reviews/templates/reviews/review_detail.html:11
 #, python-format
@@ -4375,7 +4375,7 @@ msgid ""
 "Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer "
 "toevoegen/aanpassen"
 msgstr ""
-"This application has already been assessed, so you cannot add/adjust your "
+"This application has already been assessed, so you cannot add/change your "
 "assessment"
 
 #: studies/forms.py:41
diff --git a/reviews/templates/reviews/review_closed.html b/reviews/templates/reviews/review_closed.html
index fad1f8e12..16bf1d18a 100644
--- a/reviews/templates/reviews/review_closed.html
+++ b/reviews/templates/reviews/review_closed.html
@@ -22,7 +22,7 @@ <h2>
             </h2>
             <p>
                 {% blocktrans trimmed %}
-                    Je hebt deze aanvraag al beoordeeld. Controleer of dit inderdaad de aanvraag is die je wou beoordelen. Op <a href="{{ my_supervised_url }}">deze pagina</a> vind je alle aanvragen waarvan je eindverantwoordelijke bent.
+                    Je hebt deze aanvraag al beoordeeld. Controleer of dit inderdaad de aanvraag is die je wilde beoordelen. Op <a href="{{ my_supervised_url }}">deze pagina</a> vind je alle aanvragen waarvan je de eindverantwoordelijke bent.
                 {% endblocktrans %}
             </p>
             <p>

From 340c7b1961f85f744b087b2214214fe7dc8f9dd6 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 14:23:55 +0100
Subject: [PATCH 114/148] deps: added black/djlint to dependencies + updates

---
 requirements.in  |   2 +
 requirements.txt | 108 ++++++++++++++++++++++++++++++++++-------------
 2 files changed, 81 insertions(+), 29 deletions(-)

diff --git a/requirements.in b/requirements.in
index 1826a6744..72c5bbfd2 100644
--- a/requirements.in
+++ b/requirements.in
@@ -25,3 +25,5 @@ cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanit
 python-magic
 pdftotext
 bpython
+black
+djlint
\ No newline at end of file
diff --git a/requirements.txt b/requirements.txt
index b1a97c0ca..a3d537aa8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@
     # via -r requirements.in
 -e git+https://github.com/UiL-OTS-labs/django-shared-core.git@v2.0.10#egg=uil-django-core
     # via -r requirements.in
-alabaster==0.7.13
+alabaster==0.7.16
     # via sphinx
 arabic-reshaper==3.0.0
     # via xhtml2pdf
@@ -19,30 +19,41 @@ asn1crypto==1.5.1
     #   oscrypto
     #   pyhanko
     #   pyhanko-certvalidator
-babel==2.13.1
+babel==2.14.0
     # via sphinx
+black==23.12.1
+    # via -r requirements.in
 blessed==1.20.0
     # via curtsies
 bpython==0.24
     # via -r requirements.in
 cdh-django-core @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0
     # via -r requirements.in
-certifi==2023.7.22
+certifi==2023.11.17
     # via requests
 cffi==1.16.0
     # via cryptography
+chardet==5.2.0
+    # via reportlab
 charset-normalizer==3.3.2
     # via requests
 click==8.1.7
-    # via pyhanko
+    # via
+    #   black
+    #   djlint
+    #   pyhanko
 closure==20191111
     # via uil-django-core
-cryptography==41.0.5
+colorama==0.4.6
+    # via djlint
+cryptography==41.0.7
     # via
     #   pyhanko
     #   pyhanko-certvalidator
     #   pyopenssl
     #   pysaml2
+cssbeautifier==1.14.11
+    # via djlint
 cssselect2==0.7.0
     # via svglib
 curtsies==0.4.2
@@ -80,7 +91,7 @@ django-debug-toolbar==4.2.0
     # via -r requirements.in
 django-extensions==3.2.3
     # via -r requirements.in
-django-impersonate==1.9.1
+django-impersonate==1.9.2
     # via -r requirements.in
 django-modeltranslation==0.18.11
     # via -r requirements.in
@@ -96,58 +107,84 @@ djangosaml2==1.6.0
     # via
     #   -r requirements.in
     #   cdh-django-core
-docutils==0.18.1
+djlint==1.34.1
+    # via -r requirements.in
+docutils==0.20.1
     # via
     #   sphinx
     #   sphinx-rtd-theme
+editorconfig==0.12.3
+    # via
+    #   cssbeautifier
+    #   jsbeautifier
 elementpath==4.1.5
     # via xmlschema
 freetype-py==2.3.0
     # via
     #   reportlab
     #   rlpycairo
-greenlet==3.0.1
+greenlet==3.0.3
     # via bpython
+html-tag-names==0.1.2
+    # via djlint
+html-void-elements==0.1.0
+    # via djlint
 html5lib==1.1
     # via
     #   -r requirements.in
     #   xhtml2pdf
-idna==3.4
+idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==6.8.0
+importlib-metadata==7.0.1
     # via sphinx
-jinja2==3.1.2
+jinja2==3.1.3
     # via sphinx
+jsbeautifier==1.14.11
+    # via
+    #   cssbeautifier
+    #   djlint
+json5==0.9.14
+    # via djlint
 lesscpy==0.15.1
     # via uil-django-core
-lxml==4.9.3
+lxml==5.1.0
     # via svglib
 markupsafe==2.1.3
     # via jinja2
+mypy-extensions==1.0.0
+    # via black
 mysqlclient==1.4.6
     # via -r requirements.in
 oscrypto==1.3.0
     # via pyhanko-certvalidator
 packaging==23.2
-    # via sphinx
+    # via
+    #   black
+    #   sphinx
+pathspec==0.12.1
+    # via
+    #   black
+    #   djlint
 pbr==6.0.0
     # via sphinxcontrib-apidoc
 pdftotext==2.2.2
     # via -r requirements.in
-pillow==10.1.0
+pillow==10.2.0
     # via
     #   -r requirements.in
     #   reportlab
     #   xhtml2pdf
+platformdirs==4.1.0
+    # via black
 ply==3.11
     # via lesscpy
 pprintpp==0.4.0
     # via sphinxcontrib-django
 pscript==0.7.7
     # via vbuild
-pyasn1==0.5.0
+pyasn1==0.5.1
     # via
     #   pyasn1-modules
     #   python-ldap
@@ -157,14 +194,14 @@ pycairo==1.25.1
     # via rlpycairo
 pycparser==2.21
     # via cffi
-pygments==2.16.1
+pygments==2.17.2
     # via
     #   -r requirements.in
     #   bpython
     #   sphinx
-pyhanko==0.20.1
+pyhanko==0.21.0
     # via xhtml2pdf
-pyhanko-certvalidator==0.24.1
+pyhanko-certvalidator==0.26.3
     # via
     #   pyhanko
     #   xhtml2pdf
@@ -172,7 +209,7 @@ pyjwt==2.8.0
     # via uil-django-core
 pyopenssl==23.3.0
     # via pysaml2
-pypdf==3.17.0
+pypdf==3.17.4
     # via xhtml2pdf
 pypng==0.20220715.0
     # via qrcode
@@ -184,7 +221,7 @@ python-bidi==0.4.2
     # via xhtml2pdf
 python-dateutil==2.8.2
     # via pysaml2
-python-ldap==3.4.3
+python-ldap==3.4.4
     # via django-auth-ldap
 python-magic==0.4.27
     # via -r requirements.in
@@ -196,10 +233,14 @@ pytz==2023.3.post1
 pyxdg==0.28
     # via bpython
 pyyaml==6.0.1
-    # via pyhanko
+    # via
+    #   djlint
+    #   pyhanko
 qrcode==7.4.2
     # via pyhanko
-reportlab[pycairo]==4.0.7
+regex==2023.12.25
+    # via djlint
+reportlab[pycairo]==4.0.9
     # via
     #   svglib
     #   xhtml2pdf
@@ -217,7 +258,9 @@ rlpycairo==0.3.0
 six==1.16.0
     # via
     #   blessed
+    #   cssbeautifier
     #   html5lib
+    #   jsbeautifier
     #   pyscss
     #   python-bidi
     #   python-dateutil
@@ -235,7 +278,7 @@ sphinx==7.2.6
     #   sphinxcontrib-jquery
     #   sphinxcontrib-qthelp
     #   sphinxcontrib-serializinghtml
-sphinx-rtd-theme==1.3.0
+sphinx-rtd-theme==2.0.0
     # via -r requirements.in
 sphinxcontrib-apidoc==0.4.0
     # via -r requirements.in
@@ -265,9 +308,16 @@ tinycss2==1.2.1
     # via
     #   cssselect2
     #   svglib
-typing-extensions==4.8.0
+tomli==2.0.1
+    # via
+    #   black
+    #   djlint
+tqdm==4.66.1
+    # via djlint
+typing-extensions==4.9.0
     # via
     #   asgiref
+    #   black
     #   django-modeltranslation
     #   pypdf
     #   qrcode
@@ -277,24 +327,24 @@ ua-parser==0.18.0
     # via user-agents
 uritools==4.0.2
     # via pyhanko-certvalidator
-urllib3==2.0.7
+urllib3==2.1.0
     # via requests
 user-agents==2.2.0
     # via django-user-agents
 vbuild==0.8.2
     # via uil-django-core
-wcwidth==0.2.9
+wcwidth==0.2.13
     # via blessed
 webencodings==0.5.1
     # via
     #   cssselect2
     #   html5lib
     #   tinycss2
-wrapt==1.15.0
+wrapt==1.16.0
     # via deprecated
-xhtml2pdf==0.2.12
+xhtml2pdf==0.2.13
     # via -r requirements.in
-xmlschema==2.5.0
+xmlschema==3.0.1
     # via pysaml2
 zipp==3.17.0
     # via importlib-metadata

From 135eb9119066aedf946aaf3d22cbb839d59fc038 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 14:33:10 +0100
Subject: [PATCH 115/148] style: app-wide black format

---
 docs/conf.py                                  | 180 ++---
 faqs/admin.py                                 |   7 +-
 faqs/menus.py                                 |  17 +-
 faqs/migrations/0001_initial.py               |  24 +-
 faqs/migrations/0002_auto_20161013_1959.py    |  19 +-
 faqs/models.py                                |   2 +-
 faqs/translation.py                           |   5 +-
 faqs/urls.py                                  |   4 +-
 faqs/views.py                                 |   2 +-
 fetc/constants.py                             |  10 +-
 fetc/saml_settings.example.py                 |  34 +-
 fetc/settings.py                              | 146 ++--
 fetc/urls.py                                  |  82 +-
 interventions/forms.py                        |  69 +-
 interventions/migrations/0001_initial.py      | 103 ++-
 .../0002_intervention_leader_has_coc.py       |  12 +-
 .../migrations/0003_auto_20180808_1131.py     |  40 +-
 .../migrations/0004_auto_20180808_1327.py     |  30 +-
 .../migrations/0005_auto_20190206_1119.py     |  60 +-
 .../migrations/0006_auto_20190401_1343.py     |  12 +-
 .../migrations/0007_auto_20200428_1337.py     |  24 +-
 .../migrations/0008_auto_20220103_1527.py     |  13 +-
 .../0009_alter_intervention_has_controls.py   |  12 +-
 interventions/models.py                       |  45 +-
 interventions/urls.py                         |   6 +-
 interventions/utils.py                        |   8 +-
 interventions/views.py                        |  23 +-
 main/admin.py                                 |  39 +-
 main/error_views.py                           |  11 +-
 main/forms/conditional_form.py                |  44 +-
 main/forms/mixins.py                          |  32 +-
 main/management/commands/add_ldap_users.py    |   8 +-
 main/management/commands/load_fixtures.py     |   5 +-
 main/management/commands/rename_app.py        |  19 +-
 main/menus.py                                 |  23 +-
 main/migrations/0001_initial.py               |  28 +-
 main/migrations/0002_auto_20161013_1959.py    |  11 +-
 main/migrations/0003_auto_20170601_0816.py    |  11 +-
 main/migrations/0004_setting_is_school.py     |   7 +-
 main/migrations/0005_auto_20180829_1540.py    |  11 +-
 main/migrations/0006_systemmessage.py         |  28 +-
 main/migrations/0007_auto_20210528_1331.py    |  11 +-
 main/migrations/0008_auto_20220926_0929.py    |  15 +-
 main/migrations/0009_faculty_samluserproxy.py |  47 +-
 main/migrations/0010_faculty_internal_name.py |  13 +-
 main/models.py                                |  48 +-
 main/serializers.py                           |   4 +-
 main/templatetags/compare_tags.py             |  79 +-
 main/templatetags/fetc_filters.py             |  15 +-
 main/tests.py                                 |  14 +-
 main/translation.py                           |   6 +-
 main/urls.py                                  |  18 +-
 main/utils.py                                 |  76 +-
 main/validators.py                            |  20 +-
 main/views.py                                 | 247 +++---
 observations/admin.py                         |   6 +-
 observations/forms.py                         |  99 ++-
 observations/migrations/0001_initial.py       | 160 +++-
 .../migrations/0002_auto_20161013_1959.py     |  11 +-
 .../0003_observation_leader_has_coc.py        |  12 +-
 .../migrations/0004_auto_20180808_1129.py     |  14 +-
 .../migrations/0005_auto_20180822_1206.py     |  33 +-
 .../migrations/0006_auto_20180822_1207.py     |  12 +-
 .../migrations/0007_auto_20180822_1214.py     |  37 +-
 .../migrations/0008_auto_20180822_1307.py     |  30 +-
 .../migrations/0009_auto_20180822_1328.py     |  21 +-
 .../migrations/0010_auto_20180822_1332.py     |  26 +-
 .../migrations/0011_auto_20190401_1343.py     |  52 +-
 ...bservation_has_advanced_consent_details.py |  12 +-
 .../0013_registration_requires_review.py      |   7 +-
 .../migrations/0014_auto_20200428_1337.py     |  24 +-
 .../migrations/0015_auto_20211213_1503.py     |  22 +-
 .../0016_alter_observation_registrations.py   |  13 +-
 observations/models.py                        |  98 +--
 observations/tests.py                         |   4 +-
 observations/translation.py                   |   2 +-
 observations/urls.py                          |   9 +-
 observations/utils.py                         |   8 +-
 observations/views.py                         |  21 +-
 proposals/admin.py                            |  51 +-
 proposals/api/serializers.py                  |  55 +-
 proposals/api/urls.py                         |  44 +-
 proposals/api/views.py                        | 132 ++--
 proposals/copy.py                             |   6 +-
 proposals/field.py                            |  13 +-
 proposals/forms.py                            | 726 ++++++++++--------
 proposals/management/commands/export_csv.py   |  53 +-
 .../management/commands/get_statistics.py     |  57 +-
 .../management/commands/regenerate_pdf.py     |  17 +-
 proposals/menus.py                            |  22 +-
 proposals/migrations/0001_initial.py          | 333 ++++++--
 .../migrations/0002_proposal_is_revision.py   |  12 +-
 .../migrations/0003_auto_20161008_2238.py     |  16 +-
 .../migrations/0004_auto_20161013_1508.py     |  19 +-
 .../migrations/0005_proposal_in_archive.py    |   7 +-
 .../0006_proposal_is_pre_assessment.py        |   7 +-
 .../migrations/0007_auto_20161219_1141.py     |  21 +-
 .../0008_relation_check_pre_assessment.py     |   7 +-
 .../0009_proposal_pre_assessment_pdf.py       |  14 +-
 .../migrations/0010_auto_20170328_1238.py     |  40 +-
 .../migrations/0011_auto_20170525_0005.py     |  19 +-
 .../0012_proposal_inform_local_staff.py       |  12 +-
 proposals/migrations/0013_proposal_public.py  |   7 +-
 .../migrations/0014_auto_20180808_1129.py     |  76 +-
 .../migrations/0015_auto_20181004_1043.py     |  18 +-
 .../migrations/0016_auto_20181005_1011.py     |  34 +-
 .../0017_proposal_reviewing_committee.py      |  16 +-
 .../migrations/0018_auto_20190124_1533.py     |  45 +-
 .../migrations/0019_auto_20190401_1343.py     | 138 +++-
 .../migrations/0020_auto_20190401_1348.py     |  15 +-
 .../migrations/0021_auto_20190926_1559.py     |   7 +-
 .../migrations/0022_auto_20191107_1438.py     |  13 +-
 .../migrations/0023_auto_20200428_1337.py     |  40 +-
 .../migrations/0023_auto_20201203_0906.py     |  27 +-
 .../0024_remove_wmo_is_behavioristic.py       |   7 +-
 .../migrations/0025_merge_20201222_1654.py    |   8 +-
 .../migrations/0026_auto_20210112_1632.py     |  26 +-
 .../migrations/0027_auto_20210118_1735.py     |  16 +-
 .../migrations/0028_auto_20210125_1159.py     |  39 +-
 .../migrations/0029_auto_20210129_1717.py     |  16 +-
 .../migrations/0030_auto_20210201_1514.py     |  16 +-
 .../migrations/0031_auto_20210201_1519.py     |  16 +-
 .../0032_proposal_avg_understood.py           |   7 +-
 .../migrations/0033_auto_20210521_1154.py     |  19 +-
 .../migrations/0034_auto_20211213_1503.py     | 319 +++++---
 .../migrations/0035_auto_20220607_1315.py     |  27 +-
 .../0036_proposal_self_assesment.py           |  13 +-
 ...self_assesment_proposal_self_assessment.py |   9 +-
 .../migrations/0038_auto_20220830_1357.py     |  22 +-
 .../migrations/0039_auto_20220830_1526.py     |  39 +-
 .../migrations/0040_auto_20220830_1634.py     |  22 +-
 .../0041_alter_proposal_funding_name.py       |  14 +-
 .../0042_proposal_student_justification.py    |  13 +-
 .../migrations/0043_auto_20221025_1057.py     |  24 +-
 .../migrations/0044_auto_20221206_1518.py     |  23 +-
 .../0045_alter_proposal_self_assessment.py    |  13 +-
 .../migrations/0046_auto_20230711_1634.py     |  46 +-
 .../migrations/0047_auto_20230718_1626.py     |  28 +-
 .../migrations/0048_auto_20231016_1202.py     |  24 +-
 .../0049_alter_proposal_supervisor.py         |  16 +-
 .../0050_alter_proposal_other_applicants.py   |  13 +-
 .../migrations/0050_auto_20231116_1413.py     |  18 +-
 .../migrations/0051_merge_20231121_1606.py    |   8 +-
 .../0052_alter_proposal_studies_similar.py    |  14 +-
 proposals/mixins.py                           |  29 +-
 proposals/models.py                           | 447 ++++++-----
 proposals/templatetags/diff_tags.py           |   4 +-
 proposals/templatetags/proposal_filters.py    |  30 +-
 proposals/tests/misc_tests.py                 | 257 ++++---
 proposals/tests/proposal_submission_tests.py  |  44 +-
 proposals/translation.py                      |   9 +-
 proposals/urls.py                             | 452 +++++++----
 proposals/utils/__init__.py                   |   2 +-
 proposals/utils/pdf_diff_logic.py             | 100 ++-
 proposals/utils/proposal_utils.py             | 244 +++---
 proposals/utils/statistics_utils.py           |  46 +-
 proposals/utils/validate_proposal.py          | 171 +++--
 proposals/validators.py                       |  11 +-
 proposals/views/proposal_views.py             | 385 +++++-----
 proposals/views/study_views.py                |  43 +-
 proposals/views/wmo_views.py                  |  68 +-
 proposals/widgets.py                          |  26 +-
 reviews/admin.py                              |  23 +-
 reviews/api/serializers.py                    |  85 +-
 reviews/api/urls.py                           |  60 +-
 reviews/api/views.py                          | 274 +++----
 reviews/forms.py                              |  92 ++-
 reviews/management/commands/send_reminders.py |   2 +-
 reviews/menus.py                              |  38 +-
 reviews/migrations/0001_initial.py            | 108 ++-
 reviews/migrations/0002_auto_20160927_2106.py |  19 +-
 reviews/migrations/0003_decision_go_char.py   |  38 +-
 reviews/migrations/0004_auto_20170117_1754.py |   9 +-
 .../migrations/0005_review_date_should_end.py |   7 +-
 reviews/migrations/0006_auto_20180808_1129.py |  18 +-
 reviews/migrations/0007_auto_20190401_1343.py |  19 +-
 reviews/migrations/0008_auto_20200428_1337.py |  37 +-
 reviews/migrations/0008_auto_20201203_0906.py |  21 +-
 .../migrations/0009_merge_20201222_1654.py    |   8 +-
 reviews/migrations/0010_auto_20210809_1653.py |  22 +-
 reviews/migrations/0011_auto_20210920_1650.py |  22 +-
 reviews/migrations/0012_auto_20211213_1503.py |  18 +-
 .../0013_add_is_committee_review.py           |  14 +-
 reviews/mixins.py                             |  46 +-
 reviews/models.py                             | 103 ++-
 reviews/templatetags/documents_list.py        | 154 ++--
 reviews/tests.py                              |  67 +-
 reviews/urls.py                               | 107 ++-
 reviews/utils/review_actions.py               | 178 ++---
 reviews/utils/review_utils.py                 | 364 ++++++---
 reviews/views.py                              |  31 +-
 studies/__init__.py                           |   2 +-
 studies/admin.py                              |  52 +-
 studies/app.py                                |   7 +-
 studies/forms.py                              | 294 ++++---
 studies/migrations/0001_initial.py            | 348 +++++++--
 studies/migrations/0002_auto_20161013_1959.py |  35 +-
 .../0003_study_passive_consent_details.py     |  12 +-
 studies/migrations/0004_auto_20170601_0816.py |  11 +-
 studies/migrations/0005_auto_20180302_1518.py |  37 +-
 studies/migrations/0006_auto_20180306_1320.py |  46 +-
 studies/migrations/0007_auto_20180808_1129.py | 118 ++-
 studies/migrations/0008_auto_20180808_1322.py |   7 +-
 studies/migrations/0009_agegroup_is_active.py |   7 +-
 studies/migrations/0010_documents.py          |  86 ++-
 studies/migrations/0011_auto_20180914_1358.py |  22 +-
 studies/migrations/0012_auto_20180914_1435.py |  23 +-
 studies/migrations/0013_auto_20190401_1343.py |  45 +-
 studies/migrations/0014_auto_20200428_1337.py |  24 +-
 studies/migrations/0015_auto_20210125_1159.py |  72 +-
 studies/migrations/0016_auto_20210301_1626.py |  39 +-
 studies/migrations/0017_auto_20210302_1453.py |  23 +-
 studies/migrations/0018_auto_20210409_1211.py |  14 +-
 studies/migrations/0019_auto_20211213_1503.py | 129 +++-
 .../migrations/0020_study_self_assesment.py   |  13 +-
 .../0021_remove_study_self_assesment.py       |   7 +-
 .../0022_alter_study_recruitment_details.py   |  13 +-
 studies/migrations/0023_auto_20221018_1541.py |  23 +-
 .../migrations/0024_alter_study_has_traits.py |  14 +-
 studies/migrations/0024_auto_20221018_1653.py |  48 +-
 .../migrations/0025_merge_20221206_1309.py    |   8 +-
 studies/migrations/0026_alter_study_traits.py |  13 +-
 studies/migrations/0027_auto_20230227_1425.py |  46 +-
 studies/models.py                             | 370 +++++----
 studies/signals/handlers.py                   |   3 +-
 studies/templatetags/describe_documents.py    |  66 +-
 studies/tests.py                              |  15 +-
 studies/translation.py                        |  11 +-
 studies/urls.py                               |  32 +-
 studies/utils.py                              |  28 +-
 studies/views/session_views.py                |  23 +-
 studies/views/study_views.py                  |  84 +-
 tasks/admin.py                                |  26 +-
 tasks/forms.py                                | 146 ++--
 tasks/migrations/0001_initial.py              | 220 ++++--
 tasks/migrations/0002_auto_20160927_2106.py   |  21 +-
 tasks/migrations/0003_auto_20161013_1959.py   |  19 +-
 tasks/migrations/0004_auto_20170601_0816.py   |  11 +-
 .../migrations/0005_session_leader_has_coc.py |  12 +-
 tasks/migrations/0006_auto_20190206_1452.py   |  51 +-
 tasks/migrations/0007_auto_20190401_1343.py   |  12 +-
 tasks/migrations/0008_auto_20200428_1337.py   |  34 +-
 tasks/migrations/0009_auto_20210301_1626.py   |  17 +-
 tasks/migrations/0010_auto_20211213_1503.py   |  46 +-
 .../0011_alter_task_registrations.py          |  13 +-
 .../0012_alter_task_registrations.py          |  13 +-
 tasks/models.py                               |  88 ++-
 tasks/translation.py                          |   4 +-
 tasks/urls.py                                 |  13 +-
 tasks/utils.py                                |  38 +-
 tasks/views/session_views.py                  |  50 +-
 tasks/views/task_views.py                     |  26 +-
 252 files changed, 7925 insertions(+), 5163 deletions(-)

diff --git a/docs/conf.py b/docs/conf.py
index 9bcb4a0cd..4e274db8a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -18,54 +18,55 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-sys.path.insert(0, os.path.abspath('..'))
-os.environ['DJANGO_SETTINGS_MODULE'] = 'fetc.settings'
+sys.path.insert(0, os.path.abspath(".."))
+os.environ["DJANGO_SETTINGS_MODULE"] = "fetc.settings"
 import django
+
 django.setup()
 
 # -- General configuration ------------------------------------------------
 
 # If your documentation needs a minimal Sphinx version, state it here.
-#needs_sphinx = '1.0'
+# needs_sphinx = '1.0'
 
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
 extensions = [
-    'sphinxcontrib.apidoc',
-    'sphinx.ext.autodoc',
-    'sphinxcontrib_django',
-    'sphinx.ext.coverage',
-    'sphinx.ext.viewcode'
+    "sphinxcontrib.apidoc",
+    "sphinx.ext.autodoc",
+    "sphinxcontrib_django",
+    "sphinx.ext.coverage",
+    "sphinx.ext.viewcode",
 ]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # The suffix(es) of source filenames.
 # You can specify multiple suffix as a list of string:
 # source_suffix = ['.rst', '.md']
-source_suffix = '.rst'
+source_suffix = ".rst"
 
 # The encoding of source files.
-#source_encoding = 'utf-8-sig'
+# source_encoding = 'utf-8-sig'
 
 # The master toctree document.
-master_doc = 'index'
+master_doc = "index"
 
 # General information about the project.
-project = u'FEtC-H'
-copyright = u'2019, Martijn van der Klis & Ty Mees'
-author = u'Martijn van der Klis & Ty Mees'
+project = "FEtC-H"
+copyright = "2019, Martijn van der Klis & Ty Mees"
+author = "Martijn van der Klis & Ty Mees"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
 # built documents.
 #
 # The short X.Y version.
-version = u'1.0'
+version = "1.0"
 # The full version, including alpha/beta/rc tags.
-release = u'1.0'
+release = "1.0"
 
 # The language for content autogenerated by Sphinx. Refer to documentation
 # for a list of supported languages.
@@ -76,38 +77,38 @@
 
 # There are two options for replacing |today|: either, you set today to some
 # non-false value, then it is used:
-#today = ''
+# today = ''
 # Else, today_fmt is used as the format for a strftime call.
-#today_fmt = '%B %d, %Y'
+# today_fmt = '%B %d, %Y'
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This patterns also effect to html_static_path and html_extra_path
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 # The reST default role (used for this markup: `text`) to use for all
 # documents.
-#default_role = None
+# default_role = None
 
 # If true, '()' will be appended to :func: etc. cross-reference text.
-#add_function_parentheses = True
+# add_function_parentheses = True
 
 # If true, the current module name will be prepended to all description
 # unit titles (such as .. function::).
-#add_module_names = True
+# add_module_names = True
 
 # If true, sectionauthor and moduleauthor directives will be shown in the
 # output. They are ignored by default.
-#show_authors = False
+# show_authors = False
 
 # The name of the Pygments (syntax highlighting) style to use.
-pygments_style = 'sphinx'
+pygments_style = "sphinx"
 
 # A list of ignored prefixes for module index sorting.
-#modindex_common_prefix = []
+# modindex_common_prefix = []
 
 # If true, keep warnings as "system message" paragraphs in the built documents.
-#keep_warnings = False
+# keep_warnings = False
 
 # If true, `todo` and `todoList` produce output, else they produce nothing.
 todo_include_todos = False
@@ -122,153 +123,152 @@
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
 # documentation.
-#html_theme_options = {}
+# html_theme_options = {}
 
 # Add any paths that contain custom themes here, relative to this directory.
-#html_theme_path = []
+# html_theme_path = []
 
 # The name for this set of Sphinx documents.
 # "<project> v<release> documentation" by default.
-#html_title = u'FEtC-H v1.0'
+# html_title = u'FEtC-H v1.0'
 
 # A shorter title for the navigation bar.  Default is the same as html_title.
-#html_short_title = None
+# html_short_title = None
 
 # The name of an image file (relative to this directory) to place at the top
 # of the sidebar.
-#html_logo = None
+# html_logo = None
 
 # The name of an image file (relative to this directory) to use as a favicon of
 # the docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
 # pixels large.
-#html_favicon = None
+# html_favicon = None
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-#html_static_path = ['_static']
+# html_static_path = ['_static']
 
 # Add any extra paths that contain custom files (such as robots.txt or
 # .htaccess) here, relative to this directory. These files are copied
 # directly to the root of the documentation.
-#html_extra_path = []
+# html_extra_path = []
 
 # If not None, a 'Last updated on:' timestamp is inserted at every page
 # bottom, using the given strftime format.
 # The empty string is equivalent to '%b %d, %Y'.
-#html_last_updated_fmt = None
+# html_last_updated_fmt = None
 
 # If true, SmartyPants will be used to convert quotes and dashes to
 # typographically correct entities.
-#html_use_smartypants = True
+# html_use_smartypants = True
 
 # Custom sidebar templates, maps document names to template names.
-#html_sidebars = {}
+# html_sidebars = {}
 
 # Additional templates that should be rendered to pages, maps page names to
 # template names.
-#html_additional_pages = {}
+# html_additional_pages = {}
 
 # If false, no module index is generated.
-#html_domain_indices = True
+# html_domain_indices = True
 
 # If false, no index is generated.
-#html_use_index = True
+# html_use_index = True
 
 # If true, the index is split into individual pages for each letter.
-#html_split_index = False
+# html_split_index = False
 
 # If true, links to the reST sources are added to the pages.
-#html_show_sourcelink = True
+# html_show_sourcelink = True
 
 # If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-#html_show_sphinx = True
+# html_show_sphinx = True
 
 # If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-#html_show_copyright = True
+# html_show_copyright = True
 
 # If true, an OpenSearch description file will be output, and all pages will
 # contain a <link> tag referring to it.  The value of this option must be the
 # base URL from which the finished HTML is served.
-#html_use_opensearch = ''
+# html_use_opensearch = ''
 
 # This is the file name suffix for HTML files (e.g. ".xhtml").
-#html_file_suffix = None
+# html_file_suffix = None
 
 # Language to be used for generating the HTML full-text search index.
 # Sphinx supports the following languages:
 #   'da', 'de', 'en', 'es', 'fi', 'fr', 'hu', 'it', 'ja'
 #   'nl', 'no', 'pt', 'ro', 'ru', 'sv', 'tr', 'zh'
-#html_search_language = 'en'
+# html_search_language = 'en'
 
 # A dictionary with options for the search language support, empty by default.
 # 'ja' uses this config value.
 # 'zh' user can custom change `jieba` dictionary path.
-#html_search_options = {'type': 'default'}
+# html_search_options = {'type': 'default'}
 
 # The name of a javascript file (relative to the configuration directory) that
 # implements a search results scorer. If empty, the default will be used.
-#html_search_scorer = 'scorer.js'
+# html_search_scorer = 'scorer.js'
 
 # Output file base name for HTML help builder.
-htmlhelp_basename = 'FEtCdoc'
+htmlhelp_basename = "FEtCdoc"
 
 # -- Options for LaTeX output ---------------------------------------------
 
 latex_elements = {
-# The paper size ('letterpaper' or 'a4paper').
-#'papersize': 'letterpaper',
-
-# The font size ('10pt', '11pt' or '12pt').
-#'pointsize': '10pt',
-
-# Additional stuff for the LaTeX preamble.
-#'preamble': '',
-
-# Latex figure (float) alignment
-#'figure_align': 'htbp',
+    # The paper size ('letterpaper' or 'a4paper').
+    #'papersize': 'letterpaper',
+    # The font size ('10pt', '11pt' or '12pt').
+    #'pointsize': '10pt',
+    # Additional stuff for the LaTeX preamble.
+    #'preamble': '',
+    # Latex figure (float) alignment
+    #'figure_align': 'htbp',
 }
 
 # Grouping the document tree into LaTeX files. List of tuples
 # (source start file, target name, title,
 #  author, documentclass [howto, manual, or own class]).
 latex_documents = [
-    (master_doc, 'FEtC-H.tex', u'FEtC-H Documentation',
-     u'Martijn van der Klis & Ty Mees', 'manual'),
+    (
+        master_doc,
+        "FEtC-H.tex",
+        "FEtC-H Documentation",
+        "Martijn van der Klis & Ty Mees",
+        "manual",
+    ),
 ]
 
 # The name of an image file (relative to this directory) to place at the top of
 # the title page.
-#latex_logo = None
+# latex_logo = None
 
 # For "manual" documents, if this is true, then toplevel headings are parts,
 # not chapters.
-#latex_use_parts = False
+# latex_use_parts = False
 
 # If true, show page references after internal links.
-#latex_show_pagerefs = False
+# latex_show_pagerefs = False
 
 # If true, show URL addresses after external links.
-#latex_show_urls = False
+# latex_show_urls = False
 
 # Documents to append as an appendix to all manuals.
-#latex_appendices = []
+# latex_appendices = []
 
 # If false, no module index is generated.
-#latex_domain_indices = True
+# latex_domain_indices = True
 
 
 # -- Options for manual page output ---------------------------------------
 
 # One entry per manual page. List of tuples
 # (source start file, name, description, authors, manual section).
-man_pages = [
-    (master_doc, 'fetc', u'FeTC-H Documentation',
-     [author], 1)
-]
+man_pages = [(master_doc, "fetc", "FeTC-H Documentation", [author], 1)]
 
 # If true, show URL addresses after external links.
-#man_show_urls = False
+# man_show_urls = False
 
 
 # -- Options for Texinfo output -------------------------------------------
@@ -277,29 +277,35 @@
 # (source start file, target name, title, author,
 #  dir menu entry, description, category)
 texinfo_documents = [
-    (master_doc, 'FeTC-h', u'FeTC-H Documentation',
-     author, 'FeTC-H', 'One line description of project.',
-     'Miscellaneous'),
+    (
+        master_doc,
+        "FeTC-h",
+        "FeTC-H Documentation",
+        author,
+        "FeTC-H",
+        "One line description of project.",
+        "Miscellaneous",
+    ),
 ]
 
 # Documents to append as an appendix to all manuals.
-#texinfo_appendices = []
+# texinfo_appendices = []
 
 # If false, no module index is generated.
-#texinfo_domain_indices = True
+# texinfo_domain_indices = True
 
 # How to display URL addresses: 'footnote', 'no', or 'inline'.
-#texinfo_show_urls = 'footnote'
+# texinfo_show_urls = 'footnote'
 
 # If true, do not generate a @detailmenu in the "Top" node's menu.
-#texinfo_no_detailmenu = False
+# texinfo_no_detailmenu = False
 
 
-apidoc_module_dir = '..'
-apidoc_output_dir = 'reference'
-apidoc_excluded_paths = ['docs', '*/migrations', 'manage.py']
+apidoc_module_dir = ".."
+apidoc_output_dir = "reference"
+apidoc_excluded_paths = ["docs", "*/migrations", "manage.py"]
 apidoc_separate_modules = True
 apidoc_module_first = True
-apidoc_toc_file = 'index'
+apidoc_toc_file = "index"
 
-todo_include_todos = True
\ No newline at end of file
+todo_include_todos = True
diff --git a/faqs/admin.py b/faqs/admin.py
index 7ed69910b..9f31d8776 100644
--- a/faqs/admin.py
+++ b/faqs/admin.py
@@ -5,5 +5,8 @@
 
 @admin.register(Faq)
 class FaqAdmin(admin.ModelAdmin):
-    list_display = ('order', 'question', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "question",
+    )
+    ordering = ["order"]
diff --git a/faqs/menus.py b/faqs/menus.py
index e412824ba..4afdaaefd 100644
--- a/faqs/menus.py
+++ b/faqs/menus.py
@@ -21,12 +21,15 @@
     MenuItem(
         _("FAQs"),
         reverse("faqs:list"),
-    )
+    ),
 )
 
-Menu.add_item("main", MenuItem(_('Help'),
-                               "#",
-                               children=help_menu,
-                               exact_url=True,
-                               ))
-
+Menu.add_item(
+    "main",
+    MenuItem(
+        _("Help"),
+        "#",
+        children=help_menu,
+        exact_url=True,
+    ),
+)
diff --git a/faqs/migrations/0001_initial.py b/faqs/migrations/0001_initial.py
index ce076326e..57192d352 100644
--- a/faqs/migrations/0001_initial.py
+++ b/faqs/migrations/0001_initial.py
@@ -5,21 +5,27 @@
 
 
 class Migration(migrations.Migration):
-
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Faq',
+            name="Faq",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('question', models.TextField()),
-                ('answer', models.TextField()),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("question", models.TextField()),
+                ("answer", models.TextField()),
             ],
             options={
-                'verbose_name': 'FAQ',
+                "verbose_name": "FAQ",
             },
         ),
     ]
diff --git a/faqs/migrations/0002_auto_20161013_1959.py b/faqs/migrations/0002_auto_20161013_1959.py
index 92865698b..d045a58d2 100644
--- a/faqs/migrations/0002_auto_20161013_1959.py
+++ b/faqs/migrations/0002_auto_20161013_1959.py
@@ -5,30 +5,29 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('faqs', '0001_initial'),
+        ("faqs", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='faq',
-            name='answer_en',
+            model_name="faq",
+            name="answer_en",
             field=models.TextField(null=True),
         ),
         migrations.AddField(
-            model_name='faq',
-            name='answer_nl',
+            model_name="faq",
+            name="answer_nl",
             field=models.TextField(null=True),
         ),
         migrations.AddField(
-            model_name='faq',
-            name='question_en',
+            model_name="faq",
+            name="question_en",
             field=models.TextField(null=True),
         ),
         migrations.AddField(
-            model_name='faq',
-            name='question_nl',
+            model_name="faq",
+            name="question_nl",
             field=models.TextField(null=True),
         ),
     ]
diff --git a/faqs/models.py b/faqs/models.py
index 53e5ce68b..2e68ddb0e 100644
--- a/faqs/models.py
+++ b/faqs/models.py
@@ -8,7 +8,7 @@ class Faq(models.Model):
     answer = models.TextField()
 
     class Meta:
-        verbose_name = _('FAQ')
+        verbose_name = _("FAQ")
 
     def __str__(self):
         return self.question
diff --git a/faqs/translation.py b/faqs/translation.py
index 2d95ff64d..303badbbe 100644
--- a/faqs/translation.py
+++ b/faqs/translation.py
@@ -5,4 +5,7 @@
 
 @register(Faq)
 class FaqTranslationOptions(TranslationOptions):
-    fields = ('question', 'answer',)
+    fields = (
+        "question",
+        "answer",
+    )
diff --git a/faqs/urls.py b/faqs/urls.py
index abf3a8354..01a891be7 100644
--- a/faqs/urls.py
+++ b/faqs/urls.py
@@ -2,8 +2,8 @@
 
 from .views import FaqsView
 
-app_name = 'faqs'
+app_name = "faqs"
 
 urlpatterns = [
-    path('', FaqsView.as_view(), name='list'),
+    path("", FaqsView.as_view(), name="list"),
 ]
diff --git a/faqs/views.py b/faqs/views.py
index 067061412..46ae683ca 100644
--- a/faqs/views.py
+++ b/faqs/views.py
@@ -5,4 +5,4 @@
 
 class FaqsView(generic.ListView):
     model = Faq
-    context_object_name = 'faqs'
+    context_object_name = "faqs"
diff --git a/fetc/constants.py b/fetc/constants.py
index 42d64370f..bac996c73 100644
--- a/fetc/constants.py
+++ b/fetc/constants.py
@@ -2,11 +2,11 @@
 # Separate to make deployment less of a hassle
 
 # Group names
-GROUP_SECRETARY = 'Secretaris'
-GROUP_PRIMARY_SECRETARY = 'Primaire secretaris'
-GROUP_LINGUISTICS_CHAMBER = 'LK'
-GROUP_GENERAL_CHAMBER = 'AK'
-GROUP_CHAIR = 'Voorzitter'
+GROUP_SECRETARY = "Secretaris"
+GROUP_PRIMARY_SECRETARY = "Primaire secretaris"
+GROUP_LINGUISTICS_CHAMBER = "LK"
+GROUP_GENERAL_CHAMBER = "AK"
+GROUP_CHAIR = "Voorzitter"
 
 # Route durations
 PREASSESSMENT_ROUTE_WEEKS = 1
diff --git a/fetc/saml_settings.example.py b/fetc/saml_settings.example.py
index bae4171da..e714b03b6 100644
--- a/fetc/saml_settings.example.py
+++ b/fetc/saml_settings.example.py
@@ -32,11 +32,11 @@
 # See also:
 # https://djangosaml2.readthedocs.io/contents/setup.html#users-attributes-and-account-linking
 SAML_ATTRIBUTE_MAPPING = {
-    'uuShortID':  ('username',),
-    'mail':     ('email',),
-    'givenName': ('first_name',),
-    'uuPrefixedSn':  ('last_name',),
-    'uuLegacyDepartment':  ('process_faculties', ),
+    "uuShortID": ("username",),
+    "mail": ("email",),
+    "givenName": ("first_name",),
+    "uuPrefixedSn": ("last_name",),
+    "uuLegacyDepartment": ("process_faculties",),
 }
 
 # Controls which mechanism is used to exchange SAML data with the IdP
@@ -51,39 +51,41 @@
     # localhost, port 8000. Please change if you run the app on a different
     # hostname/port
     # Note that localhost and 127.0.0.1 are not interchangeable here
-    base_url='http://localhost:8000/',
+    base_url="http://localhost:8000/",
     # The name of the app, does not _really_ matter
-    name='FEtC-H Portal',
+    name="FEtC-H Portal",
     # The full location of the private key of the cert, currently
     # <project_root>/certs/private.key
-    key_file=os.path.join(_BASE_DIR, 'certs/private.key'),
+    key_file=os.path.join(_BASE_DIR, "certs/private.key"),
     # The full location of the certificate, currently
     # <project_root>/certs/private.key
-    cert_file=os.path.join(_BASE_DIR, 'certs/public.cert'),
+    cert_file=os.path.join(_BASE_DIR, "certs/public.cert"),
     # The location of the IdP's metadata
     # The current value is valid for the Development IdP, if run at port 7000
     # If you run it in a different place/port, please update
     # If you use a different IdP, find its metadata URL and copy/paste it here
-    idp_metadata='http://localhost:7000/saml/idp/metadata/',
+    idp_metadata="http://localhost:7000/saml/idp/metadata/",
     # If set to True, the app will allow login attempts not requested by the app
     # This _can_ happen if a user logs in directly from the IdP. Currently set
     # to true, as the DevIdP can sometimes do funky stuff with the session ID
     allow_unsolicited=True,
     # A list of attributes the IdP needs to provide for the app to authenticate
     # Uses the naming of the IdP, not the internal names in Django
-    required_attributes=['uuShortID', 'mail', 'givenName', 'uuPrefixedSn'],
+    required_attributes=["uuShortID", "mail", "givenName", "uuPrefixedSn"],
     # A list of nice-to-have attributes from the IdP
     # Uses the naming of the IdP, not the internal names in Django
-    optional_attributes=['uuLegacyDepartment', ],
+    optional_attributes=[
+        "uuLegacyDepartment",
+    ],
     # Contact info for this app; will be added to the app's metadata and is
     # generally used by the IdP admins to contact all app-admins if they change
     # something.
-    contact_given_name='Humanities IT Portal Development',
-    contact_email='portaldev.gw@uu.nl',
+    contact_given_name="Humanities IT Portal Development",
+    contact_email="portaldev.gw@uu.nl",
 )
 
 # Add the SAML auth backend to the list of enabled backends.
 AUTHENTICATION_BACKENDS = (
-    'django.contrib.auth.backends.ModelBackend',
-    'djangosaml2.backends.Saml2Backend',
+    "django.contrib.auth.backends.ModelBackend",
+    "djangosaml2.backends.Saml2Backend",
 )
diff --git a/fetc/settings.py b/fetc/settings.py
index 3bf40c16d..e8403fc27 100644
--- a/fetc/settings.py
+++ b/fetc/settings.py
@@ -21,77 +21,74 @@
 
 # Quick-start development settings - unsuitable for production
 # See https://docs.djangoproject.com/en/1.8/howto/deployment/checklist/
-SECRET_KEY = 'j8dwfg6kvg=fnfs33s0x(t&0pfe)p9$3dm943)6hvurj6@=+4j'
+SECRET_KEY = "j8dwfg6kvg=fnfs33s0x(t&0pfe)p9$3dm943)6hvurj6@=+4j"
 DEBUG = True
 ALLOWED_HOSTS = []
-INTERNAL_IPS = ['127.0.0.1', 'localhost']
-WSGI_APPLICATION = 'fetc.wsgi.application'
+INTERNAL_IPS = ["127.0.0.1", "localhost"]
+WSGI_APPLICATION = "fetc.wsgi.application"
 
 
 # Application definition
 
 INSTALLED_APPS = [
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    'menu',
-    'debug_toolbar',
-    'django_extensions',
-    'rest_framework',
-
-    'main',
-    'uil.core',
-    'uil.vue',
-    'proposals',
-    'studies',
-    'tasks',
-    'interventions',
-    'observations',
-    'reviews',
-    'faqs',
-
-    'modeltranslation',
-    'impersonate',
-
-    'django.contrib.admin',
-    'django_user_agents',
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    "menu",
+    "debug_toolbar",
+    "django_extensions",
+    "rest_framework",
+    "main",
+    "uil.core",
+    "uil.vue",
+    "proposals",
+    "studies",
+    "tasks",
+    "interventions",
+    "observations",
+    "reviews",
+    "faqs",
+    "modeltranslation",
+    "impersonate",
+    "django.contrib.admin",
+    "django_user_agents",
 ]
 
 MIDDLEWARE = [
-    'debug_toolbar.middleware.DebugToolbarMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.locale.LocaleMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
-    'django.middleware.security.SecurityMiddleware',
-    'django_user_agents.middleware.UserAgentMiddleware',
-    'impersonate.middleware.ImpersonateMiddleware',
+    "debug_toolbar.middleware.DebugToolbarMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
+    "django.middleware.security.SecurityMiddleware",
+    "django_user_agents.middleware.UserAgentMiddleware",
+    "impersonate.middleware.ImpersonateMiddleware",
 ]
 
 TEMPLATES = [
     {
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
-        'DIRS': [],
-        'APP_DIRS': True,
-        'OPTIONS': {
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.contrib.messages.context_processors.messages',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
             ],
         },
     },
 ]
 
-ROOT_URLCONF = 'fetc.urls'
+ROOT_URLCONF = "fetc.urls"
 
-LOGIN_REDIRECT_URL = '/'
+LOGIN_REDIRECT_URL = "/"
 
 # Determines what login options are displayed on the landing page. NOTE: this
 # does not determine which login screen is actually used as default when using
@@ -108,53 +105,50 @@
 # https://docs.djangoproject.com/en/1.8/ref/settings/#databases
 
 DATABASES = {
-    'default': {
-        'ENGINE': 'django.db.backends.sqlite3',
-        'NAME': os.path.join(BASE_DIR, 'db.sqlite3'),
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": os.path.join(BASE_DIR, "db.sqlite3"),
     },
     #'mysql': {
     #    'ENGINE': 'django.db.backends.mysql',
     #    'NAME': 'ethics',
     #    'USER': 'root',
     #    'PASSWORD': 'root++',
-    #}
+    # }
 }
 
-DEFAULT_AUTO_FIELD = 'django.db.models.AutoField'
-
+DEFAULT_AUTO_FIELD = "django.db.models.AutoField"
 
 
 # Internationalization
 # https://docs.djangoproject.com/en/1.8/topics/i18n/
 
-LANGUAGE_CODE = 'nl-NL'
+LANGUAGE_CODE = "nl-NL"
 LANGUAGES = (
-    ('nl', _('Nederlands')),
-    ('en', _('Engels')),
+    ("nl", _("Nederlands")),
+    ("en", _("Engels")),
 )
 USE_I18N = True
 USE_L10N = True
-LOCALE_PATHS = (
-    'locale',
-)
+LOCALE_PATHS = ("locale",)
 
-TIME_ZONE = 'Europe/Amsterdam'
+TIME_ZONE = "Europe/Amsterdam"
 USE_TZ = True
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/1.8/howto/static-files/
 
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
 
 # File handling
-MEDIA_ROOT = 'media'
-MEDIA_URL = '/media/'
+MEDIA_ROOT = "media"
+MEDIA_URL = "/media/"
 
 # E-mail settings
-EMAIL_HOST = 'localhost'
+EMAIL_HOST = "localhost"
 EMAIL_PORT = 2525
-EMAIL_FROM = 'T.D.Mees@uu.nl'
-EMAIL_LOCAL_STAFF = 'T.D.Mees@uu.nl'
+EMAIL_FROM = "T.D.Mees@uu.nl"
+EMAIL_LOCAL_STAFF = "T.D.Mees@uu.nl"
 
 # Django Simple Menu
 # https://django-simple-menu.readthedocs.io/en/latest/index.html
@@ -163,10 +157,10 @@
 MENU_HIDE_EMPTY = False
 
 # Base URL
-BASE_URL = '127.0.0.1:8000'
+BASE_URL = "127.0.0.1:8000"
 
 # CSRF Setting
-CSRF_FAILURE_VIEW = 'main.error_views.csrf_failure'
+CSRF_FAILURE_VIEW = "main.error_views.csrf_failure"
 
 try:
     from .constants import *
@@ -176,7 +170,7 @@
 try:
     from .ldap_settings import *
 except ImportError:
-    print('Proceeding without LDAP settings')
+    print("Proceeding without LDAP settings")
 
 try:
     from .saml_settings import *
@@ -185,11 +179,11 @@
     INSTALLED_APPS += SAML_APPS
     MIDDLEWARE += SAML_MIDDLEWARE
 
-    LOGIN_URL = reverse_lazy('saml-login')
+    LOGIN_URL = reverse_lazy("saml-login")
     SHOW_SAML_LOGIN = True
 
     # Custom proxy model for SAML attribute processing
-    SAML_USER_MODEL = 'main.SamlUserProxy'
+    SAML_USER_MODEL = "main.SamlUserProxy"
 
 except ImportError:
-    print('Proceeding without SAML settings')
+    print("Proceeding without SAML settings")
diff --git a/fetc/urls.py b/fetc/urls.py
index aad85bf04..6f37f877f 100644
--- a/fetc/urls.py
+++ b/fetc/urls.py
@@ -12,77 +12,69 @@
 
 from main.views import UserMediaView
 
-handler404 = 'main.error_views.error_404'
-handler500 = 'main.error_views.error_500'
-handler403 = 'main.error_views.error_403'
-handler400 = 'main.error_views.error_400'
+handler404 = "main.error_views.error_404"
+handler500 = "main.error_views.error_500"
+handler403 = "main.error_views.error_403"
+handler400 = "main.error_views.error_400"
 
 
 urlpatterns = [
     # Always keep the default login view available, just to be sure
     # We set the correct login view (this or SAML) in settings
-    path('accounts/login/', auth_views.LoginView.as_view(), name='login'),
-
+    path("accounts/login/", auth_views.LoginView.as_view(), name="login"),
     # Access user uploads
-    path('media/<str:filename>',
-         UserMediaView.as_view(),
-         name='user_upload'),
-
-    path('', include('main.urls')),
-    path('proposals/', include('proposals.urls')),
-    path('studies/', include('studies.urls')),
-    path('tasks/', include('tasks.urls')),
-    path('observations/', include('observations.urls')),
-    path('interventions/', include('interventions.urls')),
-    path('reviews/', include('reviews.urls')),
-    path('faqs/', include('faqs.urls')),
-
-    path('admin/', admin.site.urls),
-    path('impersonate/', include('impersonate.urls')),
-
-    path('i18n/', include('django.conf.urls.i18n')),
-    path('uilcore/', include('uil.core.urls')),
-    path('vue/', include('uil.vue.urls')),
+    path("media/<str:filename>", UserMediaView.as_view(), name="user_upload"),
+    path("", include("main.urls")),
+    path("proposals/", include("proposals.urls")),
+    path("studies/", include("studies.urls")),
+    path("tasks/", include("tasks.urls")),
+    path("observations/", include("observations.urls")),
+    path("interventions/", include("interventions.urls")),
+    path("reviews/", include("reviews.urls")),
+    path("faqs/", include("faqs.urls")),
+    path("admin/", admin.site.urls),
+    path("impersonate/", include("impersonate.urls")),
+    path("i18n/", include("django.conf.urls.i18n")),
+    path("uilcore/", include("uil.core.urls")),
+    path("vue/", include("uil.vue.urls")),
 ]
 
-if 'debug_toolbar' in settings.INSTALLED_APPS and settings.DEBUG:
+if "debug_toolbar" in settings.INSTALLED_APPS and settings.DEBUG:
     import debug_toolbar
 
     urlpatterns.append(
-        path('__debug__/', include(debug_toolbar.urls)),
+        path("__debug__/", include(debug_toolbar.urls)),
     )
 
 # If SAML is enabled, add the required URL patterns for SAML
-if 'cdh.federated_auth' in settings.INSTALLED_APPS:
+if "cdh.federated_auth" in settings.INSTALLED_APPS:
     from djangosaml2.views import EchoAttributesView, LoginView
     from cdh.federated_auth.saml.views import LogoutInitView
 
-    urlpatterns.extend([
-        path('saml/login/', LoginView.as_view(), name='saml-login'),
-        # We can only have one logout view. Luckily, the SAML logout view can
-        # handle local accounts as well.
-        path('saml/logout/', LogoutInitView.as_view(), name='logout'),
-        path('saml/', include('djangosaml2.urls')),
-    ])
+    urlpatterns.extend(
+        [
+            path("saml/login/", LoginView.as_view(), name="saml-login"),
+            # We can only have one logout view. Luckily, the SAML logout view can
+            # handle local accounts as well.
+            path("saml/logout/", LogoutInitView.as_view(), name="logout"),
+            path("saml/", include("djangosaml2.urls")),
+        ]
+    )
 
     if settings.DEBUG:
         urlpatterns.append(
             path(
-                'saml/echo_attributes/',
+                "saml/echo_attributes/",
                 EchoAttributesView.as_view(),
-                name='saml-attributes'
+                name="saml-attributes",
             )
         )
 else:
     # If not, append the default logout-view
     urlpatterns.append(
-        path(
-            'accounts/logout/',
-            auth_views.LogoutView.as_view(),
-            name='logout'
-        ),
+        path("accounts/logout/", auth_views.LogoutView.as_view(), name="logout"),
     )
 
-admin.site.site_header = 'FETC-GW'
-admin.site.site_title = 'FETC-GW administratie'
-admin.site.index_title = 'FETC-GW administratie'
+admin.site.site_header = "FETC-GW"
+admin.site.site_title = "FETC-GW administratie"
+admin.site.index_title = "FETC-GW administratie"
diff --git a/interventions/forms.py b/interventions/forms.py
index e56cc86bf..1597f44b2 100644
--- a/interventions/forms.py
+++ b/interventions/forms.py
@@ -9,34 +9,42 @@ class InterventionForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Intervention
         fields = [
-            'setting', 'setting_details', 'supervision', 'leader_has_coc',
-            'period', 'multiple_sessions', 'session_frequency', 'duration',
-            'experimenter', 'description',
-            'has_controls', 'controls_description',
-            'measurement', 'extra_task'
+            "setting",
+            "setting_details",
+            "supervision",
+            "leader_has_coc",
+            "period",
+            "multiple_sessions",
+            "session_frequency",
+            "duration",
+            "experimenter",
+            "description",
+            "has_controls",
+            "controls_description",
+            "measurement",
+            "extra_task",
         ]
         widgets = {
-            'setting':           forms.CheckboxSelectMultiple(),
-            'supervision':       forms.RadioSelect(choices=YES_NO),
-            'multiple_sessions': forms.RadioSelect(choices=YES_NO),
-            'leader_has_coc':    forms.RadioSelect(choices=YES_NO),
-            'has_controls':      forms.RadioSelect(choices=YES_NO),
-            'extra_task':        forms.RadioSelect(choices=YES_NO),
+            "setting": forms.CheckboxSelectMultiple(),
+            "supervision": forms.RadioSelect(choices=YES_NO),
+            "multiple_sessions": forms.RadioSelect(choices=YES_NO),
+            "leader_has_coc": forms.RadioSelect(choices=YES_NO),
+            "has_controls": forms.RadioSelect(choices=YES_NO),
+            "extra_task": forms.RadioSelect(choices=YES_NO),
         }
 
-
     def __init__(self, *args, **kwargs):
         """
         - Set the Study for later reference
         - Don't ask the supervision question when there are only adult AgeGroups in this Study
         """
-        self.study = kwargs.pop('study', None)
+        self.study = kwargs.pop("study", None)
 
         super(InterventionForm, self).__init__(*args, **kwargs)
 
         if not self.study.has_children():
-            del self.fields['supervision']
-            del self.fields['leader_has_coc']
+            del self.fields["supervision"]
+            del self.fields["leader_has_coc"]
 
     def get_soft_validation_fields(self):
         # We want soft validation on all fields
@@ -53,21 +61,22 @@ def clean(self):
 
         self.mark_soft_required(
             cleaned_data,
-            'setting',
-            'period',
-            'experimenter',
-            'description',
-            'measurement',
+            "setting",
+            "period",
+            "experimenter",
+            "description",
+            "measurement",
         )
 
-        self.check_dependency_multiple(cleaned_data, 'setting', 'needs_details',
-                                       'setting_details')
+        self.check_dependency_multiple(
+            cleaned_data, "setting", "needs_details", "setting_details"
+        )
         if self.study.has_children():
-            self.check_dependency_multiple(cleaned_data, 'setting',
-                                           'needs_supervision', 'supervision')
-            self.check_dependency(cleaned_data, 'supervision', 'leader_has_coc',
-                                  f1_value=False)
-        self.check_dependency(cleaned_data, 'has_controls',
-                              'controls_description')
-        self.check_dependency(cleaned_data, 'multiple_sessions',
-                              'session_frequency')
+            self.check_dependency_multiple(
+                cleaned_data, "setting", "needs_supervision", "supervision"
+            )
+            self.check_dependency(
+                cleaned_data, "supervision", "leader_has_coc", f1_value=False
+            )
+        self.check_dependency(cleaned_data, "has_controls", "controls_description")
+        self.check_dependency(cleaned_data, "multiple_sessions", "session_frequency")
diff --git a/interventions/migrations/0001_initial.py b/interventions/migrations/0001_initial.py
index bd828f72b..9d16a19a4 100644
--- a/interventions/migrations/0001_initial.py
+++ b/interventions/migrations/0001_initial.py
@@ -5,32 +5,99 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0001_initial'),
-        ('main', '0001_initial'),
+        ("studies", "0001_initial"),
+        ("main", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Intervention',
+            name="Intervention",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('setting_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('supervision', models.NullBooleanField(verbose_name='Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?')),
-                ('period', models.TextField(verbose_name='Wat is de periode waarbinnen de interventie plaatsvindt?')),
-                ('amount_per_week', models.PositiveIntegerField(verbose_name='Hoe vaak per week vindt de interventiesessie plaats?')),
-                ('duration', models.PositiveIntegerField(verbose_name='Wat is de duur van de interventie per sessie in minuten?')),
-                ('experimenter', models.TextField(verbose_name='Wie voert de interventie uit?')),
-                ('description', models.TextField(verbose_name='Geef een beschrijving van de experimentele interventie')),
-                ('has_controls', models.BooleanField(default=False, verbose_name='Is er sprake van een controlegroep?')),
-                ('controls_description', models.TextField(verbose_name='Geef een beschrijving van de controleinterventie', blank=True)),
-                ('measurement', models.TextField(help_text='Wanneer u de deelnemer extra taken laat uitvoeren, dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet u op de vorige pagina ook "takenonderzoek" aanvinken.', verbose_name='Hoe wordt het effect van de interventie gemeten?')),
-                ('setting', models.ManyToManyField(to='main.Setting', verbose_name='Geef aan waar de dataverzameling plaatsvindt')),
-                ('study', models.OneToOneField(to='studies.Study', on_delete=models.CASCADE)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                (
+                    "setting_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "supervision",
+                    models.NullBooleanField(
+                        verbose_name="Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?"
+                    ),
+                ),
+                (
+                    "period",
+                    models.TextField(
+                        verbose_name="Wat is de periode waarbinnen de interventie plaatsvindt?"
+                    ),
+                ),
+                (
+                    "amount_per_week",
+                    models.PositiveIntegerField(
+                        verbose_name="Hoe vaak per week vindt de interventiesessie plaats?"
+                    ),
+                ),
+                (
+                    "duration",
+                    models.PositiveIntegerField(
+                        verbose_name="Wat is de duur van de interventie per sessie in minuten?"
+                    ),
+                ),
+                (
+                    "experimenter",
+                    models.TextField(verbose_name="Wie voert de interventie uit?"),
+                ),
+                (
+                    "description",
+                    models.TextField(
+                        verbose_name="Geef een beschrijving van de experimentele interventie"
+                    ),
+                ),
+                (
+                    "has_controls",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Is er sprake van een controlegroep?",
+                    ),
+                ),
+                (
+                    "controls_description",
+                    models.TextField(
+                        verbose_name="Geef een beschrijving van de controleinterventie",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "measurement",
+                    models.TextField(
+                        help_text='Wanneer u de deelnemer extra taken laat uitvoeren, dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet u op de vorige pagina ook "takenonderzoek" aanvinken.',
+                        verbose_name="Hoe wordt het effect van de interventie gemeten?",
+                    ),
+                ),
+                (
+                    "setting",
+                    models.ManyToManyField(
+                        to="main.Setting",
+                        verbose_name="Geef aan waar de dataverzameling plaatsvindt",
+                    ),
+                ),
+                (
+                    "study",
+                    models.OneToOneField(to="studies.Study", on_delete=models.CASCADE),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
     ]
diff --git a/interventions/migrations/0002_intervention_leader_has_coc.py b/interventions/migrations/0002_intervention_leader_has_coc.py
index de8abbd8d..d9ba88883 100644
--- a/interventions/migrations/0002_intervention_leader_has_coc.py
+++ b/interventions/migrations/0002_intervention_leader_has_coc.py
@@ -5,15 +5,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0001_initial'),
+        ("interventions", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='intervention',
-            name='leader_has_coc',
-            field=models.NullBooleanField(help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De ETCL neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="intervention",
+            name="leader_has_coc",
+            field=models.NullBooleanField(
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De ETCL neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0003_auto_20180808_1131.py b/interventions/migrations/0003_auto_20180808_1131.py
index 1bdbd951e..38cf377ce 100644
--- a/interventions/migrations/0003_auto_20180808_1131.py
+++ b/interventions/migrations/0003_auto_20180808_1131.py
@@ -6,30 +6,42 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0002_intervention_leader_has_coc'),
+        ("interventions", "0002_intervention_leader_has_coc"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='intervention',
-            name='extra_task',
-            field=models.BooleanField(default=False, help_text='Moet het nog een taak doen, zoals het invullen van een (onderzoeks)vragenlijst, die niet binnen de interventie zelf valt?', verbose_name='Voert de leerling nog een taak uit die niet onder het leerplan valt?'),
+            model_name="intervention",
+            name="extra_task",
+            field=models.BooleanField(
+                default=False,
+                help_text="Moet het nog een taak doen, zoals het invullen van een (onderzoeks)vragenlijst, die niet binnen de interventie zelf valt?",
+                verbose_name="Voert de leerling nog een taak uit die niet onder het leerplan valt?",
+            ),
         ),
         migrations.AddField(
-            model_name='intervention',
-            name='multiple_sessions',
-            field=models.BooleanField(default=False, verbose_name='Zal de interventie vaker dan één keer plaatsvinden?'),
+            model_name="intervention",
+            name="multiple_sessions",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zal de interventie vaker dan één keer plaatsvinden?",
+            ),
         ),
         migrations.AddField(
-            model_name='intervention',
-            name='version',
-            field=models.PositiveIntegerField(default=1, verbose_name='INTERNAL - Describes which version of the intervention model is used'),
+            model_name="intervention",
+            name="version",
+            field=models.PositiveIntegerField(
+                default=1,
+                verbose_name="INTERNAL - Describes which version of the intervention model is used",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='period',
-            field=models.TextField(help_text='De interventie vindt plaats binnen het schooljaar 2018-2019', verbose_name='Wat is de periode waarbinnen de interventie plaatsvindt?'),
+            model_name="intervention",
+            name="period",
+            field=models.TextField(
+                help_text="De interventie vindt plaats binnen het schooljaar 2018-2019",
+                verbose_name="Wat is de periode waarbinnen de interventie plaatsvindt?",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0004_auto_20180808_1327.py b/interventions/migrations/0004_auto_20180808_1327.py
index 5ead67d5c..1738e3a2b 100644
--- a/interventions/migrations/0004_auto_20180808_1327.py
+++ b/interventions/migrations/0004_auto_20180808_1327.py
@@ -6,25 +6,33 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0003_auto_20180808_1131'),
+        ("interventions", "0003_auto_20180808_1131"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='intervention',
-            name='session_frequency',
-            field=models.TextField(blank=True, verbose_name='Wat is de frequentie van de interventie?'),
+            model_name="intervention",
+            name="session_frequency",
+            field=models.TextField(
+                blank=True, verbose_name="Wat is de frequentie van de interventie?"
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='amount_per_week',
-            field=models.PositiveIntegerField(blank=True, default=1, verbose_name='Hoe vaak per week vindt de interventiesessie plaats?'),
+            model_name="intervention",
+            name="amount_per_week",
+            field=models.PositiveIntegerField(
+                blank=True,
+                default=1,
+                verbose_name="Hoe vaak per week vindt de interventiesessie plaats?",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='version',
-            field=models.PositiveIntegerField(default=2, verbose_name='INTERNAL - Describes which version of the intervention model is used'),
+            model_name="intervention",
+            name="version",
+            field=models.PositiveIntegerField(
+                default=2,
+                verbose_name="INTERNAL - Describes which version of the intervention model is used",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0005_auto_20190206_1119.py b/interventions/migrations/0005_auto_20190206_1119.py
index 47a184b62..d3cb41e01 100644
--- a/interventions/migrations/0005_auto_20190206_1119.py
+++ b/interventions/migrations/0005_auto_20190206_1119.py
@@ -6,40 +6,60 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0004_auto_20180808_1327'),
+        ("interventions", "0004_auto_20180808_1327"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='intervention',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='Geef een beschrijving van de experimentele interventie'),
+            model_name="intervention",
+            name="description",
+            field=models.TextField(
+                blank=True,
+                verbose_name="Geef een beschrijving van de experimentele interventie",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='duration',
-            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='Wat is de duur van de interventie per sessie in minuten?'),
+            model_name="intervention",
+            name="duration",
+            field=models.PositiveIntegerField(
+                blank=True,
+                null=True,
+                verbose_name="Wat is de duur van de interventie per sessie in minuten?",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='experimenter',
-            field=models.TextField(blank=True, verbose_name='Wie voert de interventie uit?'),
+            model_name="intervention",
+            name="experimenter",
+            field=models.TextField(
+                blank=True, verbose_name="Wie voert de interventie uit?"
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='measurement',
-            field=models.TextField(blank=True, help_text='Wanneer u de deelnemer extra taken laat uitvoeren, dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet u op de vorige pagina ook "takenonderzoek" aanvinken.', verbose_name='Hoe wordt het effect van de interventie gemeten?'),
+            model_name="intervention",
+            name="measurement",
+            field=models.TextField(
+                blank=True,
+                help_text='Wanneer u de deelnemer extra taken laat uitvoeren, dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet u op de vorige pagina ook "takenonderzoek" aanvinken.',
+                verbose_name="Hoe wordt het effect van de interventie gemeten?",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='period',
-            field=models.TextField(blank=True, help_text='De interventie vindt plaats binnen het schooljaar 2018-2019', verbose_name='Wat is de periode waarbinnen de interventie plaatsvindt?'),
+            model_name="intervention",
+            name="period",
+            field=models.TextField(
+                blank=True,
+                help_text="De interventie vindt plaats binnen het schooljaar 2018-2019",
+                verbose_name="Wat is de periode waarbinnen de interventie plaatsvindt?",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='setting',
-            field=models.ManyToManyField(blank=True, to='main.Setting', verbose_name='Geef aan waar de dataverzameling plaatsvindt'),
+            model_name="intervention",
+            name="setting",
+            field=models.ManyToManyField(
+                blank=True,
+                to="main.Setting",
+                verbose_name="Geef aan waar de dataverzameling plaatsvindt",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0006_auto_20190401_1343.py b/interventions/migrations/0006_auto_20190401_1343.py
index 854377cc3..21e3ff7b3 100644
--- a/interventions/migrations/0006_auto_20190401_1343.py
+++ b/interventions/migrations/0006_auto_20190401_1343.py
@@ -6,15 +6,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0005_auto_20190206_1119'),
+        ("interventions", "0005_auto_20190206_1119"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='intervention',
-            name='leader_has_coc',
-            field=models.NullBooleanField(help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="intervention",
+            name="leader_has_coc",
+            field=models.NullBooleanField(
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0007_auto_20200428_1337.py b/interventions/migrations/0007_auto_20200428_1337.py
index 47f5ecd24..dc22c5091 100644
--- a/interventions/migrations/0007_auto_20200428_1337.py
+++ b/interventions/migrations/0007_auto_20200428_1337.py
@@ -4,20 +4,28 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0006_auto_20190401_1343'),
+        ("interventions", "0006_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='intervention',
-            name='leader_has_coc',
-            field=models.BooleanField(blank=True, help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', null=True, verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="intervention",
+            name="leader_has_coc",
+            field=models.BooleanField(
+                blank=True,
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                null=True,
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
         migrations.AlterField(
-            model_name='intervention',
-            name='supervision',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?'),
+            model_name="intervention",
+            name="supervision",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0008_auto_20220103_1527.py b/interventions/migrations/0008_auto_20220103_1527.py
index 93cc22f1e..a2868ecee 100644
--- a/interventions/migrations/0008_auto_20220103_1527.py
+++ b/interventions/migrations/0008_auto_20220103_1527.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0007_auto_20200428_1337'),
+        ("interventions", "0007_auto_20200428_1337"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='intervention',
-            name='measurement',
-            field=models.TextField(blank=True, help_text='Wanneer je de deelnemer extra taken laat uitvoeren, dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet je op de vorige pagina ook "takenonderzoek" aanvinken.', verbose_name='Hoe wordt het effect van de interventie gemeten?'),
+            model_name="intervention",
+            name="measurement",
+            field=models.TextField(
+                blank=True,
+                help_text='Wanneer je de deelnemer extra taken laat uitvoeren, dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet je op de vorige pagina ook "takenonderzoek" aanvinken.',
+                verbose_name="Hoe wordt het effect van de interventie gemeten?",
+            ),
         ),
     ]
diff --git a/interventions/migrations/0009_alter_intervention_has_controls.py b/interventions/migrations/0009_alter_intervention_has_controls.py
index 3feeba302..6753469ac 100644
--- a/interventions/migrations/0009_alter_intervention_has_controls.py
+++ b/interventions/migrations/0009_alter_intervention_has_controls.py
@@ -4,15 +4,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('interventions', '0008_auto_20220103_1527'),
+        ("interventions", "0008_auto_20220103_1527"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='intervention',
-            name='has_controls',
-            field=models.BooleanField(default=False, verbose_name='Is er sprake van een controlegroep? (Let op: als de controlegroep ook een ander soort taken krijgt, moet je hier een apart traject voor aanmaken)'),
+            model_name="intervention",
+            name="has_controls",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Is er sprake van een controlegroep? (Let op: als de controlegroep ook een ander soort taken krijgt, moet je hier een apart traject voor aanmaken)",
+            ),
         ),
     ]
diff --git a/interventions/models.py b/interventions/models.py
index b7746a6cd..ecb027ce7 100644
--- a/interventions/models.py
+++ b/interventions/models.py
@@ -6,73 +6,80 @@
 
 
 class Intervention(SettingModel):
-
     # This is used internally to provide backwards compatibility with the old version of this model. All old fields are
     # still used if this is 1.
-    version = models.PositiveIntegerField('INTERNAL - Describes which version of the intervention model is used', default=2)
+    version = models.PositiveIntegerField(
+        "INTERNAL - Describes which version of the intervention model is used",
+        default=2,
+    )
 
     period = models.TextField(
-        _('Wat is de periode waarbinnen de interventie plaatsvindt?'),
-        help_text=_('De interventie vindt plaats binnen het schooljaar '
-                    '2018-2019'),
+        _("Wat is de periode waarbinnen de interventie plaatsvindt?"),
+        help_text=_("De interventie vindt plaats binnen het schooljaar " "2018-2019"),
         blank=True,
     )
 
     multiple_sessions = models.BooleanField(
-        _('Zal de interventie vaker dan één keer plaatsvinden?'),
+        _("Zal de interventie vaker dan één keer plaatsvinden?"),
         default=False,
     )
 
     session_frequency = models.TextField(
-        _('Wat is de frequentie van de interventie?'),
+        _("Wat is de frequentie van de interventie?"),
         blank=True,
     )
 
     duration = models.PositiveIntegerField(
-        _('Wat is de duur van de interventie per sessie in minuten?'),
+        _("Wat is de duur van de interventie per sessie in minuten?"),
         blank=True,
         null=True,
     )
 
     experimenter = models.TextField(
-        _('Wie voert de interventie uit?'),
+        _("Wie voert de interventie uit?"),
         blank=True,
     )
 
     description = models.TextField(
-        _('Geef een beschrijving van de experimentele interventie'),
+        _("Geef een beschrijving van de experimentele interventie"),
         blank=True,
     )
 
     has_controls = models.BooleanField(
-        _('Is er sprake van een controlegroep? (Let op: als de controlegroep \
+        _(
+            "Is er sprake van een controlegroep? (Let op: als de controlegroep \
 ook een ander soort taken krijgt, moet je hier een apart traject \
-voor aanmaken)'),
+voor aanmaken)"
+        ),
         default=False,
     )
 
     controls_description = models.TextField(
-        _('Geef een beschrijving van de controleinterventie'),
+        _("Geef een beschrijving van de controleinterventie"),
         blank=True,
     )
 
     measurement = models.TextField(
-        _('Hoe wordt het effect van de interventie gemeten?'),
-        help_text=_('Wanneer je de deelnemer extra taken laat uitvoeren, \
+        _("Hoe wordt het effect van de interventie gemeten?"),
+        help_text=_(
+            'Wanneer je de deelnemer extra taken laat uitvoeren, \
 dus een taak die niet behoort tot het reguliere onderwijspakket, dan moet \
-je op de vorige pagina ook "takenonderzoek" aanvinken.'),
+je op de vorige pagina ook "takenonderzoek" aanvinken.'
+        ),
         blank=True,
     )
 
     extra_task = models.BooleanField(
-        _('Voert de leerling nog een taak uit die niet onder het leerplan valt?'),
-        help_text=_('Moet het nog een taak doen, zoals het invullen van een (onderzoeks)vragenlijst, die niet binnen de interventie zelf valt?'),
+        _("Voert de leerling nog een taak uit die niet onder het leerplan valt?"),
+        help_text=_(
+            "Moet het nog een taak doen, zoals het invullen van een (onderzoeks)vragenlijst, die niet binnen de interventie zelf valt?"
+        ),
         default=False,
     )
 
     # Legacy, not used in version 2 of the form
     amount_per_week = models.PositiveIntegerField(
-        _('Hoe vaak per week vindt de interventiesessie plaats?'),
+        _("Hoe vaak per week vindt de interventiesessie plaats?"),
         blank=True,
         default=1,
     )
diff --git a/interventions/urls.py b/interventions/urls.py
index 82346d215..4aa31867f 100644
--- a/interventions/urls.py
+++ b/interventions/urls.py
@@ -2,9 +2,9 @@
 
 from .views import InterventionCreate, InterventionUpdate
 
-app_name = 'interventions'
+app_name = "interventions"
 
 urlpatterns = [
-    path('create/<int:pk>/', InterventionCreate.as_view(), name='create'),
-    path('update/<int:pk>/', InterventionUpdate.as_view(), name='update'),
+    path("create/<int:pk>/", InterventionCreate.as_view(), name="create"),
+    path("update/<int:pk>/", InterventionUpdate.as_view(), name="update"),
 ]
diff --git a/interventions/utils.py b/interventions/utils.py
index a88e64a26..de7cf4921 100644
--- a/interventions/utils.py
+++ b/interventions/utils.py
@@ -8,12 +8,12 @@ def intervention_url(study):
     """
     Returns the available URLs for an Intervention
     """
-    result = AvailableURL(title=_('Interventieonderzoek'), margin=2)
+    result = AvailableURL(title=_("Interventieonderzoek"), margin=2)
     if study.has_intervention:
-        if hasattr(study, 'intervention'):
-            result.url = reverse('interventions:update', args=(study.intervention.pk,))
+        if hasattr(study, "intervention"):
+            result.url = reverse("interventions:update", args=(study.intervention.pk,))
         else:
-            result.url = reverse('interventions:create', args=(study.pk,))
+            result.url = reverse("interventions:create", args=(study.pk,))
     return result
 
 
diff --git a/interventions/views.py b/interventions/views.py
index 0771e8e66..d1b3e79af 100644
--- a/interventions/views.py
+++ b/interventions/views.py
@@ -14,40 +14,41 @@
 ##############################
 class InterventionMixin(object):
     """Mixin for an Intervention, to use in both InterventionCreate and InterventionUpdate below"""
+
     model = Intervention
     form_class = InterventionForm
-    success_message = _('Interventie opgeslagen')
+    success_message = _("Interventie opgeslagen")
 
     def get_context_data(self, **kwargs):
         """Setting the Study and progress on the context"""
         context = super(InterventionMixin, self).get_context_data(**kwargs)
         study = self.get_study()
-        context['study'] = study
-        context['progress'] = get_study_progress(study) + 7
+        context["study"] = study
+        context["progress"] = get_study_progress(study) + 7
         return context
 
     def get_form_kwargs(self):
         """Sets the Study as a form kwarg"""
         kwargs = super(InterventionMixin, self).get_form_kwargs()
-        kwargs['study'] = self.get_study()
+        kwargs["study"] = self.get_study()
         return kwargs
 
     def get_next_url(self):
         study = self.get_study()
-        next_url = 'studies:design_end'
+        next_url = "studies:design_end"
         pk = study.pk
         if study.has_observation:
-            if hasattr(study, 'observation'):
-                next_url = 'observations:update'
+            if hasattr(study, "observation"):
+                next_url = "observations:update"
                 pk = study.observation.pk
             else:
-                next_url = 'observations:create'
+                next_url = "observations:create"
         elif study.has_sessions:
-            next_url = 'studies:session_start'
+            next_url = "studies:session_start"
         return reverse(next_url, args=(pk,))
 
     def get_back_url(self):
-        return reverse('studies:design', args=(self.get_study().pk,))
+        return reverse("studies:design", args=(self.get_study().pk,))
 
     def get_study(self):
         raise NotImplementedError
@@ -63,7 +64,7 @@ def form_valid(self, form):
 
     def get_study(self):
         """Retrieves the Study from the pk kwarg"""
-        return Study.objects.get(pk=self.kwargs['pk'])
+        return Study.objects.get(pk=self.kwargs["pk"])
 
 
 class InterventionUpdate(InterventionMixin, AllowErrorsOnBackbuttonMixin, UpdateView):
diff --git a/main/admin.py b/main/admin.py
index 482305b6c..38eb225d0 100644
--- a/main/admin.py
+++ b/main/admin.py
@@ -23,30 +23,43 @@ class GenericGroup(GroupAdmin):
 
 @admin.register(Faculty)
 class FacultyAdmin(admin.ModelAdmin):
-    list_display = ('saml_name', 'name', 'name_nl', 'name_en', 'internal_name',)
-    list_display_links = ('saml_name',)
-    filter_horizontal = ('users',)
+    list_display = (
+        "saml_name",
+        "name",
+        "name_nl",
+        "name_en",
+        "internal_name",
+    )
+    list_display_links = ("saml_name",)
+    filter_horizontal = ("users",)
 
 
 @admin.register(Setting)
 class SettingAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'is_local', 'needs_details', 'needs_supervision', 'requires_review', 'is_school',)
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "is_local",
+        "needs_details",
+        "needs_supervision",
+        "requires_review",
+        "is_school",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
 
 
 @admin.register(SystemMessage)
 class SystemMessageAdmin(admin.ModelAdmin):
-    list_display = ('level', 'message', 'not_before', 'not_after')
-    list_display_links =  ('message', )
-    ordering = ['not_before', 'not_after']
-    formfield_overrides = {
-        CharField: {'widget': Textarea}
-    }
+    list_display = ("level", "message", "not_before", "not_after")
+    list_display_links = ("message",)
+    ordering = ["not_before", "not_after"]
+    formfield_overrides = {CharField: {"widget": Textarea}}
 
 
 class FacultyInline(admin.TabularInline):
     """Adds a 'Faculty' field to the User admin"""
+
     model = Faculty.users.through
     can_delete = False
     verbose_name_plural = "faculties"
@@ -57,4 +70,4 @@ class CustomUserAdmin(UserAdmin):
     inlines = [FacultyInline]
 
 
-admin.site.register(get_user_model(), CustomUserAdmin)
\ No newline at end of file
+admin.site.register(get_user_model(), CustomUserAdmin)
diff --git a/main/error_views.py b/main/error_views.py
index bf45a6b55..e17c83b97 100644
--- a/main/error_views.py
+++ b/main/error_views.py
@@ -3,19 +3,20 @@
 
 
 def error_400(request, exception):
-    return render(request, 'error/400.html', status=400)
+    return render(request, "error/400.html", status=400)
 
 
 def error_403(request, exception):
-    return render(request, 'error/403.html', status=403)
+    return render(request, "error/403.html", status=403)
 
 
 def error_404(request, exception):
-    return render(request, 'error/404.html', status=404)
+    return render(request, "error/404.html", status=404)
 
 
 def error_500(request):
-    return render(request, 'error/500.html', status=500)
+    return render(request, "error/500.html", status=500)
+
 
 def csrf_failure(request, reason=""):
-    return render(request, 'error/403_csrf.html', status=403)
+    return render(request, "error/403_csrf.html", status=403)
diff --git a/main/forms/conditional_form.py b/main/forms/conditional_form.py
index dcb0a054d..4794df4bc 100644
--- a/main/forms/conditional_form.py
+++ b/main/forms/conditional_form.py
@@ -5,51 +5,63 @@
 
 
 class ConditionalModelForm(forms.ModelForm):
-    def check_empty(self, cleaned_data, f1, error_message=''):
+    def check_empty(self, cleaned_data, f1, error_message=""):
         is_required = False
         if not error_message:
-            error_message = _('Dit veld is verplicht.')
+            error_message = _("Dit veld is verplicht.")
         if cleaned_data.get(f1) is None:
             is_required = True
-            self.add_error(f1, forms.ValidationError(error_message, code='required'))
+            self.add_error(f1, forms.ValidationError(error_message, code="required"))
         return is_required
 
-    def check_dependency(self, cleaned_data, f1, f2, f1_value=True, error_message=''):
+    def check_dependency(self, cleaned_data, f1, f2, f1_value=True, error_message=""):
         is_required = False
         if not error_message:
-            error_message = _('Dit veld is verplicht.')
+            error_message = _("Dit veld is verplicht.")
         if cleaned_data.get(f1) == f1_value and is_empty(cleaned_data.get(f2)):
             is_required = True
-            self.add_error(f2, forms.ValidationError(error_message, code='required'))
+            self.add_error(f2, forms.ValidationError(error_message, code="required"))
         return is_required
 
-    def check_dependency_list(self, cleaned_data, f1, f2, f1_value_list, error_message=''):
+    def check_dependency_list(
+        self, cleaned_data, f1, f2, f1_value_list, error_message=""
+    ):
         is_required = False
         if not error_message:
-            error_message = _('Dit veld is verplicht.')
+            error_message = _("Dit veld is verplicht.")
         if cleaned_data.get(f1) in f1_value_list and is_empty(cleaned_data.get(f2)):
             is_required = True
-            self.add_error(f2, forms.ValidationError(error_message, code='required'))
+            self.add_error(f2, forms.ValidationError(error_message, code="required"))
         return is_required
 
-    def check_dependency_singular(self, cleaned_data, f1, f1_field, f2, error_message=''):
+    def check_dependency_singular(
+        self, cleaned_data, f1, f1_field, f2, error_message=""
+    ):
         is_required = False
         if not error_message:
-            error_message = _('Dit veld is verplicht.')
+            error_message = _("Dit veld is verplicht.")
         if cleaned_data.get(f1):
-            if getattr(cleaned_data.get(f1), f1_field) and is_empty(cleaned_data.get(f2)):
+            if getattr(cleaned_data.get(f1), f1_field) and is_empty(
+                cleaned_data.get(f2)
+            ):
                 is_required = True
-                self.add_error(f2, forms.ValidationError(error_message, code='required'))
+                self.add_error(
+                    f2, forms.ValidationError(error_message, code="required")
+                )
         return is_required
 
-    def check_dependency_multiple(self, cleaned_data, f1, f1_field, f2, error_message=''):
+    def check_dependency_multiple(
+        self, cleaned_data, f1, f1_field, f2, error_message=""
+    ):
         is_required = False
         if not error_message:
-            error_message = _('Dit veld is verplicht.')
+            error_message = _("Dit veld is verplicht.")
         if cleaned_data.get(f1):
             for item in cleaned_data.get(f1):
                 if getattr(item, f1_field) and is_empty(cleaned_data.get(f2)):
                     is_required = True
-                    self.add_error(f2, forms.ValidationError(error_message, code='required'))
+                    self.add_error(
+                        f2, forms.ValidationError(error_message, code="required")
+                    )
                     break
         return is_required
diff --git a/main/forms/mixins.py b/main/forms/mixins.py
index d7925ca29..7c5575e15 100644
--- a/main/forms/mixins.py
+++ b/main/forms/mixins.py
@@ -10,6 +10,7 @@ class SoftValidationMixin:
     This mixin will allow a form to submit even if specified fields have
     validator errors.
     """
+
     _soft_validation_fields = []
 
     def __init__(self, *args, **kwargs):
@@ -17,7 +18,7 @@ def __init__(self, *args, **kwargs):
 
         # If we have an existing instance and we're not POSTing,
         # run a initial clean
-        if self.instance.pk and 'data' not in kwargs:
+        if self.instance.pk and "data" not in kwargs:
             self.initial_clean()
 
     def initial_clean(self):
@@ -27,7 +28,7 @@ def initial_clean(self):
         self._errors = ErrorDict()
 
         reset_cleaned = False
-        if not hasattr(self, 'cleaned_data'):
+        if not hasattr(self, "cleaned_data"):
             reset_cleaned = True
             self.cleaned_data = {}
 
@@ -50,8 +51,8 @@ def _initial_clean_fields(self):
                     val = field.clean(value, value)
                 else:
                     val = field.clean(value)
-                if hasattr(self, 'clean_%s' % field):
-                    val = getattr(self, 'clean_%s' % field)()
+                if hasattr(self, "clean_%s" % field):
+                    val = getattr(self, "clean_%s" % field)()
 
                 self.cleaned_data[field_name] = val
             except ValidationError as e:
@@ -73,14 +74,11 @@ def mark_soft_required(self, data, *fields):
         for field in fields:
             if field not in self.fields:
                 raise ImproperlyConfigured(
-                    "{} is not a field of {}!".format(
-                        field,
-                        self.__class__.__name__
-                    )
+                    "{} is not a field of {}!".format(field, self.__class__.__name__)
                 )
 
             if field not in data or not data[field]:
-                self.add_error(field, _('Dit veld is verplicht.'))
+                self.add_error(field, _("Dit veld is verplicht."))
 
     def _initial_post_clean(self):
         opts = self._meta
@@ -99,7 +97,9 @@ def _initial_post_clean(self):
                 exclude.append(name)
 
         try:
-            self.instance = construct_instance(self, self.instance, opts.fields, opts.exclude)
+            self.instance = construct_instance(
+                self, self.instance, opts.fields, opts.exclude
+            )
         except ValidationError as e:
             self._update_errors(e)
 
@@ -113,8 +113,11 @@ def _initial_post_clean(self):
 
     @property
     def _hard_errors(self):
-        return [x for x in self.errors.items() if x[0] not in
-                self.get_soft_validation_fields()]
+        return [
+            x
+            for x in self.errors.items()
+            if x[0] not in self.get_soft_validation_fields()
+        ]
 
     def get_soft_validation_fields(self):
         return self._soft_validation_fields
@@ -129,9 +132,10 @@ def save(self, commit=True):
         """
         if self._hard_errors:
             raise ValueError(
-                "The %s could not be %s because the data didn't validate." % (
+                "The %s could not be %s because the data didn't validate."
+                % (
                     self.instance._meta.object_name,
-                    'created' if self.instance._state.adding else 'changed',
+                    "created" if self.instance._state.adding else "changed",
                 )
             )
         if commit:
diff --git a/main/management/commands/add_ldap_users.py b/main/management/commands/add_ldap_users.py
index 6d08b0889..9de261c6e 100644
--- a/main/management/commands/add_ldap_users.py
+++ b/main/management/commands/add_ldap_users.py
@@ -3,13 +3,13 @@
 
 
 class Command(BaseCommand):
-    help = 'Adds users from the LDAP backend'
+    help = "Adds users from the LDAP backend"
 
     def add_arguments(self, parser):
-        parser.add_argument('usernames', nargs='+', type=str)
+        parser.add_argument("usernames", nargs="+", type=str)
 
     def handle(self, *args, **options):
-        for username in options['usernames']:
+        for username in options["usernames"]:
             user = LDAPBackend().populate_user(username)
             if user is None:
-                raise CommandError('No user named {}'.format(username))
+                raise CommandError("No user named {}".format(username))
diff --git a/main/management/commands/load_fixtures.py b/main/management/commands/load_fixtures.py
index 9fc488a44..47a091100 100644
--- a/main/management/commands/load_fixtures.py
+++ b/main/management/commands/load_fixtures.py
@@ -4,15 +4,14 @@
 
 import os
 
+
 def list_fixtures_in_dir(rel_path):
     files = os.listdir(rel_path)
 
     def is_fixture(fn):
         return fn.lower()[-5:] == ".json"
 
-    return [
-        os.path.join(rel_path, fn) for fn in files if is_fixture(fn)
-    ]
+    return [os.path.join(rel_path, fn) for fn in files if is_fixture(fn)]
 
 
 fixture_dirs = {
diff --git a/main/management/commands/rename_app.py b/main/management/commands/rename_app.py
index ffbe5870e..c35177e47 100644
--- a/main/management/commands/rename_app.py
+++ b/main/management/commands/rename_app.py
@@ -14,13 +14,11 @@
 
 
 class Command(BaseCommand):
-    help = (
-        'Renames a Django Application. Usage rename_app [old_name] [new_name]'
-    )
+    help = "Renames a Django Application. Usage rename_app [old_name] [new_name]"
 
     def add_arguments(self, parser):
-        parser.add_argument('old_name', nargs=1, type=str)
-        parser.add_argument('new_name', nargs=1, type=str)
+        parser.add_argument("old_name", nargs=1, type=str)
+        parser.add_argument("new_name", nargs=1, type=str)
 
     def handle(self, old_name, new_name, *args, **options):
         with connection.cursor() as cursor:
@@ -28,14 +26,13 @@ def handle(self, old_name, new_name, *args, **options):
             new_name = new_name[0]
 
             cursor.execute(
-                "SELECT * FROM django_content_type "
-                f"where app_label='{new_name}'"
+                "SELECT * FROM django_content_type " f"where app_label='{new_name}'"
             )
             has_already_been_ran = cursor.fetchone()
             if has_already_been_ran:
                 logger.info(
-                    'Rename has already been done, exiting without '
-                    'making any changes'
+                    "Rename has already been done, exiting without "
+                    "making any changes"
                 )
                 return None
 
@@ -57,6 +54,4 @@ def handle(self, old_name, new_name, *args, **options):
                 try:
                     cursor.execute(query)
                 except ProgrammingError:
-                    logger.warning(
-                        'Rename query failed: "%s"', query, exc_info=True
-                    )
+                    logger.warning('Rename query failed: "%s"', query, exc_info=True)
diff --git a/main/menus.py b/main/menus.py
index a0bda8acc..ebf35c80c 100644
--- a/main/menus.py
+++ b/main/menus.py
@@ -3,17 +3,16 @@
 from django.conf import settings
 from menu import Menu, MenuItem
 
-Menu.add_item("home", MenuItem(_('Startpagina'),
-                               reverse('main:home'),
-                               exact_url=True
-                               ))
+Menu.add_item("home", MenuItem(_("Startpagina"), reverse("main:home"), exact_url=True))
 
-Menu.add_item("footer", MenuItem(_('Log in'),
-                                 settings.LOGIN_URL,
-                                 check=lambda x: not x.user.is_authenticated
-                                 ))
+Menu.add_item(
+    "footer",
+    MenuItem(
+        _("Log in"), settings.LOGIN_URL, check=lambda x: not x.user.is_authenticated
+    ),
+)
 
-Menu.add_item("footer", MenuItem(_('Log uit'),
-                                 reverse('logout'),
-                                 check=lambda x: x.user.is_authenticated
-                                 ))
\ No newline at end of file
+Menu.add_item(
+    "footer",
+    MenuItem(_("Log uit"), reverse("logout"), check=lambda x: x.user.is_authenticated),
+)
diff --git a/main/migrations/0001_initial.py b/main/migrations/0001_initial.py
index fa4cb736b..62d6689c8 100644
--- a/main/migrations/0001_initial.py
+++ b/main/migrations/0001_initial.py
@@ -5,23 +5,29 @@
 
 
 class Migration(migrations.Migration):
-
-    dependencies = [
-    ]
+    dependencies = []
 
     operations = [
         migrations.CreateModel(
-            name='Setting',
+            name="Setting",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('needs_supervision', models.BooleanField(default=False)),
-                ('requires_review', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("needs_supervision", models.BooleanField(default=False)),
+                ("requires_review", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
     ]
diff --git a/main/migrations/0002_auto_20161013_1959.py b/main/migrations/0002_auto_20161013_1959.py
index bc1e7259a..dd9ece7fd 100644
--- a/main/migrations/0002_auto_20161013_1959.py
+++ b/main/migrations/0002_auto_20161013_1959.py
@@ -5,20 +5,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0001_initial'),
+        ("main", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='setting',
-            name='description_en',
+            model_name="setting",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='setting',
-            name='description_nl',
+            model_name="setting",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/main/migrations/0003_auto_20170601_0816.py b/main/migrations/0003_auto_20170601_0816.py
index 35ebf5f29..a38ba3f27 100644
--- a/main/migrations/0003_auto_20170601_0816.py
+++ b/main/migrations/0003_auto_20170601_0816.py
@@ -5,19 +5,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0002_auto_20161013_1959'),
+        ("main", "0002_auto_20161013_1959"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='setting',
-            options={'ordering': ['order'], 'verbose_name': 'Setting'},
+            name="setting",
+            options={"ordering": ["order"], "verbose_name": "Setting"},
         ),
         migrations.AddField(
-            model_name='setting',
-            name='is_local',
+            model_name="setting",
+            name="is_local",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/main/migrations/0004_setting_is_school.py b/main/migrations/0004_setting_is_school.py
index b79465b91..f4d8e4a6f 100644
--- a/main/migrations/0004_setting_is_school.py
+++ b/main/migrations/0004_setting_is_school.py
@@ -6,15 +6,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0003_auto_20170601_0816'),
+        ("main", "0003_auto_20170601_0816"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='setting',
-            name='is_school',
+            model_name="setting",
+            name="is_school",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/main/migrations/0005_auto_20180829_1540.py b/main/migrations/0005_auto_20180829_1540.py
index c0e187dfb..cbb55706b 100644
--- a/main/migrations/0005_auto_20180829_1540.py
+++ b/main/migrations/0005_auto_20180829_1540.py
@@ -6,15 +6,16 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0004_setting_is_school'),
+        ("main", "0004_setting_is_school"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='setting',
-            name='is_school',
-            field=models.BooleanField(default=False, verbose_name='Needs external permission'),
+            model_name="setting",
+            name="is_school",
+            field=models.BooleanField(
+                default=False, verbose_name="Needs external permission"
+            ),
         ),
     ]
diff --git a/main/migrations/0006_systemmessage.py b/main/migrations/0006_systemmessage.py
index 9eba70356..6777ca43c 100644
--- a/main/migrations/0006_systemmessage.py
+++ b/main/migrations/0006_systemmessage.py
@@ -4,20 +4,32 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0005_auto_20180829_1540'),
+        ("main", "0005_auto_20180829_1540"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='SystemMessage',
+            name="SystemMessage",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('message', models.CharField(max_length=200)),
-                ('level', models.IntegerField(choices=[(1, 'Urgent'), (2, 'Attention'), (3, 'Info')])),
-                ('not_before', models.DateTimeField()),
-                ('not_after', models.DateTimeField()),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("message", models.CharField(max_length=200)),
+                (
+                    "level",
+                    models.IntegerField(
+                        choices=[(1, "Urgent"), (2, "Attention"), (3, "Info")]
+                    ),
+                ),
+                ("not_before", models.DateTimeField()),
+                ("not_after", models.DateTimeField()),
             ],
         ),
     ]
diff --git a/main/migrations/0007_auto_20210528_1331.py b/main/migrations/0007_auto_20210528_1331.py
index 69c1c3102..858aab1df 100644
--- a/main/migrations/0007_auto_20210528_1331.py
+++ b/main/migrations/0007_auto_20210528_1331.py
@@ -4,20 +4,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0006_systemmessage'),
+        ("main", "0006_systemmessage"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='systemmessage',
-            name='message_en',
+            model_name="systemmessage",
+            name="message_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='systemmessage',
-            name='message_nl',
+            model_name="systemmessage",
+            name="message_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/main/migrations/0008_auto_20220926_0929.py b/main/migrations/0008_auto_20220926_0929.py
index acb7cfe83..aa5f7bd65 100644
--- a/main/migrations/0008_auto_20220926_0929.py
+++ b/main/migrations/0008_auto_20220926_0929.py
@@ -4,25 +4,24 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0007_auto_20210528_1331'),
+        ("main", "0007_auto_20210528_1331"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='systemmessage',
-            name='message',
+            model_name="systemmessage",
+            name="message",
             field=models.TextField(),
         ),
         migrations.AlterField(
-            model_name='systemmessage',
-            name='message_en',
+            model_name="systemmessage",
+            name="message_en",
             field=models.TextField(null=True),
         ),
         migrations.AlterField(
-            model_name='systemmessage',
-            name='message_nl',
+            model_name="systemmessage",
+            name="message_nl",
             field=models.TextField(null=True),
         ),
     ]
diff --git a/main/migrations/0009_faculty_samluserproxy.py b/main/migrations/0009_faculty_samluserproxy.py
index 5b931532c..e6a1ba5a6 100644
--- a/main/migrations/0009_faculty_samluserproxy.py
+++ b/main/migrations/0009_faculty_samluserproxy.py
@@ -6,37 +6,48 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('auth', '0012_alter_user_first_name_max_length'),
+        ("auth", "0012_alter_user_first_name_max_length"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('main', '0008_auto_20220926_0929'),
+        ("main", "0008_auto_20220926_0929"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='SamlUserProxy',
-            fields=[
-            ],
+            name="SamlUserProxy",
+            fields=[],
             options={
-                'proxy': True,
-                'indexes': [],
-                'constraints': [],
+                "proxy": True,
+                "indexes": [],
+                "constraints": [],
             },
-            bases=('auth.user',),
+            bases=("auth.user",),
             managers=[
-                ('objects', django.contrib.auth.models.UserManager()),
+                ("objects", django.contrib.auth.models.UserManager()),
             ],
         ),
         migrations.CreateModel(
-            name='Faculty',
+            name="Faculty",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('name', models.CharField(max_length=255)),
-                ('name_nl', models.CharField(max_length=255, null=True)),
-                ('name_en', models.CharField(max_length=255, null=True)),
-                ('saml_name', models.CharField(max_length=255)),
-                ('users', models.ManyToManyField(related_name='faculties', to=settings.AUTH_USER_MODEL)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("name", models.CharField(max_length=255)),
+                ("name_nl", models.CharField(max_length=255, null=True)),
+                ("name_en", models.CharField(max_length=255, null=True)),
+                ("saml_name", models.CharField(max_length=255)),
+                (
+                    "users",
+                    models.ManyToManyField(
+                        related_name="faculties", to=settings.AUTH_USER_MODEL
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/main/migrations/0010_faculty_internal_name.py b/main/migrations/0010_faculty_internal_name.py
index 868019fef..44a541b32 100644
--- a/main/migrations/0010_faculty_internal_name.py
+++ b/main/migrations/0010_faculty_internal_name.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('main', '0009_faculty_samluserproxy'),
+        ("main", "0009_faculty_samluserproxy"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='faculty',
-            name='internal_name',
-            field=models.CharField(choices=[('humanities', 'Humanities'), ('other', 'Other')], default='other', max_length=50),
+            model_name="faculty",
+            name="internal_name",
+            field=models.CharField(
+                choices=[("humanities", "Humanities"), ("other", "Other")],
+                default="other",
+                max_length=50,
+            ),
         ),
     ]
diff --git a/main/models.py b/main/models.py
index 109fdcc38..bf94d82b0 100644
--- a/main/models.py
+++ b/main/models.py
@@ -5,12 +5,12 @@
 
 
 class YesNoDoubt(models.TextChoices):
-    YES = 'Y', _('ja')
-    NO = 'N', _('nee')
-    DOUBT = '?', _('twijfel')
+    YES = "Y", _("ja")
+    NO = "N", _("nee")
+    DOUBT = "?", _("twijfel")
 
-class SystemMessage(models.Model):
 
+class SystemMessage(models.Model):
     class Levels(models.IntegerChoices):
         # Not translated, as it's backend only
         URGENT = 1, "Urgent"
@@ -25,13 +25,13 @@ class Levels(models.IntegerChoices):
     @property
     def css_class(self):
         if self.level == self.Levels.URGENT:
-            return 'failed'
+            return "failed"
         if self.level == self.Levels.ATTENTION:
-            return 'warning'
+            return "warning"
         if self.level == self.Levels.INFO:
-            return 'info'
+            return "info"
 
-        return ''
+        return ""
 
 
 class Setting(models.Model):
@@ -46,8 +46,8 @@ class Setting(models.Model):
     is_school = models.BooleanField("Needs external permission", default=False)
 
     class Meta:
-        ordering = ['order']
-        verbose_name = _('Setting')
+        ordering = ["order"]
+        verbose_name = _("Setting")
 
     def __str__(self):
         return self.description
@@ -56,29 +56,33 @@ def __str__(self):
 class SettingModel(models.Model):
     setting = models.ManyToManyField(
         Setting,
-        verbose_name=_('Geef aan waar de dataverzameling plaatsvindt'),
-        blank=True, # TODO: mark this as soft required in ALL forms
+        verbose_name=_("Geef aan waar de dataverzameling plaatsvindt"),
+        blank=True,  # TODO: mark this as soft required in ALL forms
     )
     setting_details = models.CharField(
-        _('Namelijk'),
+        _("Namelijk"),
         max_length=200,
         blank=True,
     )
     supervision = models.BooleanField(
-        _('Vindt het afnemen van de taak plaats onder het toeziend oog \
-van de leraar of een ander persoon die bevoegd is?'),
+        _(
+            "Vindt het afnemen van de taak plaats onder het toeziend oog \
+van de leraar of een ander persoon die bevoegd is?"
+        ),
         null=True,
         blank=True,
     )
     leader_has_coc = models.BooleanField(
-        _('Is de testleider in het bezit van een VOG?'),
-        help_text=_('Iedereen die op een school werkt moet in het bezit \
+        _("Is de testleider in het bezit van een VOG?"),
+        help_text=_(
+            'Iedereen die op een school werkt moet in het bezit \
         zijn van een Verklaring Omtrent Gedrag (VOG, zie \
         <a href="https://www.justis.nl/producten/vog/" \
         target="_blank">https://www.justis.nl/producten/vog/</a>). \
         Het is de verantwoordelijkheid van de school om hierom te vragen. \
         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers \
-        waarschuwen dat de school om een VOG kan vragen.'),
+        waarschuwen dat de school om een VOG kan vragen.'
+        ),
         null=True,
         blank=True,
     )
@@ -88,7 +92,7 @@ class Meta:
 
     def settings_contains_schools(self):
         """If the current settings contains any that are marked as schools."""
-        return self.setting.filter(is_school=True).exists();
+        return self.setting.filter(is_school=True).exists()
 
     def settings_requires_review(self):
         """If the current settings contain any that requires review"""
@@ -108,10 +112,7 @@ class InternalNames(models.TextChoices):
         max_length=255,
     )
 
-    users = models.ManyToManyField(
-        get_user_model(),
-        related_name='faculties'
-    )
+    users = models.ManyToManyField(get_user_model(), related_name="faculties")
 
     internal_name = models.CharField(
         max_length=50,
@@ -128,6 +129,7 @@ class SamlUserProxy(User):
     It's not a replacement User model. It may be used elsewhere in code, but
     why would you?
     """
+
     class Meta:
         proxy = True
 
diff --git a/main/serializers.py b/main/serializers.py
index 83b3132c2..6b31fac13 100644
--- a/main/serializers.py
+++ b/main/serializers.py
@@ -5,6 +5,6 @@
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ['pk', 'fullname', 'first_name', 'last_name', 'email']
+        fields = ["pk", "fullname", "first_name", "last_name", "email"]
 
-    fullname = serializers.CharField(source='get_full_name')
+    fullname = serializers.CharField(source="get_full_name")
diff --git a/main/templatetags/compare_tags.py b/main/templatetags/compare_tags.py
index 4dc9fadfa..2b8eef841 100644
--- a/main/templatetags/compare_tags.py
+++ b/main/templatetags/compare_tags.py
@@ -10,8 +10,7 @@
 
 
 class CompareLinkNode(template.Node):
-
-    def __init__(self, type, obj, attribute=''):
+    def __init__(self, type, obj, attribute=""):
         self.type = type
         self.obj = template.Variable(obj)
         self.attribute = attribute
@@ -22,19 +21,11 @@ def _get_documents_url(self, obj, proposal: Proposal):
                 order=obj.study.order,
             )  # type: Study
 
-            args = [
-                parent_study.documents.pk,
-                obj.pk,
-                self.attribute
-            ]
+            args = [parent_study.documents.pk, obj.pk, self.attribute]
 
         else:
-            old_set = proposal.parent.documents_set.filter(
-                study=None
-            )
-            new_set = proposal.documents_set.filter(
-                study=None
-            )
+            old_set = proposal.parent.documents_set.filter(study=None)
+            new_set = proposal.documents_set.filter(study=None)
             new_index = -1
             for i, el in enumerate(new_set):
                 if el.pk == obj.pk:
@@ -45,13 +36,9 @@ def _get_documents_url(self, obj, proposal: Proposal):
             except (IndexError, AttributeError):
                 return None
 
-            args = [
-                old_obj,
-                obj.pk,
-                self.attribute
-            ]
+            args = [old_obj, obj.pk, self.attribute]
 
-        return reverse('proposals:compare_documents', args=args)
+        return reverse("proposals:compare_documents", args=args)
 
     def _get_observation_url(self, obj, proposal):
         order = obj.study.order
@@ -61,37 +48,33 @@ def _get_observation_url(self, obj, proposal):
             return None
 
         if old_study.has_observation:
-            if not obj.approval_document or not \
-                    old_study.observation.approval_document:
+            if not obj.approval_document or not old_study.observation.approval_document:
                 return None
 
-            args = [
-                old_study.observation.pk,
-                obj.pk
-            ]
+            args = [old_study.observation.pk, obj.pk]
 
-            return reverse('proposals:compare_observation_approval', args=args)
+            return reverse("proposals:compare_observation_approval", args=args)
 
         return None
 
     def render(self, context):
-        "This function gets called when the template gets rendered"        
-        
+        "This function gets called when the template gets rendered"
+
         title = _("Toon verschillen")
-        img = get_static_file('proposals/images/arrow_divide.png')
+        img = get_static_file("proposals/images/arrow_divide.png")
         obj = self.obj.resolve(context)
 
         # Documents associated with a study
         # or extra Documents objects
-        if self.type == 'documents':
+        if self.type == "documents":
             proposal = obj.proposal
             if not proposal.parent:
                 return ""
 
             url = self._get_documents_url(obj, proposal)
-            
+
         # Observations, possibly unused
-        elif self.type == 'observation':
+        elif self.type == "observation":
             proposal = obj.study.proposal
             if not proposal.parent:
                 return ""
@@ -99,7 +82,7 @@ def render(self, context):
             url = self._get_observation_url(obj, proposal)
 
         # General proposal docs
-        elif self.type == 'proposal':
+        elif self.type == "proposal":
             if not obj.parent:
                 return ""
 
@@ -109,10 +92,10 @@ def render(self, context):
                 self.attribute,
             ]
 
-            url = reverse('proposals:compare_proposal_docs', args=args)
-            
+            url = reverse("proposals:compare_proposal_docs", args=args)
+
         # METC Decision files
-        elif self.type == 'wmo':
+        elif self.type == "wmo":
             if not obj.proposal.parent or not obj.proposal.parent.wmo:
                 return ""
 
@@ -121,19 +104,21 @@ def render(self, context):
                 obj.pk,
             ]
 
-            url = reverse('proposals:compare_wmo_decision', args=args)
+            url = reverse("proposals:compare_wmo_decision", args=args)
         else:
             return ""
 
         if url is None:
             return ""
 
-        return '<a href="{url}" target="_blank" class="icon-link">' \
-               '<img src="{img}" title="{title}">' \
-               '</a>'.format(
-            url=url,
-            img=img,
-            title=title,
+        return (
+            '<a href="{url}" target="_blank" class="icon-link">'
+            '<img src="{img}" title="{title}">'
+            "</a>".format(
+                url=url,
+                img=img,
+                title=title,
+            )
         )
 
 
@@ -141,7 +126,7 @@ def render(self, context):
 def get_compare_link(parser, token):
     """This function splits up the arguments given inside the tag
     and passes them on to the CompareLinkNode class"""
-    
+
     parts = token.split_contents()
 
     if not (3 <= len(parts) < 5):
@@ -151,11 +136,11 @@ def get_compare_link(parser, token):
         )
 
     args = {
-        'type': parts[1],
-        'obj': parts[2],
+        "type": parts[1],
+        "obj": parts[2],
     }
 
     if len(parts) == 4:
-        args['attribute'] = parts[3]
+        args["attribute"] = parts[3]
 
     return CompareLinkNode(**args)
diff --git a/main/templatetags/fetc_filters.py b/main/templatetags/fetc_filters.py
index ae77631d5..9129012de 100644
--- a/main/templatetags/fetc_filters.py
+++ b/main/templatetags/fetc_filters.py
@@ -10,8 +10,11 @@ def in_linguistics_chamber(current_user):
     """
     Check whether the current user is in the 'ETCL' or 'Secretaris' group
     """
-    return Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER) in current_user.groups.all() or \
-           Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    return (
+        Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
+        in current_user.groups.all()
+        or Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    )
 
 
 @register.filter
@@ -19,8 +22,11 @@ def in_general_chamber(current_user):
     """
     Check whether the current user is in the 'FETC' or 'Secretaris' group
     """
-    return Group.objects.get(name=settings.GROUP_GENERAL_CHAMBER) in current_user.groups.all() or \
-           Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    return (
+        Group.objects.get(name=settings.GROUP_GENERAL_CHAMBER)
+        in current_user.groups.all()
+        or Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    )
 
 
 @register.filter
@@ -30,6 +36,7 @@ def is_secretary(current_user):
     """
     return Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
 
+
 @register.filter
 def is_chair_or_secretary(current_user):
     """
diff --git a/main/tests.py b/main/tests.py
index ead194952..acca230a0 100644
--- a/main/tests.py
+++ b/main/tests.py
@@ -8,7 +8,7 @@
 from .validators import MaxWordsValidator
 
 
-class BaseViewTestCase():
+class BaseViewTestCase:
     """
     Inherit from this class to test the functioning of
     class-based views.
@@ -76,13 +76,13 @@ class Mock(models.Model):
             test = models.TextField(validators=[MaxWordsValidator(5)])
 
         try:
-            m = Mock(test='Dit is een test')
+            m = Mock(test="Dit is een test")
             m.full_clean()
         except ValidationError:
             self.fail()
 
         with self.assertRaises(ValidationError):
-            m = Mock(test='Dit is een test die faalt')
+            m = Mock(test="Dit is een test die faalt")
             m.full_clean()
 
 
@@ -94,8 +94,8 @@ def test_is_empty(self):
 
         self.assertTrue(is_empty([]))
         self.assertTrue(is_empty(Setting.objects.none()))
-        self.assertFalse(is_empty(['']))
+        self.assertFalse(is_empty([""]))
 
-        self.assertTrue(is_empty(u''))
-        self.assertTrue(is_empty(u'  '))
-        self.assertFalse(is_empty(u' test '))
+        self.assertTrue(is_empty(""))
+        self.assertTrue(is_empty("  "))
+        self.assertFalse(is_empty(" test "))
diff --git a/main/translation.py b/main/translation.py
index 12b368e84..ac55fa97f 100644
--- a/main/translation.py
+++ b/main/translation.py
@@ -5,14 +5,14 @@
 
 @register(Setting)
 class SettingTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(SystemMessage)
 class SystemMessageTranslationOptions(TranslationOptions):
-    fields = ('message',)
+    fields = ("message",)
 
 
 @register(Faculty)
 class FacultyTranslationOptions(TranslationOptions):
-    fields = ('name',)
+    fields = ("name",)
diff --git a/main/urls.py b/main/urls.py
index d6e50ca36..b6096086a 100644
--- a/main/urls.py
+++ b/main/urls.py
@@ -1,21 +1,17 @@
 from django.urls import path
 
-from .views import HomeView, LandingView, check_requires, UserSearchView, \
-    UserDetailView
+from .views import HomeView, LandingView, check_requires, UserSearchView, UserDetailView
 
-app_name = 'main'
+app_name = "main"
 
 urlpatterns = [
     # Home
-    path('', HomeView.as_view(), name='home'),
-    path('landing/', LandingView.as_view(), name='landing'),
-
+    path("", HomeView.as_view(), name="home"),
+    path("landing/", LandingView.as_view(), name="landing"),
     # User detail page
-    path('user/<int:pk>/', UserDetailView.as_view(), name='user_detail'),
-
+    path("user/<int:pk>/", UserDetailView.as_view(), name="user_detail"),
     # User search
-    path('user_search/', UserSearchView.as_view(), name='user_search'),
-
+    path("user_search/", UserSearchView.as_view(), name="user_search"),
     # Checks on conditional fields
-    path('check_requires/', check_requires, name='check_requires'),
+    path("check_requires/", check_requires, name="check_requires"),
 ]
diff --git a/main/utils.py b/main/utils.py
index e1d79de76..ba6135180 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -12,7 +12,7 @@
 
 from main.models import Faculty
 
-YES_NO = [(True, _('ja')), (False, _('nee'))]
+YES_NO = [(True, _("ja")), (False, _("nee"))]
 
 
 class AvailableURL(object):
@@ -31,52 +31,58 @@ def get_secretary():
     """
     Returns the Head secretary. We limit this to one user.
     """
-    obj = get_user_model().objects.filter(groups__name=settings.GROUP_PRIMARY_SECRETARY).first()
+    obj = (
+        get_user_model()
+        .objects.filter(groups__name=settings.GROUP_PRIMARY_SECRETARY)
+        .first()
+    )
     obj.email = settings.EMAIL_FROM
     return obj
 
+
 def get_all_secretaries():
     """
     Return all users in the 'Secretary' group.
     """
     return get_user_model().objects.filter(groups__name=settings.GROUP_SECRETARY).all()
 
+
 def is_secretary(user):
     """
     Check whether the current user is in the 'Secretary' group.
     """
     return Group.objects.get(name=settings.GROUP_SECRETARY) in user.groups.all()
 
+
 def get_reviewers():
     return get_user_model().objects.filter(
-        Q(groups__name=settings.GROUP_GENERAL_CHAMBER) |
-        Q(groups__name=settings.GROUP_LINGUISTICS_CHAMBER)
+        Q(groups__name=settings.GROUP_GENERAL_CHAMBER)
+        | Q(groups__name=settings.GROUP_LINGUISTICS_CHAMBER)
     )
 
 
 def get_reviewers_from_group(group):
-    return get_user_model().objects.filter(
-        groups__name=group
-    )
+    return get_user_model().objects.filter(groups__name=group)
 
 
 def get_reviewers_from_groups(groups):
-    return get_user_model().objects.filter(
-        groups__name__in=groups
-    ).distinct()
+    return get_user_model().objects.filter(groups__name__in=groups).distinct()
 
 
 def string_to_bool(s):
-    if s == 'None' or s is None:
+    if s == "None" or s is None:
         return False
-    return s not in ['False', 'false', '0', 0]
+    return s not in ["False", "false", "0", 0]
 
 
 def get_users_as_list(users):
     """
     Retrieves all Users as a list.
     """
-    return [(user.pk, u'{}: {}'.format(user.username, user.get_full_name())) for user in users]
+    return [
+        (user.pk, "{}: {}".format(user.username, user.get_full_name()))
+        for user in users
+    ]
 
 
 def is_empty(value):
@@ -87,7 +93,7 @@ def is_empty(value):
     result = False
     if value is None:
         result = True
-    if hasattr(value, '__len__') and len(value) == 0:
+    if hasattr(value, "__len__") and len(value) == 0:
         result = True
     if isinstance(value, str) and not value.strip():
         result = True
@@ -102,51 +108,23 @@ def get_document_contents(file: FieldFile) -> str:
     if file is None:
         return ""
 
-    mime = magic.from_buffer(file.open(mode='rb').read(2048), mime=True)
-
-    if mime == 'application/pdf':
-        with file.open(mode="rb") as f:
-            pdf = pdftotext.PDF(f)
-            return "\n\n".join(pdf)
-
-    if mime == 'application/octet-stream':
-        # This _might_ not be a DocX, but as we only allow PDF and DocX we
-        # know it should be fine
-        with file.open(mode="rb") as f:
-            return docx2txt.process(f)
-
-    if mime == 'application/vnd.openxmlformats-officedocument' \
-               '.wordprocessingml.document':
-        with file.open(mode="rb") as f:
-            return docx2txt.process(f)
-
-    return "No text found"
-
-
-def get_static_file(file):
-    return staticfiles_storage.url(file)
-
-
-def get_document_contents(file: FieldFile) -> str:
-    if file is None:
-        return ""
-
-    mime = magic.from_buffer(file.open(mode='rb').read(2048), mime=True)
+    mime = magic.from_buffer(file.open(mode="rb").read(2048), mime=True)
 
-    if mime == 'application/pdf':
+    if mime == "application/pdf":
         with file.open(mode="rb") as f:
             pdf = pdftotext.PDF(f)
             return "\n\n".join(pdf)
 
-    if mime == 'application/octet-stream':
+    if mime == "application/octet-stream":
         # This _might_ not be a DocX, but as we only allow PDF and DocX we
         # know it should be fine
         with file.open(mode="rb") as f:
             return docx2txt.process(f)
 
-    if mime == 'application/vnd.openxmlformats-officedocument' \
-               '.wordprocessingml.document' or \
-       mime == 'application/msword':
+    if (
+        mime == "application/vnd.openxmlformats-officedocument"
+        ".wordprocessingml.document"
+    ):
         with file.open(mode="rb") as f:
             return docx2txt.process(f)
 
diff --git a/main/validators.py b/main/validators.py
index c4caf2283..fbaf07f31 100644
--- a/main/validators.py
+++ b/main/validators.py
@@ -3,21 +3,27 @@
 from django.core.validators import BaseValidator
 from django.utils.translation import ugettext_lazy, ungettext_lazy
 
-ALLOWED_CONTENT_TYPES = ['application/pdf', 'application/msword',
-                         'application/vnd.openxmlformats-officedocument.wordprocessingml.document']
+ALLOWED_CONTENT_TYPES = [
+    "application/pdf",
+    "application/msword",
+    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+]
 
 
 class MaxWordsValidator(BaseValidator):
     compare = lambda self, a, b: a > b
     clean = lambda self, x: len(x.split())
     message = ungettext_lazy(
-        'Dit veld mag maximaal %(limit_value)d woord bevatten.',
-        'Dit veld mag maximaal %(limit_value)d woorden bevatten.',
-        'limit_value')
-    code = 'max_words'
+        "Dit veld mag maximaal %(limit_value)d woord bevatten.",
+        "Dit veld mag maximaal %(limit_value)d woorden bevatten.",
+        "limit_value",
+    )
+    code = "max_words"
 
 
 def validate_pdf_or_doc(value):
     f = value.file
     if isinstance(f, UploadedFile) and f.content_type not in ALLOWED_CONTENT_TYPES:
-        raise ValidationError(ugettext_lazy('Alleen .pdf- of .doc(x)-bestanden zijn toegestaan.'))
+        raise ValidationError(
+            ugettext_lazy("Alleen .pdf- of .doc(x)-bestanden zijn toegestaan.")
+        )
diff --git a/main/views.py b/main/views.py
index b37d99a1e..20fe39a7e 100644
--- a/main/views.py
+++ b/main/views.py
@@ -14,8 +14,13 @@
 from django.core.exceptions import ImproperlyConfigured, PermissionDenied
 from django.db.models import Q
 from django.forms import modelformset_factory
-from django.http import HttpResponseRedirect, JsonResponse, FileResponse, \
-    Http404, QueryDict
+from django.http import (
+    HttpResponseRedirect,
+    JsonResponse,
+    FileResponse,
+    Http404,
+    QueryDict,
+)
 from django.shortcuts import render
 from django.urls import reverse
 from django.utils import timezone
@@ -35,8 +40,9 @@
 try:
     # This will trigger an exception if LDAP is not configured
     from fetc.ldap_settings import *
+
     LDAP_CONFIGURED = True
-except (ImportError):
+except ImportError:
     LDAP_CONFIGURED = False
 
 
@@ -48,46 +54,41 @@ class _SystemMessageView(generic.ListView):
 
     def get_queryset(self):
         now = timezone.now()
-        return self.model.objects.filter(
-            not_after__gt=now,
-            not_before__lt=now
-        )
+        return self.model.objects.filter(not_after__gt=now, not_before__lt=now)
 
 
 class HomeView(LoginRequiredMixin, _SystemMessageView):
-    template_name = 'main/index.html'
+    template_name = "main/index.html"
 
     def no_permissions_fail(self, request=None):
         """
         Overrides normal permission fail to redirect to landing instead of
         directly to login
         """
-        resolved_url = reverse('main:landing')
+        resolved_url = reverse("main:landing")
 
         return HttpResponseRedirect(f"{resolved_url}?next=/")
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
 
-        context['is_humanities'] = is_member_of_humanities(self.request.user)
+        context["is_humanities"] = is_member_of_humanities(self.request.user)
 
         return context
 
+
 class LandingView(_SystemMessageView):
-    template_name = 'main/landing.html'
+    template_name = "main/landing.html"
     model = SystemMessage
 
     def get_context_data(self, *args, **kwargs):
         context = super().get_context_data(*args, **kwargs)
 
-        context['next'] = self.request.GET.get(
-            'next',
-            settings.LOGIN_REDIRECT_URL
-        )
-        context['saml'] = hasattr(settings, 'SAML_CONFIG')
-        context['show_saml'] = settings.SHOW_SAML_LOGIN
-        context['show_django'] = settings.SHOW_DJANGO_LOGIN
-        context['login_descriptors'] = settings.SHOW_LOGIN_DESCRIPTORS
+        context["next"] = self.request.GET.get("next", settings.LOGIN_REDIRECT_URL)
+        context["saml"] = hasattr(settings, "SAML_CONFIG")
+        context["show_saml"] = settings.SHOW_SAML_LOGIN
+        context["show_django"] = settings.SHOW_DJANGO_LOGIN
+        context["login_descriptors"] = settings.SHOW_LOGIN_DESCRIPTORS
 
         return context
 
@@ -99,12 +100,12 @@ class UserDetailView(GroupRequiredMixin, generic.DetailView):
         settings.GROUP_GENERAL_CHAMBER,
     ]
     model = get_user_model()
-    context_object_name = 'user_object'
+    context_object_name = "user_object"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['reviews'] = self.get_user_reviews()
+        context["reviews"] = self.get_user_reviews()
 
         return context
 
@@ -114,7 +115,7 @@ def get_user_reviews(self):
         objects = Review.objects.filter(
             stage__gte=Review.Stages.ASSIGNMENT,
             proposal__status__gte=Proposal.Statuses.SUBMITTED,
-            proposal__created_by=self.get_object()
+            proposal__created_by=self.get_object(),
         )
 
         for obj in objects:
@@ -136,15 +137,14 @@ def check_requires(request):
     """
     This call checks whether a certain value requires another input to be filled.
     """
-    values = map(int, request.POST.getlist('value[]'))
-    model = apps.get_model(request.POST.get('app'), request.POST.get('model'))
-    required_values = model.objects.filter(**{
-        request.POST.get('field'): True
-    }).values_list('id', flat=True)
+    values = map(int, request.POST.getlist("value[]"))
+    model = apps.get_model(request.POST.get("app"), request.POST.get("model"))
+    required_values = model.objects.filter(
+        **{request.POST.get("field"): True}
+    ).values_list("id", flat=True)
     result = bool(set(required_values).intersection(values))
-    return JsonResponse({
-                            'result': result
-                        })
+    return JsonResponse({"result": result})
+
 
 def establish_ldap_connection():
     # We set up a custom LDAP connection here, separate from the Django auth one
@@ -159,6 +159,7 @@ def establish_ldap_connection():
         # Raised if there was a problem connecting to LDAP
         return None
 
+
 def user_search(query, page):
     """
     This function searches through users for a given query. Page 1 will return registered users, or if there are none,
@@ -172,18 +173,20 @@ def user_search(query, page):
     users = []
 
     # If we have a wildcard or an empty query, we just show all users
-    if query == u'*' or query == u'':
+    if query == "*" or query == "":
         users = format_user_info(User.objects.all())
-    elif page == u'1':
+    elif page == "1":
         # Otherwise we search through the users with a given query
         data = User.objects.filter(
-            Q(username__icontains=query) | Q(first_name__icontains=query) | Q(
-                last_name__icontains=query))
+            Q(username__icontains=query)
+            | Q(first_name__icontains=query)
+            | Q(last_name__icontains=query)
+        )
         users = format_user_info(data)
 
     # We need results from the LDAP if either, this is page 2, or page 1 has no results for now
     # We put this in a variable because we're going to reuse this later on
-    ldap_results_needed = (page == u'2' or len(users) == 0)
+    ldap_results_needed = page == "2" or len(users) == 0
 
     # Attempt to establish LDAP connection
     ldap_connection = establish_ldap_connection()
@@ -193,40 +196,35 @@ def user_search(query, page):
         # Start the LDAP search
         ldap_query = escape_ldap_input(query)
         msgid = ldap_connection.search(
-            'ou=People,dc=uu,dc=nl',
+            "ou=People,dc=uu,dc=nl",
             ldap.SCOPE_SUBTREE,
-            filterstr='(|(humAchternaam=*{}*)(uid=*{}*)(givenName=*{}*)(displayName=*{}*))'.format(
-                ldap_query,
-                ldap_query,
-                ldap_query,
-                ldap_query
-            )
+            filterstr="(|(humAchternaam=*{}*)(uid=*{}*)(givenName=*{}*)(displayName=*{}*))".format(
+                ldap_query, ldap_query, ldap_query, ldap_query
+            ),
         )
         # Get results and loop over them
         for _, data in ldap_connection.result(msgid)[1]:
             # Add them to the users, with a ldap_ prefix in the ID so we can distinguish this when processing the form
-            users.append({
-                'id':   'ldap_' + data.get('uid')[0].decode("utf-8"),
-                'text': '{}: {}'.format(data.get('uid')[0].decode("utf-8"),
-                                        data.get('displayName')[0].decode(
-                                            "utf-8"))
-            })
+            users.append(
+                {
+                    "id": "ldap_" + data.get("uid")[0].decode("utf-8"),
+                    "text": "{}: {}".format(
+                        data.get("uid")[0].decode("utf-8"),
+                        data.get("displayName")[0].decode("utf-8"),
+                    ),
+                }
+            )
 
     # Paging-more should be true if there are no LDAP results included in this page, the LDAP is available and
     # the query is not a wildcard
-    paging_more = not ldap_results_needed and ldap_connection and query != '*'
+    paging_more = not ldap_results_needed and ldap_connection and query != "*"
 
     # Unbind the ldap connection after we are done with it
     if ldap_connection:
         ldap_connection.unbind()
 
     # Return a formatted dict with the results
-    return {
-        'results':    users,
-        'pagination': {
-            'more': paging_more
-        }
-    }
+    return {"results": users, "pagination": {"more": paging_more}}
 
 
 def escape_ldap_input(string):
@@ -239,17 +237,17 @@ def escape_ldap_input(string):
     :return string: The escaped string
     """
     escape_vals = {
-        '\\': r'\5c',
-        r'(': r'\28',
-        r'|': r'\7c',
-        r'<': r'\3c',
-        r'/': r'\2f',
-        r')': r'\29',
-        r'=': r'\3d',
-        r'~': r'\7e',
-        r'&': r'\26',
-        r'>': r'\3e',
-        r'*': r'\2a'
+        "\\": r"\5c",
+        r"(": r"\28",
+        r"|": r"\7c",
+        r"<": r"\3c",
+        r"/": r"\2f",
+        r")": r"\29",
+        r"=": r"\3d",
+        r"~": r"\7e",
+        r"&": r"\26",
+        r">": r"\3e",
+        r"*": r"\2a",
     }
 
     for x, y in escape_vals.items():
@@ -260,20 +258,19 @@ def escape_ldap_input(string):
 
 def format_user_info(lst):
     """This will format a user object into a displayable format"""
-    return [{
-                'id':   x.pk,
-                'text': u'{}: {}'.format(x.username, x.get_full_name())
-            } for x in lst]
+    return [
+        {"id": x.pk, "text": "{}: {}".format(x.username, x.get_full_name())}
+        for x in lst
+    ]
 
 
 class UserSearchView(LoginRequiredMixin, generic.View):
-
     def render_to_response(self, context, *args, **kwargs):
         return JsonResponse(context, *args, **kwargs)
 
     def get(self, *args, **kwargs):
-        query = self.request.GET.get('q')
-        page = self.request.GET.get('page')
+        query = self.request.GET.get("q")
+        page = self.request.GET.get("page")
         context = user_search(query, page)
 
         return self.render_to_response(context)
@@ -287,7 +284,7 @@ def form_invalid(self, form):
         """
         On back button, allow form to have errors.
         """
-        if 'save_back' in self.request.POST:
+        if "save_back" in self.request.POST:
             return HttpResponseRedirect(self.get_back_url())
         else:
             return super(AllowErrorsOnBackbuttonMixin, self).form_invalid(form)
@@ -295,13 +292,13 @@ def form_invalid(self, form):
 
 class FacultyRequiredMixin:
     """A clone of GroupRequiredMixin, but checking faculties instead"""
+
     faculty_required = None
 
     def get_faculty_required(self):
         if self.faculty_required is None or (
             not isinstance(self.faculty_required, (list, tuple, str))
         ):
-
             raise ImproperlyConfigured(
                 '{0} requires the "faculty_required" attribute to be set and be '
                 "one of the following types: string, unicode, list or "
@@ -314,8 +311,7 @@ def get_faculty_required(self):
     def check_membership(self, faculty):
         """Check required faculty(ies)"""
         user_faculties = self.request.user.faculties.values_list(
-            "internal_name",
-            flat=True
+            "internal_name", flat=True
         )
         return set(faculty).intersection(set(user_faculties))
 
@@ -328,9 +324,7 @@ def dispatch(self, request, *args, **kwargs):
         if not in_faculty:
             return self.handle_no_permission(request)
 
-        return super().dispatch(
-            request, *args, **kwargs
-        )
+        return super().dispatch(request, *args, **kwargs)
 
 
 class HumanitiesRequiredMixin(FacultyRequiredMixin):
@@ -352,9 +346,11 @@ def get_object(self, queryset=None):
 
         if isinstance(obj, Proposal):
             proposal = obj
-        elif isinstance(obj, Observation) or isinstance(obj,
-                                                        Intervention) or isinstance(
-                obj, Session):
+        elif (
+            isinstance(obj, Observation)
+            or isinstance(obj, Intervention)
+            or isinstance(obj, Session)
+        ):
             proposal = obj.study.proposal
         elif isinstance(obj, Task):
             proposal = obj.session.study.proposal
@@ -363,17 +359,20 @@ def get_object(self, queryset=None):
 
         applicants = proposal.applicants.all()
         if proposal.supervisor:
-            supervisor = get_user_model().objects.filter(
-                pk=proposal.supervisor.pk)
+            supervisor = get_user_model().objects.filter(pk=proposal.supervisor.pk)
         else:
             supervisor = get_user_model().objects.none()
-        commission = get_user_model().objects.filter(groups__name=settings.GROUP_SECRETARY)
+        commission = get_user_model().objects.filter(
+            groups__name=settings.GROUP_SECRETARY
+        )
         if proposal.reviewing_committee.name == settings.GROUP_LINGUISTICS_CHAMBER:
             commission |= get_user_model().objects.filter(
-                groups__name=settings.GROUP_LINGUISTICS_CHAMBER)
+                groups__name=settings.GROUP_LINGUISTICS_CHAMBER
+            )
         if proposal.reviewing_committee.name == settings.GROUP_GENERAL_CHAMBER:
             commission |= get_user_model().objects.filter(
-                groups__name=settings.GROUP_GENERAL_CHAMBER)
+                groups__name=settings.GROUP_GENERAL_CHAMBER
+            )
 
         if proposal.status >= Proposal.Statuses.SUBMITTED:
             if self.request.user not in commission:
@@ -389,7 +388,6 @@ def get_object(self, queryset=None):
 
 
 class FormSetUserAllowedMixin(UserAllowedMixin):
-
     def check_allowed(self):
         """
         Allows access to a proposal based on the status of a Proposal
@@ -402,12 +400,13 @@ def check_allowed(self):
         """
 
         for obj in self.objects:
-
             if isinstance(obj, Proposal):
                 proposal = obj
-            elif isinstance(obj, Observation) or isinstance(obj,
-                                                            Intervention) or isinstance(
-                    obj, Session):
+            elif (
+                isinstance(obj, Observation)
+                or isinstance(obj, Intervention)
+                or isinstance(obj, Session)
+            ):
                 proposal = obj.study.proposal
             elif isinstance(obj, Task):
                 proposal = obj.session.study.proposal
@@ -416,11 +415,12 @@ def check_allowed(self):
 
             applicants = proposal.applicants.all()
             if proposal.supervisor:
-                supervisor = get_user_model().objects.filter(
-                    pk=proposal.supervisor.pk)
+                supervisor = get_user_model().objects.filter(pk=proposal.supervisor.pk)
             else:
                 supervisor = get_user_model().objects.none()
-            commission = get_user_model().objects.filter(groups__name=settings.GROUP_SECRETARY)
+            commission = get_user_model().objects.filter(
+                groups__name=settings.GROUP_SECRETARY
+            )
 
             if proposal.reviewing_committee.name == settings.GROUP_LINGUISTICS_CHAMBER:
                 commission |= get_user_model().objects.filter(
@@ -452,8 +452,9 @@ def get_success_url(self):
         return success_url(self)
 
 
-class UpdateView(LoginRequiredMixin, SuccessMessageMixin, UserAllowedMixin,
-                 generic.UpdateView):
+class UpdateView(
+    LoginRequiredMixin, SuccessMessageMixin, UserAllowedMixin, generic.UpdateView
+):
     """Generic update view including success message, user allowed and login
     required mixins"""
 
@@ -462,11 +463,13 @@ def get_success_url(self):
         return success_url(self)
 
 
-class FormSetUpdateView(FormSetUserAllowedMixin, LoginRequiredMixin,
-                        SuccessMessageMixin, generic.View):
-    """ Generic update view that uses a formset. This allows you to edit
+class FormSetUpdateView(
+    FormSetUserAllowedMixin, LoginRequiredMixin, SuccessMessageMixin, generic.View
+):
+    """Generic update view that uses a formset. This allows you to edit
     multiple forms of the same type on the same page.
     """
+
     form = None
     _formset = None
     queryset = None
@@ -479,15 +482,15 @@ def get(self, request, *args, **kwargs):
     def post(self, request, *args, **kwargs):
         self._on_request()
 
-        formset = self._formset(request.POST, request.FILES,
-                                queryset=self.objects)
+        formset = self._formset(request.POST, request.FILES, queryset=self.objects)
         self.pre_validation(formset)
         if formset.is_valid():
             self.save_form(formset)
             return HttpResponseRedirect(self.get_success_url())
         else:
-            return render(request, self.template_name,
-                          self.get_context_data(formset=formset))
+            return render(
+                request, self.template_name, self.get_context_data(formset=formset)
+            )
 
     def pre_validation(self, formset):
         """This method can be overridden to manipulate the formset before
@@ -498,16 +501,17 @@ def save_form(self, formset):
         formset.save()
 
     def _on_request(self):
-        self._formset = modelformset_factory(self.form._meta.model,
-                                             form=self.form, extra=self.extra)
+        self._formset = modelformset_factory(
+            self.form._meta.model, form=self.form, extra=self.extra
+        )
         self.objects = self.get_queryset()
         self.check_allowed()
 
     def get_queryset(self):
         if self.queryset is None:
             raise ImproperlyConfigured(
-                "Either override get_queryset, or provide a queryset class "
-                "variable")
+                "Either override get_queryset, or provide a queryset class " "variable"
+            )
 
         return self.queryset
 
@@ -516,13 +520,13 @@ def get_success_url(self):
         return success_url(self)
 
     def get_context_data(self, **kwargs):
-        if 'view' not in kwargs:
-            kwargs['view'] = self
+        if "view" not in kwargs:
+            kwargs["view"] = self
 
-        kwargs['objects'] = self.objects
+        kwargs["objects"] = self.objects
 
-        if 'formset' not in kwargs:
-            kwargs['formset'] = self._formset(queryset=self.objects)
+        if "formset" not in kwargs:
+            kwargs["formset"] = self._formset(queryset=self.objects)
 
         return kwargs
 
@@ -544,9 +548,7 @@ class UserMediaView(LoginRequiredMixin, generic.View):
     def get_response_path(self, filename):
         """Make sure the requested filename exists within MEDIA_ROOT,
         to prevent upwards directory traversal."""
-        media_root = os.path.realpath(
-            settings.MEDIA_ROOT
-        )
+        media_root = os.path.realpath(settings.MEDIA_ROOT)
         filepath = os.path.realpath(
             os.path.join(media_root, filename),
         )
@@ -572,12 +574,11 @@ def get(self, request, filename):
 
 
 def success_url(self):
-    if 'next' in self.request.GET:
-        return self.request.GET['next']
-    if 'save_continue' in self.request.POST:
+    if "next" in self.request.GET:
+        return self.request.GET["next"]
+    if "save_continue" in self.request.POST:
         return self.get_next_url()
-    if 'save_back' in self.request.POST:
+    if "save_back" in self.request.POST:
         return self.get_back_url()
     else:
-        return reverse('proposals:my_concepts')
-
+        return reverse("proposals:my_concepts")
diff --git a/observations/admin.py b/observations/admin.py
index 9fedbde04..55a93297e 100644
--- a/observations/admin.py
+++ b/observations/admin.py
@@ -5,6 +5,6 @@
 
 @admin.register(Registration)
 class RegistrationAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'needs_details', 'requires_review')
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = ("order", "description", "needs_details", "requires_review")
+    list_display_links = ("description",)
+    ordering = ["order"]
diff --git a/observations/forms.py b/observations/forms.py
index dc4b0bf1b..ef33d5670 100644
--- a/observations/forms.py
+++ b/observations/forms.py
@@ -12,24 +12,36 @@ class ObservationForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Observation
         fields = [
-            'setting', 'setting_details', 'supervision', 'leader_has_coc',
-            'details_who', 'details_why', 'details_frequency',
-            'is_anonymous', 'is_anonymous_details', 'is_in_target_group',
-            'is_in_target_group_details', 'is_nonpublic_space', 'is_nonpublic_space_details',
-            'has_advanced_consent', 'has_advanced_consent_details',
-            'needs_approval', 'approval_institution',
-            'registrations', 'registrations_details',
+            "setting",
+            "setting_details",
+            "supervision",
+            "leader_has_coc",
+            "details_who",
+            "details_why",
+            "details_frequency",
+            "is_anonymous",
+            "is_anonymous_details",
+            "is_in_target_group",
+            "is_in_target_group_details",
+            "is_nonpublic_space",
+            "is_nonpublic_space_details",
+            "has_advanced_consent",
+            "has_advanced_consent_details",
+            "needs_approval",
+            "approval_institution",
+            "registrations",
+            "registrations_details",
         ]
         widgets = {
-            'setting': forms.CheckboxSelectMultiple(),
-            'supervision': forms.RadioSelect(choices=YES_NO),
-            'leader_has_coc': forms.RadioSelect(choices=YES_NO),
-            'is_anonymous': forms.RadioSelect(choices=YES_NO),
-            'is_in_target_group': forms.RadioSelect(choices=YES_NO),
-            'is_nonpublic_space': forms.RadioSelect(choices=YES_NO),
-            'has_advanced_consent': forms.RadioSelect(choices=YES_NO),
-            'needs_approval': forms.RadioSelect(choices=YES_NO),
-            'registrations': forms.CheckboxSelectMultiple(),
+            "setting": forms.CheckboxSelectMultiple(),
+            "supervision": forms.RadioSelect(choices=YES_NO),
+            "leader_has_coc": forms.RadioSelect(choices=YES_NO),
+            "is_anonymous": forms.RadioSelect(choices=YES_NO),
+            "is_in_target_group": forms.RadioSelect(choices=YES_NO),
+            "is_nonpublic_space": forms.RadioSelect(choices=YES_NO),
+            "has_advanced_consent": forms.RadioSelect(choices=YES_NO),
+            "needs_approval": forms.RadioSelect(choices=YES_NO),
+            "registrations": forms.CheckboxSelectMultiple(),
         }
 
     def __init__(self, *args, **kwargs):
@@ -37,18 +49,19 @@ def __init__(self, *args, **kwargs):
         - Set the Study for later reference
         - Don't ask the supervision question when there are only adult AgeGroups in this Study
         """
-        self.study = kwargs.pop('study', None)
+        self.study = kwargs.pop("study", None)
 
         super(ObservationForm, self).__init__(*args, **kwargs)
 
-        self.fields['details_who'].label = mark_safe(self.fields['details_who'].label)
-        self.fields['details_why'].label = mark_safe(self.fields['details_why'].label)
-        self.fields['details_frequency'].label = mark_safe(self.fields['details_frequency'].label)
-
+        self.fields["details_who"].label = mark_safe(self.fields["details_who"].label)
+        self.fields["details_why"].label = mark_safe(self.fields["details_why"].label)
+        self.fields["details_frequency"].label = mark_safe(
+            self.fields["details_frequency"].label
+        )
 
         if not self.study.has_children():
-            del self.fields['supervision']
-            del self.fields['leader_has_coc']
+            del self.fields["supervision"]
+            del self.fields["leader_has_coc"]
 
     def get_soft_validation_fields(self):
         # We want soft validation of all fields
@@ -65,29 +78,39 @@ def clean(self):
 
         self.mark_soft_required(
             cleaned_data,
-            'setting',
-            'details_who',
-            'details_why',
-            'details_frequency',
+            "setting",
+            "details_who",
+            "details_why",
+            "details_frequency",
         )
 
-        self.check_dependency_multiple(cleaned_data, 'setting', 'needs_details', 'setting_details')
+        self.check_dependency_multiple(
+            cleaned_data, "setting", "needs_details", "setting_details"
+        )
         if self.study.has_children():
-            self.check_dependency_multiple(cleaned_data, 'setting', 'needs_supervision', 'supervision')
-            self.check_dependency(cleaned_data, 'supervision', 'leader_has_coc', f1_value=False)
-        self.check_dependency(cleaned_data, 'needs_approval', 'approval_institution')
-        self.check_dependency_multiple(cleaned_data, 'registrations', 'needs_details', 'registrations_details')
-
-        self.check_dependency(cleaned_data, 'is_anonymous', 'is_anonymous_details')
-        self.check_dependency(cleaned_data, 'is_in_target_group', 'is_in_target_group_details')
-        self.check_dependency(cleaned_data, 'is_nonpublic_space', 'is_nonpublic_space_details')
-
+            self.check_dependency_multiple(
+                cleaned_data, "setting", "needs_supervision", "supervision"
+            )
+            self.check_dependency(
+                cleaned_data, "supervision", "leader_has_coc", f1_value=False
+            )
+        self.check_dependency(cleaned_data, "needs_approval", "approval_institution")
+        self.check_dependency_multiple(
+            cleaned_data, "registrations", "needs_details", "registrations_details"
+        )
 
+        self.check_dependency(cleaned_data, "is_anonymous", "is_anonymous_details")
+        self.check_dependency(
+            cleaned_data, "is_in_target_group", "is_in_target_group_details"
+        )
+        self.check_dependency(
+            cleaned_data, "is_nonpublic_space", "is_nonpublic_space_details"
+        )
 
 
 class ObservationUpdateAttachmentsForm(forms.ModelForm):
     class Meta:
         model = Observation
         fields = [
-            'approval_document',
+            "approval_document",
         ]
diff --git a/observations/migrations/0001_initial.py b/observations/migrations/0001_initial.py
index 82af931c8..de69da1f6 100644
--- a/observations/migrations/0001_initial.py
+++ b/observations/migrations/0001_initial.py
@@ -7,59 +7,153 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0001_initial'),
-        ('main', '0001_initial'),
+        ("studies", "0001_initial"),
+        ("main", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Observation',
+            name="Observation",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('setting_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('supervision', models.NullBooleanField(verbose_name='Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?')),
-                ('days', models.PositiveIntegerField(verbose_name='Op hoeveel dagen wordt er geobserveerd (per deelnemer)?')),
-                ('mean_hours', models.DecimalField(verbose_name='Hoeveel uur wordt er gemiddeld per dag geobserveerd?', max_digits=4, decimal_places=2, validators=[django.core.validators.MaxValueValidator(24)])),
-                ('is_anonymous', models.BooleanField(default=False, help_text='Zoals zou kunnen voorkomen op fora en de onderzoeker ook een account heeft.', verbose_name='Wordt er anoniem geobserveerd?')),
-                ('is_in_target_group', models.BooleanField(default=False, verbose_name='Doet de onderzoeker zich voor als behorende tot de doelgroep?')),
-                ('is_nonpublic_space', models.BooleanField(default=False, help_text='Bijvoorbeeld er wordt geobserveerd bij iemand thuis, tijdens een hypotheekgesprek, tijdens politieverhoren of een forum waar een account voor moet worden aangemaakt.', verbose_name='Wordt er geobserveerd in een niet-openbare ruimte?')),
-                ('has_advanced_consent', models.BooleanField(default=True, verbose_name='Vindt informed consent van tevoren plaats?')),
-                ('needs_approval', models.BooleanField(default=False, verbose_name='Heeft u toestemming nodig van een (samenwerkende) instantie om deze observatie te mogen uitvoeren?')),
-                ('approval_institution', models.CharField(max_length=200, verbose_name='Welke instantie?', blank=True)),
-                ('approval_document', models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc])),
-                ('registrations_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                (
+                    "setting_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "supervision",
+                    models.NullBooleanField(
+                        verbose_name="Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?"
+                    ),
+                ),
+                (
+                    "days",
+                    models.PositiveIntegerField(
+                        verbose_name="Op hoeveel dagen wordt er geobserveerd (per deelnemer)?"
+                    ),
+                ),
+                (
+                    "mean_hours",
+                    models.DecimalField(
+                        verbose_name="Hoeveel uur wordt er gemiddeld per dag geobserveerd?",
+                        max_digits=4,
+                        decimal_places=2,
+                        validators=[django.core.validators.MaxValueValidator(24)],
+                    ),
+                ),
+                (
+                    "is_anonymous",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Zoals zou kunnen voorkomen op fora en de onderzoeker ook een account heeft.",
+                        verbose_name="Wordt er anoniem geobserveerd?",
+                    ),
+                ),
+                (
+                    "is_in_target_group",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Doet de onderzoeker zich voor als behorende tot de doelgroep?",
+                    ),
+                ),
+                (
+                    "is_nonpublic_space",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Bijvoorbeeld er wordt geobserveerd bij iemand thuis, tijdens een hypotheekgesprek, tijdens politieverhoren of een forum waar een account voor moet worden aangemaakt.",
+                        verbose_name="Wordt er geobserveerd in een niet-openbare ruimte?",
+                    ),
+                ),
+                (
+                    "has_advanced_consent",
+                    models.BooleanField(
+                        default=True,
+                        verbose_name="Vindt informed consent van tevoren plaats?",
+                    ),
+                ),
+                (
+                    "needs_approval",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Heeft u toestemming nodig van een (samenwerkende) instantie om deze observatie te mogen uitvoeren?",
+                    ),
+                ),
+                (
+                    "approval_institution",
+                    models.CharField(
+                        max_length=200, verbose_name="Welke instantie?", blank=True
+                    ),
+                ),
+                (
+                    "approval_document",
+                    models.FileField(
+                        blank=True,
+                        upload_to=b"",
+                        verbose_name="Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)",
+                        validators=[main.validators.validate_pdf_or_doc],
+                    ),
+                ),
+                (
+                    "registrations_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
             ],
             options={
-                'abstract': False,
+                "abstract": False,
             },
         ),
         migrations.CreateModel(
-            name='Registration',
+            name="Registration",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.AddField(
-            model_name='observation',
-            name='registrations',
-            field=models.ManyToManyField(to='observations.Registration', verbose_name='Hoe wordt het gedrag geregistreerd?'),
+            model_name="observation",
+            name="registrations",
+            field=models.ManyToManyField(
+                to="observations.Registration",
+                verbose_name="Hoe wordt het gedrag geregistreerd?",
+            ),
         ),
         migrations.AddField(
-            model_name='observation',
-            name='setting',
-            field=models.ManyToManyField(to='main.Setting', verbose_name='Geef aan waar de dataverzameling plaatsvindt'),
+            model_name="observation",
+            name="setting",
+            field=models.ManyToManyField(
+                to="main.Setting",
+                verbose_name="Geef aan waar de dataverzameling plaatsvindt",
+            ),
         ),
         migrations.AddField(
-            model_name='observation',
-            name='study',
-            field=models.OneToOneField(to='studies.Study', on_delete=models.CASCADE),
+            model_name="observation",
+            name="study",
+            field=models.OneToOneField(to="studies.Study", on_delete=models.CASCADE),
         ),
     ]
diff --git a/observations/migrations/0002_auto_20161013_1959.py b/observations/migrations/0002_auto_20161013_1959.py
index 82a3d78ff..7a13e2cd6 100644
--- a/observations/migrations/0002_auto_20161013_1959.py
+++ b/observations/migrations/0002_auto_20161013_1959.py
@@ -5,20 +5,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0001_initial'),
+        ("observations", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='registration',
-            name='description_en',
+            model_name="registration",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='registration',
-            name='description_nl',
+            model_name="registration",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/observations/migrations/0003_observation_leader_has_coc.py b/observations/migrations/0003_observation_leader_has_coc.py
index ce267b459..a092a15d8 100644
--- a/observations/migrations/0003_observation_leader_has_coc.py
+++ b/observations/migrations/0003_observation_leader_has_coc.py
@@ -5,15 +5,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0002_auto_20161013_1959'),
+        ("observations", "0002_auto_20161013_1959"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='observation',
-            name='leader_has_coc',
-            field=models.NullBooleanField(help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De ETCL neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="observation",
+            name="leader_has_coc",
+            field=models.NullBooleanField(
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De ETCL neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
     ]
diff --git a/observations/migrations/0004_auto_20180808_1129.py b/observations/migrations/0004_auto_20180808_1129.py
index d0966bfac..7c6851220 100644
--- a/observations/migrations/0004_auto_20180808_1129.py
+++ b/observations/migrations/0004_auto_20180808_1129.py
@@ -7,15 +7,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0003_observation_leader_has_coc'),
+        ("observations", "0003_observation_leader_has_coc"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='approval_document',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)'),
+            model_name="observation",
+            name="approval_document",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/observations/migrations/0005_auto_20180822_1206.py b/observations/migrations/0005_auto_20180822_1206.py
index 82c61ac03..9f9065fe2 100644
--- a/observations/migrations/0005_auto_20180822_1206.py
+++ b/observations/migrations/0005_auto_20180822_1206.py
@@ -7,25 +7,36 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0004_auto_20180808_1129'),
+        ("observations", "0004_auto_20180808_1129"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='observation',
-            name='version',
-            field=models.PositiveIntegerField(default=1, verbose_name='INTERNAL - Describes which version of the intervention model is used'),
+            model_name="observation",
+            name="version",
+            field=models.PositiveIntegerField(
+                default=1,
+                verbose_name="INTERNAL - Describes which version of the intervention model is used",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='days',
-            field=models.PositiveIntegerField(blank=True, verbose_name='Op hoeveel dagen wordt er geobserveerd (per deelnemer)?'),
+            model_name="observation",
+            name="days",
+            field=models.PositiveIntegerField(
+                blank=True,
+                verbose_name="Op hoeveel dagen wordt er geobserveerd (per deelnemer)?",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='mean_hours',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=4, validators=[django.core.validators.MaxValueValidator(24)], verbose_name='Hoeveel uur wordt er gemiddeld per dag geobserveerd?'),
+            model_name="observation",
+            name="mean_hours",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=4,
+                validators=[django.core.validators.MaxValueValidator(24)],
+                verbose_name="Hoeveel uur wordt er gemiddeld per dag geobserveerd?",
+            ),
         ),
     ]
diff --git a/observations/migrations/0006_auto_20180822_1207.py b/observations/migrations/0006_auto_20180822_1207.py
index 59edb5c9d..442c533b9 100644
--- a/observations/migrations/0006_auto_20180822_1207.py
+++ b/observations/migrations/0006_auto_20180822_1207.py
@@ -6,15 +6,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0005_auto_20180822_1206'),
+        ("observations", "0005_auto_20180822_1206"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='version',
-            field=models.PositiveIntegerField(default=2, verbose_name='INTERNAL - Describes which version of the intervention model is used'),
+            model_name="observation",
+            name="version",
+            field=models.PositiveIntegerField(
+                default=2,
+                verbose_name="INTERNAL - Describes which version of the intervention model is used",
+            ),
         ),
     ]
diff --git a/observations/migrations/0007_auto_20180822_1214.py b/observations/migrations/0007_auto_20180822_1214.py
index 5f38db81b..3dbe1185c 100644
--- a/observations/migrations/0007_auto_20180822_1214.py
+++ b/observations/migrations/0007_auto_20180822_1214.py
@@ -6,33 +6,42 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0006_auto_20180822_1207'),
+        ("observations", "0006_auto_20180822_1207"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='observation',
-            name='details_frequency',
-            field=models.TextField(default='', verbose_name='Beschrijf hoe vaak en hoe lang de observant wordt geobserveerd.'),
+            model_name="observation",
+            name="details_frequency",
+            field=models.TextField(
+                default="",
+                verbose_name="Beschrijf hoe vaak en hoe lang de observant wordt geobserveerd.",
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='observation',
-            name='details_who',
-            field=models.TextField(default=' ', verbose_name='Beschrijf wie er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_who",
+            field=models.TextField(
+                default=" ", verbose_name="Beschrijf wie er wordt geobserveerd."
+            ),
             preserve_default=False,
         ),
         migrations.AddField(
-            model_name='observation',
-            name='details_why',
-            field=models.TextField(default=' ', verbose_name='Beschrijf waarom er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_why",
+            field=models.TextField(
+                default=" ", verbose_name="Beschrijf waarom er wordt geobserveerd."
+            ),
             preserve_default=False,
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='version',
-            field=models.PositiveIntegerField(default=2, verbose_name='INTERNAL - Describes which version of the observation model is used'),
+            model_name="observation",
+            name="version",
+            field=models.PositiveIntegerField(
+                default=2,
+                verbose_name="INTERNAL - Describes which version of the observation model is used",
+            ),
         ),
     ]
diff --git a/observations/migrations/0008_auto_20180822_1307.py b/observations/migrations/0008_auto_20180822_1307.py
index 23d222ca8..3d8756379 100644
--- a/observations/migrations/0008_auto_20180822_1307.py
+++ b/observations/migrations/0008_auto_20180822_1307.py
@@ -6,25 +6,33 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0007_auto_20180822_1214'),
+        ("observations", "0007_auto_20180822_1214"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='details_frequency',
-            field=models.TextField(help_text='Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten worden geobserveerd.', verbose_name='Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd.'),
+            model_name="observation",
+            name="details_frequency",
+            field=models.TextField(
+                help_text="Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten worden geobserveerd.",
+                verbose_name="Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd.",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='details_who',
-            field=models.TextField(help_text='Maak duidelijk voor de commissie wie er wordt geobserveerd en wat er precies van de deelnemer wordt geobserveerd. Bijvoorbeeld: De leraar zal geobserveerd worden. De observatie moet de interactie tussen leraar en leerling in kaart brengen.', verbose_name='Beschrijf <b>wie</b> er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_who",
+            field=models.TextField(
+                help_text="Maak duidelijk voor de commissie wie er wordt geobserveerd en wat er precies van de deelnemer wordt geobserveerd. Bijvoorbeeld: De leraar zal geobserveerd worden. De observatie moet de interactie tussen leraar en leerling in kaart brengen.",
+                verbose_name="Beschrijf <b>wie</b> er wordt geobserveerd.",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='details_why',
-            field=models.TextField(help_text='Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de nieuwe lesmethode. Doet h/zij dat op de gewenste manier en in begrijpelijke taal?', verbose_name='Beschrijf <b>waarom</b> er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_why",
+            field=models.TextField(
+                help_text="Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de nieuwe lesmethode. Doet h/zij dat op de gewenste manier en in begrijpelijke taal?",
+                verbose_name="Beschrijf <b>waarom</b> er wordt geobserveerd.",
+            ),
         ),
     ]
diff --git a/observations/migrations/0009_auto_20180822_1328.py b/observations/migrations/0009_auto_20180822_1328.py
index 5d98101e0..e9c4855b1 100644
--- a/observations/migrations/0009_auto_20180822_1328.py
+++ b/observations/migrations/0009_auto_20180822_1328.py
@@ -6,25 +6,24 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0008_auto_20180822_1307'),
+        ("observations", "0008_auto_20180822_1307"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='observation',
-            name='is_anonymous_details',
-            field=models.TextField(blank=True, verbose_name='Licht toe'),
+            model_name="observation",
+            name="is_anonymous_details",
+            field=models.TextField(blank=True, verbose_name="Licht toe"),
         ),
         migrations.AddField(
-            model_name='observation',
-            name='is_in_target_group_details',
-            field=models.TextField(blank=True, verbose_name='Licht toe'),
+            model_name="observation",
+            name="is_in_target_group_details",
+            field=models.TextField(blank=True, verbose_name="Licht toe"),
         ),
         migrations.AddField(
-            model_name='observation',
-            name='is_nonpublic_space_details',
-            field=models.TextField(blank=True, verbose_name='Licht toe'),
+            model_name="observation",
+            name="is_nonpublic_space_details",
+            field=models.TextField(blank=True, verbose_name="Licht toe"),
         ),
     ]
diff --git a/observations/migrations/0010_auto_20180822_1332.py b/observations/migrations/0010_auto_20180822_1332.py
index b6a1668e5..779ce640e 100644
--- a/observations/migrations/0010_auto_20180822_1332.py
+++ b/observations/migrations/0010_auto_20180822_1332.py
@@ -7,20 +7,30 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0009_auto_20180822_1328'),
+        ("observations", "0009_auto_20180822_1328"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='days',
-            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='Op hoeveel dagen wordt er geobserveerd (per deelnemer)?'),
+            model_name="observation",
+            name="days",
+            field=models.PositiveIntegerField(
+                blank=True,
+                null=True,
+                verbose_name="Op hoeveel dagen wordt er geobserveerd (per deelnemer)?",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='mean_hours',
-            field=models.DecimalField(blank=True, decimal_places=2, max_digits=4, null=True, validators=[django.core.validators.MaxValueValidator(24)], verbose_name='Hoeveel uur wordt er gemiddeld per dag geobserveerd?'),
+            model_name="observation",
+            name="mean_hours",
+            field=models.DecimalField(
+                blank=True,
+                decimal_places=2,
+                max_digits=4,
+                null=True,
+                validators=[django.core.validators.MaxValueValidator(24)],
+                verbose_name="Hoeveel uur wordt er gemiddeld per dag geobserveerd?",
+            ),
         ),
     ]
diff --git a/observations/migrations/0011_auto_20190401_1343.py b/observations/migrations/0011_auto_20190401_1343.py
index 6cf1424a2..39ba2cbe3 100644
--- a/observations/migrations/0011_auto_20190401_1343.py
+++ b/observations/migrations/0011_auto_20190401_1343.py
@@ -6,35 +6,53 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0010_auto_20180822_1332'),
+        ("observations", "0010_auto_20180822_1332"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='details_frequency',
-            field=models.TextField(blank=True, help_text='Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten worden geobserveerd.', verbose_name='Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd.'),
+            model_name="observation",
+            name="details_frequency",
+            field=models.TextField(
+                blank=True,
+                help_text="Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten worden geobserveerd.",
+                verbose_name="Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd.",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='details_who',
-            field=models.TextField(blank=True, help_text='Maak duidelijk voor de commissie wie er wordt geobserveerd en wat er precies van de deelnemer wordt geobserveerd. Bijvoorbeeld: De leraar zal geobserveerd worden. De observatie moet de interactie tussen leraar en leerling in kaart brengen.', verbose_name='Beschrijf <b>wie</b> er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_who",
+            field=models.TextField(
+                blank=True,
+                help_text="Maak duidelijk voor de commissie wie er wordt geobserveerd en wat er precies van de deelnemer wordt geobserveerd. Bijvoorbeeld: De leraar zal geobserveerd worden. De observatie moet de interactie tussen leraar en leerling in kaart brengen.",
+                verbose_name="Beschrijf <b>wie</b> er wordt geobserveerd.",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='details_why',
-            field=models.TextField(blank=True, help_text='Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de nieuwe lesmethode. Doet h/zij dat op de gewenste manier en in begrijpelijke taal?', verbose_name='Beschrijf <b>waarom</b> er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_why",
+            field=models.TextField(
+                blank=True,
+                help_text="Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de nieuwe lesmethode. Doet h/zij dat op de gewenste manier en in begrijpelijke taal?",
+                verbose_name="Beschrijf <b>waarom</b> er wordt geobserveerd.",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='leader_has_coc',
-            field=models.NullBooleanField(help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="observation",
+            name="leader_has_coc",
+            field=models.NullBooleanField(
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='setting',
-            field=models.ManyToManyField(blank=True, to='main.Setting', verbose_name='Geef aan waar de dataverzameling plaatsvindt'),
+            model_name="observation",
+            name="setting",
+            field=models.ManyToManyField(
+                blank=True,
+                to="main.Setting",
+                verbose_name="Geef aan waar de dataverzameling plaatsvindt",
+            ),
         ),
     ]
diff --git a/observations/migrations/0012_observation_has_advanced_consent_details.py b/observations/migrations/0012_observation_has_advanced_consent_details.py
index 4b4e93554..d8764f1e1 100644
--- a/observations/migrations/0012_observation_has_advanced_consent_details.py
+++ b/observations/migrations/0012_observation_has_advanced_consent_details.py
@@ -6,15 +6,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0011_auto_20190401_1343'),
+        ("observations", "0011_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='observation',
-            name='has_advanced_consent_details',
-            field=models.TextField(blank=True, verbose_name='Leg uit waarom informed consent niet van te voren plaatsvindt en geef ook op welke wijze dit achteraf verzorgd wordt.'),
+            model_name="observation",
+            name="has_advanced_consent_details",
+            field=models.TextField(
+                blank=True,
+                verbose_name="Leg uit waarom informed consent niet van te voren plaatsvindt en geef ook op welke wijze dit achteraf verzorgd wordt.",
+            ),
         ),
     ]
diff --git a/observations/migrations/0013_registration_requires_review.py b/observations/migrations/0013_registration_requires_review.py
index bfa6e708b..976f0b763 100644
--- a/observations/migrations/0013_registration_requires_review.py
+++ b/observations/migrations/0013_registration_requires_review.py
@@ -6,15 +6,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0012_observation_has_advanced_consent_details'),
+        ("observations", "0012_observation_has_advanced_consent_details"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='registration',
-            name='requires_review',
+            model_name="registration",
+            name="requires_review",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/observations/migrations/0014_auto_20200428_1337.py b/observations/migrations/0014_auto_20200428_1337.py
index 799785787..64bd354f7 100644
--- a/observations/migrations/0014_auto_20200428_1337.py
+++ b/observations/migrations/0014_auto_20200428_1337.py
@@ -4,20 +4,28 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0013_registration_requires_review'),
+        ("observations", "0013_registration_requires_review"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='leader_has_coc',
-            field=models.BooleanField(blank=True, help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', null=True, verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="observation",
+            name="leader_has_coc",
+            field=models.BooleanField(
+                blank=True,
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                null=True,
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='supervision',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?'),
+            model_name="observation",
+            name="supervision",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?",
+            ),
         ),
     ]
diff --git a/observations/migrations/0015_auto_20211213_1503.py b/observations/migrations/0015_auto_20211213_1503.py
index 0deee9cee..fc0d119a4 100644
--- a/observations/migrations/0015_auto_20211213_1503.py
+++ b/observations/migrations/0015_auto_20211213_1503.py
@@ -4,20 +4,26 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0014_auto_20200428_1337'),
+        ("observations", "0014_auto_20200428_1337"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='details_why',
-            field=models.TextField(blank=True, help_text='Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de nieuwe lesmethode. Doet die dat op de gewenste manier en in begrijpelijke taal?', verbose_name='Beschrijf <b>waarom</b> er wordt geobserveerd.'),
+            model_name="observation",
+            name="details_why",
+            field=models.TextField(
+                blank=True,
+                help_text="Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de nieuwe lesmethode. Doet die dat op de gewenste manier en in begrijpelijke taal?",
+                verbose_name="Beschrijf <b>waarom</b> er wordt geobserveerd.",
+            ),
         ),
         migrations.AlterField(
-            model_name='observation',
-            name='needs_approval',
-            field=models.BooleanField(default=False, verbose_name='Heb je toestemming nodig van een (samenwerkende) instantie om deze observatie te mogen uitvoeren?'),
+            model_name="observation",
+            name="needs_approval",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Heb je toestemming nodig van een (samenwerkende) instantie om deze observatie te mogen uitvoeren?",
+            ),
         ),
     ]
diff --git a/observations/migrations/0016_alter_observation_registrations.py b/observations/migrations/0016_alter_observation_registrations.py
index c95f0fe0d..9811e144b 100644
--- a/observations/migrations/0016_alter_observation_registrations.py
+++ b/observations/migrations/0016_alter_observation_registrations.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('observations', '0015_auto_20211213_1503'),
+        ("observations", "0015_auto_20211213_1503"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='observation',
-            name='registrations',
-            field=models.ManyToManyField(help_text="Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>.", to='observations.Registration', verbose_name='Hoe wordt het gedrag geregistreerd?'),
+            model_name="observation",
+            name="registrations",
+            field=models.ManyToManyField(
+                help_text="Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>.",
+                to="observations.Registration",
+                verbose_name="Hoe wordt het gedrag geregistreerd?",
+            ),
         ),
     ]
diff --git a/observations/models.py b/observations/models.py
index 7acb2cc7b..25403c7ed 100644
--- a/observations/models.py
+++ b/observations/models.py
@@ -14,7 +14,7 @@ class Registration(models.Model):
     requires_review = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
@@ -24,126 +24,134 @@ class Observation(SettingModel):
     # This is used internally to provide backwards compatibility with the old
     # version of this model. All old fields are still used if this is 1.
     version = models.PositiveIntegerField(
-        'INTERNAL - Describes which version of the observation model is used',
-        default=2)
+        "INTERNAL - Describes which version of the observation model is used", default=2
+    )
 
     details_who = models.TextField(
-        _('Beschrijf <b>wie</b> er wordt geobserveerd.'),
+        _("Beschrijf <b>wie</b> er wordt geobserveerd."),
         help_text=_(
-            'Maak duidelijk voor de commissie wie er wordt geobserveerd en wat er precies van de deelnemer wordt'
-            ' geobserveerd. Bijvoorbeeld: De leraar zal geobserveerd worden. De observatie moet de interactie '
-            'tussen leraar en leerling in kaart brengen.'),
+            "Maak duidelijk voor de commissie wie er wordt geobserveerd en wat er precies van de deelnemer wordt"
+            " geobserveerd. Bijvoorbeeld: De leraar zal geobserveerd worden. De observatie moet de interactie "
+            "tussen leraar en leerling in kaart brengen."
+        ),
         blank=True,
     )
 
     details_why = models.TextField(
-        _('Beschrijf <b>waarom</b> er wordt geobserveerd.'),
+        _("Beschrijf <b>waarom</b> er wordt geobserveerd."),
         help_text=_(
-            'Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de '
-            'observatie is inzicht te krijgen in hoe de leerkracht omgaat met '
-            'de uitleg van de nieuwe lesmethode. Doet die dat op de gewenste '
-            'manier en in begrijpelijke taal?'),
+            "Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de "
+            "observatie is inzicht te krijgen in hoe de leerkracht omgaat met "
+            "de uitleg van de nieuwe lesmethode. Doet die dat op de gewenste "
+            "manier en in begrijpelijke taal?"
+        ),
         blank=True,
     )
 
     details_frequency = models.TextField(
-        _(
-            'Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd.'),
-        help_text=_('Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten '
-                    'worden geobserveerd.'),
+        _("Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd."),
+        help_text=_(
+            "Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten "
+            "worden geobserveerd."
+        ),
         blank=True,
     )
 
     is_anonymous = models.BooleanField(
-        _('Wordt er anoniem geobserveerd?'),
+        _("Wordt er anoniem geobserveerd?"),
         help_text=_(
-            'Zoals zou kunnen voorkomen op fora en de onderzoeker ook een account heeft.'),
+            "Zoals zou kunnen voorkomen op fora en de onderzoeker ook een account heeft."
+        ),
         default=False,
     )
 
     is_anonymous_details = models.TextField(
-        _('Licht toe'),
+        _("Licht toe"),
         blank=True,
     )
 
     is_in_target_group = models.BooleanField(
-        _('Doet de onderzoeker zich voor als behorende tot de doelgroep?'),
+        _("Doet de onderzoeker zich voor als behorende tot de doelgroep?"),
         default=False,
     )
 
     is_in_target_group_details = models.TextField(
-        _('Licht toe'),
+        _("Licht toe"),
         blank=True,
     )
 
     is_nonpublic_space = models.BooleanField(
-        _('Wordt er geobserveerd in een niet-openbare ruimte?'),
-        help_text=_('Bijvoorbeeld er wordt geobserveerd bij iemand thuis, \
+        _("Wordt er geobserveerd in een niet-openbare ruimte?"),
+        help_text=_(
+            "Bijvoorbeeld er wordt geobserveerd bij iemand thuis, \
 tijdens een hypotheekgesprek, tijdens politieverhoren of een forum waar \
-een account voor moet worden aangemaakt.'),
+een account voor moet worden aangemaakt."
+        ),
         default=False,
     )
 
     is_nonpublic_space_details = models.TextField(
-        _('Licht toe'),
+        _("Licht toe"),
         blank=True,
     )
 
     has_advanced_consent = models.BooleanField(
-        _('Vindt informed consent van tevoren plaats?'),
+        _("Vindt informed consent van tevoren plaats?"),
         default=True,
     )
 
     has_advanced_consent_details = models.TextField(
         _(
-            'Leg uit waarom informed consent niet van te voren plaatsvindt en '
-            'geef ook op welke wijze dit achteraf verzorgd wordt.'
+            "Leg uit waarom informed consent niet van te voren plaatsvindt en "
+            "geef ook op welke wijze dit achteraf verzorgd wordt."
         ),
         blank=True,
     )
 
     needs_approval = models.BooleanField(
-        _('Heb je toestemming nodig van een (samenwerkende) instantie \
-om deze observatie te mogen uitvoeren?'),
+        _(
+            "Heb je toestemming nodig van een (samenwerkende) instantie \
+om deze observatie te mogen uitvoeren?"
+        ),
         default=False,
     )
 
     approval_institution = models.CharField(
-        _('Welke instantie?'),
+        _("Welke instantie?"),
         max_length=200,
         blank=True,
     )
 
     approval_document = models.FileField(
-        _('Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)'),
+        _("Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)"),
         blank=True,
         validators=[validate_pdf_or_doc],
     )
 
     registrations = models.ManyToManyField(
         Registration,
-        help_text=_("Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>."),
-        verbose_name=_('Hoe wordt het gedrag geregistreerd?'))
+        help_text=_(
+            "Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>."
+        ),
+        verbose_name=_("Hoe wordt het gedrag geregistreerd?"),
+    )
 
-    registrations_details = models.CharField(
-        _('Namelijk'),
-        max_length=200,
-        blank=True)
+    registrations_details = models.CharField(_("Namelijk"), max_length=200, blank=True)
 
     # Legacy, only used in v1
     days = models.PositiveIntegerField(
-        _('Op hoeveel dagen wordt er geobserveerd (per deelnemer)?'),
+        _("Op hoeveel dagen wordt er geobserveerd (per deelnemer)?"),
         blank=True,
-        null=True)
+        null=True,
+    )
     mean_hours = models.DecimalField(
-        _('Hoeveel uur wordt er gemiddeld per dag geobserveerd?'),
+        _("Hoeveel uur wordt er gemiddeld per dag geobserveerd?"),
         max_digits=4,
         decimal_places=2,
         validators=[MaxValueValidator(24)],
         blank=True,
-        null=True)
+        null=True,
+    )
 
     # References
-    study = models.OneToOneField(
-        Study,
-        on_delete=models.CASCADE)
+    study = models.OneToOneField(Study, on_delete=models.CASCADE)
diff --git a/observations/tests.py b/observations/tests.py
index 2701b0627..b7dbda4a6 100644
--- a/observations/tests.py
+++ b/observations/tests.py
@@ -5,10 +5,10 @@
 class ObservationTestCase(TestCase):
     def test_create(self):
         pk = 1
-        response = self.client.get(reverse('observations:create', args=(pk,)))
+        response = self.client.get(reverse("observations:create", args=(pk,)))
         self.assertEqual(response.status_code, 302)
 
     def test_update(self):
         pk = 1
-        response = self.client.get(reverse('observations:update', args=(pk,)))
+        response = self.client.get(reverse("observations:update", args=(pk,)))
         self.assertEqual(response.status_code, 302)
diff --git a/observations/translation.py b/observations/translation.py
index a71d34b5c..c97e9aac6 100644
--- a/observations/translation.py
+++ b/observations/translation.py
@@ -5,4 +5,4 @@
 
 @register(Registration)
 class RegistrationTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
diff --git a/observations/urls.py b/observations/urls.py
index fb52506c7..05c991352 100644
--- a/observations/urls.py
+++ b/observations/urls.py
@@ -2,11 +2,10 @@
 
 from .views import ObservationCreate, ObservationUpdate, AttachmentsUpdate
 
-app_name = 'observations'
+app_name = "observations"
 
 urlpatterns = [
-    path('create/<int:pk>/', ObservationCreate.as_view(), name='create'),
-    path('update/<int:pk>/', ObservationUpdate.as_view(), name='update'),
-    path('attachments/<int:pk>/', AttachmentsUpdate.as_view(),
-         name='attachments')
+    path("create/<int:pk>/", ObservationCreate.as_view(), name="create"),
+    path("update/<int:pk>/", ObservationUpdate.as_view(), name="update"),
+    path("attachments/<int:pk>/", AttachmentsUpdate.as_view(), name="attachments"),
 ]
diff --git a/observations/utils.py b/observations/utils.py
index 6bfe00f29..509c8f95e 100644
--- a/observations/utils.py
+++ b/observations/utils.py
@@ -5,12 +5,12 @@
 
 
 def observation_url(study):
-    result = AvailableURL(title=_('Observatieonderzoek'), margin=2)
+    result = AvailableURL(title=_("Observatieonderzoek"), margin=2)
     if study.has_observation:
-        if hasattr(study, 'observation'):
-            result.url = reverse('observations:update', args=(study.observation.pk,))
+        if hasattr(study, "observation"):
+            result.url = reverse("observations:update", args=(study.observation.pk,))
         else:
-            result.url = reverse('observations:create', args=(study.pk,))
+            result.url = reverse("observations:create", args=(study.pk,))
     return result
 
 
diff --git a/observations/views.py b/observations/views.py
index 7cf9269d7..0121ff727 100644
--- a/observations/views.py
+++ b/observations/views.py
@@ -15,38 +15,39 @@
 #############################
 class ObservationMixin(object):
     """Mixin for a Observation, to use in both ObservationCreate and ObservationUpdate below"""
+
     model = Observation
     form_class = ObservationForm
-    success_message = _('Observatie opgeslagen')
+    success_message = _("Observatie opgeslagen")
 
     def get_context_data(self, **kwargs):
         """Setting the Study and progress on the context"""
         context = super(ObservationMixin, self).get_context_data(**kwargs)
         study = self.get_study()
-        context['study'] = study
-        context['progress'] = get_study_progress(study) + 5
+        context["study"] = study
+        context["progress"] = get_study_progress(study) + 5
         return context
 
     def get_form_kwargs(self):
         """Sets the Study as a form kwarg"""
         kwargs = super(ObservationMixin, self).get_form_kwargs()
-        kwargs['study'] = self.get_study()
+        kwargs["study"] = self.get_study()
         return kwargs
 
     def get_next_url(self):
         study = self.get_study()
-        next_url = 'studies:design_end'
+        next_url = "studies:design_end"
         pk = study.pk
         if study.has_sessions:
-            next_url = 'studies:session_start'
+            next_url = "studies:session_start"
         return reverse(next_url, args=(pk,))
 
     def get_back_url(self):
         study = self.get_study()
         pk = study.pk
-        next_url = 'studies:design'
+        next_url = "studies:design"
         if study.has_intervention:
-            next_url = 'interventions:update'
+            next_url = "interventions:update"
             pk = study.intervention.pk
         return reverse(next_url, args=(pk,))
 
@@ -56,7 +57,7 @@ def get_study(self):
 
 class AttachmentsUpdate(UpdateView):
     model = Observation
-    template_name = 'observations/observation_update_attachments.html'
+    template_name = "observations/observation_update_attachments.html"
     form_class = ObservationUpdateAttachmentsForm
     group_required = settings.GROUP_SECRETARY
 
@@ -71,7 +72,7 @@ def form_valid(self, form):
 
     def get_study(self):
         """Retrieves the Study from the pk kwarg"""
-        return Study.objects.get(pk=self.kwargs['pk'])
+        return Study.objects.get(pk=self.kwargs["pk"])
 
 
 class ObservationUpdate(ObservationMixin, AllowErrorsOnBackbuttonMixin, UpdateView):
diff --git a/proposals/admin.py b/proposals/admin.py
index 08e525038..c801ed8d1 100644
--- a/proposals/admin.py
+++ b/proposals/admin.py
@@ -5,33 +5,54 @@
 
 @admin.register(Relation)
 class RelationAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'needs_supervisor', 'check_in_course', 'check_pre_assessment', )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "needs_supervisor",
+        "check_in_course",
+        "check_pre_assessment",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
+
 
 @admin.register(StudentContext)
 class StudentContextAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'needs_details', )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "needs_details",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
 
 
 @admin.register(Funding)
 class FundingAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'needs_details', 'needs_name', 'requires_review', )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "needs_details",
+        "needs_name",
+        "requires_review",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
 
 
 @admin.register(Proposal)
 class ProposalAdmin(admin.ModelAdmin):
-    list_display = ('reference_number', 'title', 'created_by', 'supervisor')
-    list_display_links = ('reference_number', )
-    ordering = ['reference_number']
+    list_display = ("reference_number", "title", "created_by", "supervisor")
+    list_display_links = ("reference_number",)
+    ordering = ["reference_number"]
 
 
 @admin.register(Institution)
 class ProposalAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'reviewing_chamber',  )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "reviewing_chamber",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
diff --git a/proposals/api/serializers.py b/proposals/api/serializers.py
index 173e5270a..6be309a3a 100644
--- a/proposals/api/serializers.py
+++ b/proposals/api/serializers.py
@@ -2,19 +2,31 @@
 
 from main.serializers import UserSerializer
 from proposals.models import Proposal
-from reviews.api.serializers import InlineReviewSerializer, \
-    InlineDecisionSerializer
+from reviews.api.serializers import InlineReviewSerializer, InlineDecisionSerializer
 from uil.core.rest.serializers import ModelDisplaySerializer
 
 
 class ProposalInlineSerializer(ModelDisplaySerializer):
     class Meta:
         model = Proposal
-        fields = ['pk', 'reference_number', 'title', 'is_revision',
-                  'type', 'date_confirmed', 'date_submitted',
-                  'date_reviewed', 'date_modified', 'latest_review',
-                  'supervisor_decision', 'applicants', 'status', 'supervisor',
-                  'pdf', 'in_archive']
+        fields = [
+            "pk",
+            "reference_number",
+            "title",
+            "is_revision",
+            "type",
+            "date_confirmed",
+            "date_submitted",
+            "date_reviewed",
+            "date_modified",
+            "latest_review",
+            "supervisor_decision",
+            "applicants",
+            "status",
+            "supervisor",
+            "pdf",
+            "in_archive",
+        ]
 
     latest_review = serializers.SerializerMethodField()
     supervisor = serializers.SerializerMethodField()
@@ -22,7 +34,6 @@ class Meta:
     applicants = serializers.SerializerMethodField()
     pdf = serializers.SerializerMethodField()
 
-
     def get_latest_review(self, proposal):
         review = proposal.latest_review()
 
@@ -63,12 +74,28 @@ def get_pdf(self, proposal):
 class ProposalSerializer(ProposalInlineSerializer):
     class Meta:
         model = Proposal
-        fields = ['pk', 'reference_number', 'title', 'is_revision', 'type',
-                  'date_confirmed', 'date_submitted',
-                  'date_submitted_supervisor', 'date_reviewed', 'date_modified',
-                  'parent', 'latest_review', 'supervisor_decision',
-                  'applicants', 'status', 'supervisor', 'continue_url',
-                  'pdf', 'in_archive', 'is_revisable']
+        fields = [
+            "pk",
+            "reference_number",
+            "title",
+            "is_revision",
+            "type",
+            "date_confirmed",
+            "date_submitted",
+            "date_submitted_supervisor",
+            "date_reviewed",
+            "date_modified",
+            "parent",
+            "latest_review",
+            "supervisor_decision",
+            "applicants",
+            "status",
+            "supervisor",
+            "continue_url",
+            "pdf",
+            "in_archive",
+            "is_revisable",
+        ]
 
     parent = serializers.SerializerMethodField()
 
diff --git a/proposals/api/urls.py b/proposals/api/urls.py
index 2415170aa..ddcad55c4 100644
--- a/proposals/api/urls.py
+++ b/proposals/api/urls.py
@@ -1,33 +1,23 @@
 from django.urls import path
 
-from .views import ProposalArchiveApiView, MyConceptsApiView, \
-    MySubmittedApiView, MyCompletedApiView, MySupervisedApiView, \
-    MyPracticeApiView, MyProposalsApiView
+from .views import (
+    ProposalArchiveApiView,
+    MyConceptsApiView,
+    MySubmittedApiView,
+    MyCompletedApiView,
+    MySupervisedApiView,
+    MyPracticeApiView,
+    MyProposalsApiView,
+)
 
-app_name = 'api'
+app_name = "api"
 
 urlpatterns = [
-    path('archive/<str:committee>/',
-         ProposalArchiveApiView.as_view(),
-         name='archive'),
-
-    path('my_archive/',
-         MyProposalsApiView.as_view(),
-         name='my_archive'),
-    path('my_concepts/',
-         MyConceptsApiView.as_view(),
-         name='my_concepts'),
-    path('my_submitted/',
-         MySubmittedApiView.as_view(),
-         name='my_submitted'),
-    path('my_completed/',
-         MyCompletedApiView.as_view(),
-         name='my_completed'),
-    path('my_supervised/',
-         MySupervisedApiView.as_view(),
-         name='my_supervised'),
-    path('my_practice/',
-         MyPracticeApiView.as_view(),
-         name='my_practice'),
-
+    path("archive/<str:committee>/", ProposalArchiveApiView.as_view(), name="archive"),
+    path("my_archive/", MyProposalsApiView.as_view(), name="my_archive"),
+    path("my_concepts/", MyConceptsApiView.as_view(), name="my_concepts"),
+    path("my_submitted/", MySubmittedApiView.as_view(), name="my_submitted"),
+    path("my_completed/", MyCompletedApiView.as_view(), name="my_completed"),
+    path("my_supervised/", MySupervisedApiView.as_view(), name="my_supervised"),
+    path("my_practice/", MyPracticeApiView.as_view(), name="my_practice"),
 ]
diff --git a/proposals/api/views.py b/proposals/api/views.py
index 19ef2f458..47693495e 100644
--- a/proposals/api/views.py
+++ b/proposals/api/views.py
@@ -15,67 +15,66 @@
 
 
 class BaseProposalsApiView(LoginRequiredMixin, FancyListApiView):
-    authentication_classes = (SessionAuthentication, )
+    authentication_classes = (SessionAuthentication,)
     serializer_class = ProposalSerializer
 
     sort_definitions = [
-        FancyListApiView.SortDefinition(
-            'date_submitted',
-            _('Datum ingediend')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_reviewed',
-            _('Datum afgerond')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_modified',
-            _('Laatst bijgewerkt')
-        ),
+        FancyListApiView.SortDefinition("date_submitted", _("Datum ingediend")),
+        FancyListApiView.SortDefinition("date_reviewed", _("Datum afgerond")),
+        FancyListApiView.SortDefinition("date_modified", _("Laatst bijgewerkt")),
     ]
-    default_sort = ('date_modified', 'desc')
+    default_sort = ("date_modified", "desc")
 
     def get_my_proposals(self):
-        return Proposal.objects.filter(
-            Q(applicants=self.request.user) | Q(supervisor=self.request.user)
-        ).distinct().select_related(  # this optimizes the loading a bit
-            'supervisor', 'parent', 'relation',
-            'parent__supervisor', 'parent__relation',
-        ).prefetch_related(
-            'applicants', 'review_set', 'parent__review_set', 'study_set',
-            'study_set__observation', 'study_set__session_set',
-            'study_set__intervention', 'study_set__session_set__task_set'
+        return (
+            Proposal.objects.filter(
+                Q(applicants=self.request.user) | Q(supervisor=self.request.user)
+            )
+            .distinct()
+            .select_related(  # this optimizes the loading a bit
+                "supervisor",
+                "parent",
+                "relation",
+                "parent__supervisor",
+                "parent__relation",
+            )
+            .prefetch_related(
+                "applicants",
+                "review_set",
+                "parent__review_set",
+                "study_set",
+                "study_set__observation",
+                "study_set__session_set",
+                "study_set__intervention",
+                "study_set__session_set__task_set",
+            )
         )
 
     def get_context(self):
         context = super().get_context()
 
-        context['is_secretary'] = is_secretary(self.request.user)
-        context['proposal'] = {
-            'SUBMITTED_TO_SUPERVISOR': Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
-            'DECISION_MADE': Proposal.Statuses.DECISION_MADE,
+        context["is_secretary"] = is_secretary(self.request.user)
+        context["proposal"] = {
+            "SUBMITTED_TO_SUPERVISOR": Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
+            "DECISION_MADE": Proposal.Statuses.DECISION_MADE,
         }
-        context['review'] = {
-            'REVISION': Review.Continuations.REVISION,
+        context["review"] = {
+            "REVISION": Review.Continuations.REVISION,
         }
-        context['user_pk'] = self.request.user.pk
+        context["user_pk"] = self.request.user.pk
 
         return context
 
 
 class MyProposalsApiView(BaseProposalsApiView):
-
     def get_queryset(self):
         """Returns all Proposals for the current User"""
         return self.get_my_proposals()
 
 
 class MyConceptsApiView(BaseProposalsApiView):
-
     sort_definitions = [
-        FancyListApiView.SortDefinition(
-            'date_modified',
-            _('Laatst bijgewerkt')
-        ),
+        FancyListApiView.SortDefinition("date_modified", _("Laatst bijgewerkt")),
     ]
 
     def get_queryset(self):
@@ -87,27 +86,20 @@ def get_queryset(self):
 
 class MySubmittedApiView(BaseProposalsApiView):
     sort_definitions = [
-        FancyListApiView.SortDefinition(
-            'date_submitted',
-            _('Datum ingediend')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_modified',
-            _('Laatst bijgewerkt')
-        ),
+        FancyListApiView.SortDefinition("date_submitted", _("Datum ingediend")),
+        FancyListApiView.SortDefinition("date_modified", _("Laatst bijgewerkt")),
     ]
-    default_sort = ('date_submitted', 'desc')
+    default_sort = ("date_submitted", "desc")
 
     def get_queryset(self):
         """Returns all submitted Proposals for the current User"""
         return self.get_my_proposals().filter(
             status__gte=Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
-            status__lt=Proposal.Statuses.DECISION_MADE
+            status__lt=Proposal.Statuses.DECISION_MADE,
         )
 
 
 class MyCompletedApiView(BaseProposalsApiView):
-
     def get_queryset(self):
         """Returns all completed Proposals for the current User"""
         return self.get_my_proposals().filter(
@@ -117,66 +109,44 @@ def get_queryset(self):
 
 class MySupervisedApiView(BaseProposalsApiView):
     sort_definitions = [
+        FancyListApiView.SortDefinition("date_submitted", _("Datum ingediend")),
         FancyListApiView.SortDefinition(
-            'date_submitted',
-            _('Datum ingediend')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_submitted_supervisor',
-            _('Datum ingediend bij eindverantwoordelijke')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_reviewed',
-            _('Datum afgerond')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_modified',
-            _('Laatst bijgewerkt')
+            "date_submitted_supervisor", _("Datum ingediend bij eindverantwoordelijke")
         ),
+        FancyListApiView.SortDefinition("date_reviewed", _("Datum afgerond")),
+        FancyListApiView.SortDefinition("date_modified", _("Laatst bijgewerkt")),
     ]
-    default_sort = ('date_submitted_supervisor', 'desc')
+    default_sort = ("date_submitted_supervisor", "desc")
 
     def get_context(self):
         context = super().get_context()
-        context['wants_route_info'] = True
+        context["wants_route_info"] = True
         return context
 
     def get_queryset(self):
         """Returns all Proposals supervised by the current User"""
-        return Proposal.objects.filter(
-            supervisor=self.request.user
-        )
+        return Proposal.objects.filter(supervisor=self.request.user)
 
 
 class MyPracticeApiView(BaseProposalsApiView):
     sort_definitions = [
-        FancyListApiView.SortDefinition(
-            'date_modified',
-            _('Laatst bijgewerkt')
-        ),
+        FancyListApiView.SortDefinition("date_modified", _("Laatst bijgewerkt")),
     ]
 
     def get_queryset(self):
         """Returns all practice Proposals for the current User"""
         return Proposal.objects.filter(
             Q(in_course=True) | Q(is_exploration=True),
-            Q(applicants=self.request.user) |
-            Q(supervisor=self.request.user)
+            Q(applicants=self.request.user) | Q(supervisor=self.request.user),
         )
 
 
 class ProposalArchiveApiView(CommitteeMixin, BaseProposalsApiView):
     sort_definitions = [
-        FancyListApiView.SortDefinition(
-            'date_submitted',
-            _('Datum ingediend')
-        ),
-        FancyListApiView.SortDefinition(
-            'date_reviewed',
-            _('Datum afgerond')
-        ),
+        FancyListApiView.SortDefinition("date_submitted", _("Datum ingediend")),
+        FancyListApiView.SortDefinition("date_reviewed", _("Datum afgerond")),
     ]
-    default_sort = ('date_reviewed', 'desc')
+    default_sort = ("date_reviewed", "desc")
 
     def get(self, *args, **kwargs):
         return super().get(*args, **kwargs)
diff --git a/proposals/copy.py b/proposals/copy.py
index 9b866be53..612a1dd28 100644
--- a/proposals/copy.py
+++ b/proposals/copy.py
@@ -18,13 +18,11 @@ def copy_proposal(original_proposal, is_revision, created_by_user):
     copy_proposal.pk = None
 
     copy_wmo = None
-    if hasattr(original_proposal, 'wmo'):
+    if hasattr(original_proposal, "wmo"):
         copy_wmo = original_proposal.wmo
 
     if is_revision:
-        copy_proposal.reference_number = generate_revision_ref_number(
-            original_proposal
-        )
+        copy_proposal.reference_number = generate_revision_ref_number(original_proposal)
     else:
         copy_proposal.reference_number = generate_ref_number()
 
diff --git a/proposals/field.py b/proposals/field.py
index 1c7d6a245..89b097cad 100644
--- a/proposals/field.py
+++ b/proposals/field.py
@@ -11,16 +11,11 @@ class ParentChoiceModelField(ModelChoiceField):
     This is done so we don't have to change the default __str__, just
     to make this form different.
     """
+
     def label_from_instance(self, obj: Proposal):
         last_modified = obj.date_modified.strftime("%b %d %Y %H:%M")
         if obj.is_practice():
-            return '{} - {} ({}) (Practice)'.format(
-                obj.reference_number,
-                obj.title,
-                last_modified
+            return "{} - {} ({}) (Practice)".format(
+                obj.reference_number, obj.title, last_modified
             )
-        return '{} - {} ({})'.format(
-            obj.reference_number,
-            obj.title,
-            last_modified
-        )
+        return "{} - {} ({})".format(obj.reference_number, obj.title, last_modified)
diff --git a/proposals/forms.py b/proposals/forms.py
index 7bb060281..9adf50bbb 100644
--- a/proposals/forms.py
+++ b/proposals/forms.py
@@ -10,6 +10,7 @@
 from django.utils.safestring import mark_safe
 from django.utils import timezone
 from datetime import timedelta
+
 mark_safe_lazy = lazy(mark_safe, str)
 
 from main.forms import ConditionalModelForm, SoftValidationMixin
@@ -23,61 +24,76 @@
 
 from cdh.core.forms import DateField
 
-class ProposalForm(UserKwargModelFormMixin, SoftValidationMixin,
-                   ConditionalModelForm):
+
+class ProposalForm(UserKwargModelFormMixin, SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Proposal
         fields = [
-            'is_pre_approved',
-            'institution',
-            'relation', 'student_program', 'student_context',
-            'student_context_details', 'student_justification',
-            'supervisor', 'other_applicants', 'applicants',
-            'other_stakeholders', 'stakeholders',
-            'date_start', 'title',
-            'summary', 'pre_assessment_pdf',
-            'funding', 'funding_details', 'funding_name',
-            'pre_approval_institute', 'pre_approval_pdf', 'self_assessment',
+            "is_pre_approved",
+            "institution",
+            "relation",
+            "student_program",
+            "student_context",
+            "student_context_details",
+            "student_justification",
+            "supervisor",
+            "other_applicants",
+            "applicants",
+            "other_stakeholders",
+            "stakeholders",
+            "date_start",
+            "title",
+            "summary",
+            "pre_assessment_pdf",
+            "funding",
+            "funding_details",
+            "funding_name",
+            "pre_approval_institute",
+            "pre_approval_pdf",
+            "self_assessment",
         ]
         labels = {
-            'other_stakeholders': mark_safe_lazy(_('Zijn er nog andere onderzoekers bij deze aanvraag betrokken ' \
-          'die <strong>niet</strong> geaffilieerd zijn aan een van de ' \
-          'onderzoeksinstituten van de Faculteit Geestwetenschappen van de ' \
-          'UU? ')),
-            }
+            "other_stakeholders": mark_safe_lazy(
+                _(
+                    "Zijn er nog andere onderzoekers bij deze aanvraag betrokken "
+                    "die <strong>niet</strong> geaffilieerd zijn aan een van de "
+                    "onderzoeksinstituten van de Faculteit Geestwetenschappen van de "
+                    "UU? "
+                )
+            ),
+        }
         widgets = {
-            'is_pre_approved':    forms.RadioSelect(choices=YES_NO),
-            'institution':        forms.RadioSelect(),
-            'relation':           forms.RadioSelect(),
-            'student_context':    forms.RadioSelect(),
-            'other_applicants':   forms.RadioSelect(choices=YES_NO),
-            'other_stakeholders': forms.RadioSelect(choices=YES_NO),
-            'summary':            forms.Textarea(attrs={
-                'cols': 50
-            }),
-            'funding':            forms.CheckboxSelectMultiple(),
-            'applicants':         SelectMultipleUser(),
-            'supervisor':         forms.Select(),
+            "is_pre_approved": forms.RadioSelect(choices=YES_NO),
+            "institution": forms.RadioSelect(),
+            "relation": forms.RadioSelect(),
+            "student_context": forms.RadioSelect(),
+            "other_applicants": forms.RadioSelect(choices=YES_NO),
+            "other_stakeholders": forms.RadioSelect(choices=YES_NO),
+            "summary": forms.Textarea(attrs={"cols": 50}),
+            "funding": forms.CheckboxSelectMultiple(),
+            "applicants": SelectMultipleUser(),
+            "supervisor": forms.Select(),
         }
         error_messages = {
-            'title': {
-                'unique': _('Er bestaat al een aanvraag met deze titel.'),
+            "title": {
+                "unique": _("Er bestaat al een aanvraag met deze titel."),
             },
         }
 
-    _soft_validation_fields = ['relation',
-                               'other_applicants',
-                               'other_stakeholders',
-                               'stakeholders',
-                               'summary',
-                               'pre_assessment_pdf',
-                               'funding',
-                               'funding_details',
-                               'funding_name',
-                               'pre_approval_institute',
-                               'pre_approval_pdf',
-                               'self_assessment',
-                               ]
+    _soft_validation_fields = [
+        "relation",
+        "other_applicants",
+        "other_stakeholders",
+        "stakeholders",
+        "summary",
+        "pre_assessment_pdf",
+        "funding",
+        "funding_details",
+        "funding_name",
+        "pre_approval_institute",
+        "pre_approval_pdf",
+        "self_assessment",
+    ]
 
     def __init__(self, *args, **kwargs):
         """
@@ -90,78 +106,77 @@ def __init__(self, *args, **kwargs):
         - Remove summary for preliminary assessment Proposals
         - Set pre_assessment_pdf required for preliminary assessment Proposals, otherwise remove
         """
-        in_course = kwargs.pop('in_course', False)
-        is_pre_approved = kwargs.pop('is_pre_approved', False)
+        in_course = kwargs.pop("in_course", False)
+        is_pre_approved = kwargs.pop("is_pre_approved", False)
 
         # First, try to determine this value from the kwargs. Otherwise, try
         # to get it from the instance. If that fails, assume False
         self.is_pre_assessment = kwargs.pop(
-            'is_pre_assessment',
-            getattr(
-                kwargs.get('instance'),
-                'is_pre_assessment',
-                False
-            )
+            "is_pre_assessment",
+            getattr(kwargs.get("instance"), "is_pre_assessment", False),
         )
 
-
         super(ProposalForm, self).__init__(*args, **kwargs)
-        self.fields['relation'].empty_label = None
-        self.fields['institution'].empty_label = None
-        self.fields['student_context'].empty_label = None
+        self.fields["relation"].empty_label = None
+        self.fields["institution"].empty_label = None
+        self.fields["student_context"].empty_label = None
 
         # Only revisions or amendments are allowed to have a title that's not
         # unique.
         if not self.instance or not self.instance.is_revision:
-            self.fields['title'].validators.append(
-                UniqueTitleValidator(self.instance)
-            )
+            self.fields["title"].validators.append(UniqueTitleValidator(self.instance))
 
         applicants = get_user_model().objects.all()
 
         supervisors = applicants.exclude(pk=self.user.pk)
 
-        instance = kwargs.get('instance')
+        instance = kwargs.get("instance")
 
-        self.fields['other_stakeholders'].label = mark_safe(
-            self.fields['other_stakeholders'].label)
+        self.fields["other_stakeholders"].label = mark_safe(
+            self.fields["other_stakeholders"].label
+        )
 
         # If you are already defined as a supervisor, we have to set it to you
         if instance is not None and instance.supervisor == self.user:
             supervisors = [self.user]
 
-        self.fields['supervisor'].choices = [(None, _(
-            'Selecteer...'))] + get_users_as_list(supervisors)
-        
-        self.fields['applicants'].choices = get_users_as_list(applicants)
+        self.fields["supervisor"].choices = [
+            (None, _("Selecteer..."))
+        ] + get_users_as_list(supervisors)
+
+        self.fields["applicants"].choices = get_users_as_list(applicants)
 
         if in_course:
-            self.fields['relation'].queryset = Relation.objects.filter(
-                check_in_course=True)
-            self.fields['supervisor'].label = _('Docent')
-            self.fields['supervisor'].help_text = _('Vul hier de docent van \
+            self.fields["relation"].queryset = Relation.objects.filter(
+                check_in_course=True
+            )
+            self.fields["supervisor"].label = _("Docent")
+            self.fields["supervisor"].help_text = _(
+                "Vul hier de docent van \
 de cursus in waarbinnen je deze portal moet doorlopen. De docent kan na afloop \
 de aanvraag inkijken in de portal. De studie zal niet in het semipublieke archief \
-van het FETC-GW worden opgenomen.')
+van het FETC-GW worden opgenomen."
+            )
 
         if self.is_pre_assessment:
-            self.fields['relation'].queryset = Relation.objects.filter(
-                check_pre_assessment=True)
-            self.fields['pre_assessment_pdf'].required = True
-            del self.fields['summary']
-            del self.fields['funding']
-            del self.fields['funding_details']
-            del self.fields['funding_name']
+            self.fields["relation"].queryset = Relation.objects.filter(
+                check_pre_assessment=True
+            )
+            self.fields["pre_assessment_pdf"].required = True
+            del self.fields["summary"]
+            del self.fields["funding"]
+            del self.fields["funding_details"]
+            del self.fields["funding_name"]
         else:
-            del self.fields['pre_assessment_pdf']
+            del self.fields["pre_assessment_pdf"]
 
         if is_pre_approved:
-            self.fields['pre_approval_institute'].required = True
-            self.fields['pre_approval_pdf'].required = True
+            self.fields["pre_approval_institute"].required = True
+            self.fields["pre_approval_pdf"].required = True
         else:
-            del self.fields['is_pre_approved']
-            del self.fields['pre_approval_institute']
-            del self.fields['pre_approval_pdf']
+            del self.fields["is_pre_approved"]
+            del self.fields["pre_approval_institute"]
+            del self.fields["pre_approval_pdf"]
 
     def clean(self):
         """
@@ -178,131 +193,142 @@ def clean(self):
         cleaned_data = super(ProposalForm, self).clean()
 
         if not self.is_pre_assessment:
-            self.mark_soft_required(cleaned_data, 'funding')
-            self.mark_soft_required(cleaned_data, 'summary')
+            self.mark_soft_required(cleaned_data, "funding")
+            self.mark_soft_required(cleaned_data, "summary")
+
+        self.mark_soft_required(cleaned_data, "relation")
+        self.mark_soft_required(cleaned_data, "date_start")
 
-        self.mark_soft_required(cleaned_data, 'relation')
-        self.mark_soft_required(cleaned_data, 'date_start')
+        relation = cleaned_data.get("relation")
+        supervisor = cleaned_data.get("supervisor")
 
-        relation = cleaned_data.get('relation')
-        supervisor = cleaned_data.get('supervisor')
-            
-        if relation and relation.needs_supervisor and \
-           not supervisor:
+        if relation and relation.needs_supervisor and not supervisor:
             error = forms.ValidationError(
-                _('Je dient een promotor/begeleider op te geven.'),
-                code='required')
-            self.add_error('supervisor', error)
+                _("Je dient een promotor/begeleider op te geven."), code="required"
+            )
+            self.add_error("supervisor", error)
 
-        if relation and relation.needs_supervisor and \
-            supervisor == self.user:
+        if relation and relation.needs_supervisor and supervisor == self.user:
             error = forms.ValidationError(
-                _('Je kunt niet jezelf als promotor/begeleider opgeven.')
+                _("Je kunt niet jezelf als promotor/begeleider opgeven.")
             )
-            self.add_error('supervisor', error)
+            self.add_error("supervisor", error)
 
         if relation.check_in_course:
-            self.mark_soft_required(cleaned_data, 'student_context')
-            self.mark_soft_required(cleaned_data, 'student_justification')
+            self.mark_soft_required(cleaned_data, "student_context")
+            self.mark_soft_required(cleaned_data, "student_justification")
 
-        other_applicants = cleaned_data.get('other_applicants')
-        applicants = cleaned_data.get('applicants')
+        other_applicants = cleaned_data.get("other_applicants")
+        applicants = cleaned_data.get("applicants")
 
         # Always make sure the applicant is actually in the applicants list
         if self.user not in applicants and self.user != supervisor:
             error = forms.ValidationError(
-                _('Je hebt jezelf niet als onderzoekers geselecteerd.'),
-                code='required')
-            self.add_error('applicants', error)
+                _("Je hebt jezelf niet als onderzoekers geselecteerd."), code="required"
+            )
+            self.add_error("applicants", error)
         elif other_applicants and len(applicants) == 1:
             error = forms.ValidationError(
-                _('Je hebt geen andere onderzoekers geselecteerd.'),
-                code='required')
-            self.add_error('applicants', error)
+                _("Je hebt geen andere onderzoekers geselecteerd."), code="required"
+            )
+            self.add_error("applicants", error)
 
         # Add an error if self_assessment is missing
-        self_assessment = cleaned_data.get('self_assessment')
-        if self_assessment == '':
+        self_assessment = cleaned_data.get("self_assessment")
+        if self_assessment == "":
             self.add_error(
-                'self_assessment',
+                "self_assessment",
                 forms.ValidationError(
-                    _('Dit veld is verplicht, maar je kunt later terugkomen om hem \
-                    verder in te vullen.'),
-                    code='required',
-                )
+                    _(
+                        "Dit veld is verplicht, maar je kunt later terugkomen om hem \
+                    verder in te vullen."
+                    ),
+                    code="required",
+                ),
             )
 
-        if 'is_pre_approved' in cleaned_data:
-            if not cleaned_data['is_pre_approved']:
+        if "is_pre_approved" in cleaned_data:
+            if not cleaned_data["is_pre_approved"]:
                 error = forms.ValidationError(
                     _(
-                        'Indien je geen toestemming hebt van een andere ethische commissie, dien je het normale formulier in '
+                        "Indien je geen toestemming hebt van een andere ethische commissie, dien je het normale formulier in "
                         'te vullen. Ga terug naar de startpagina, en selecteer "Een nieuwe aanvraag aanmelden (from scratch in '
-                        'een leeg formulier)" of "Een nieuwe aanvraag aanmelden (vanuit een kopie van een oude aanvraag)".')
+                        'een leeg formulier)" of "Een nieuwe aanvraag aanmelden (vanuit een kopie van een oude aanvraag)".'
+                    )
                 )
-                self.add_error('is_pre_approved', error)
-
-            self.check_dependency(cleaned_data, 'is_pre_approved',
-                                  'pre_approval_pdf')
-            self.check_dependency(cleaned_data, 'is_pre_approved',
-                                  'pre_approval_institute')
-
-        self.check_dependency(cleaned_data, 'other_stakeholders',
-                              'stakeholders')
-        self.check_dependency_multiple(cleaned_data, 'funding', 'needs_details',
-                                       'funding_details')
-        self.check_dependency_multiple(cleaned_data, 'funding', 'needs_name',
-                                       'funding_name')
-        self.check_dependency_singular(cleaned_data, 'relation', 'check_in_course',
-                                       'student_program')
-        self.check_dependency_singular(cleaned_data, 'student_context', 'needs_details',
-                                       'student_context_details')
-        self.check_dependency_singular(cleaned_data, 'relation', 'check_in_course',
-                                       'student_justification')
+                self.add_error("is_pre_approved", error)
+
+            self.check_dependency(cleaned_data, "is_pre_approved", "pre_approval_pdf")
+            self.check_dependency(
+                cleaned_data, "is_pre_approved", "pre_approval_institute"
+            )
+
+        self.check_dependency(cleaned_data, "other_stakeholders", "stakeholders")
+        self.check_dependency_multiple(
+            cleaned_data, "funding", "needs_details", "funding_details"
+        )
+        self.check_dependency_multiple(
+            cleaned_data, "funding", "needs_name", "funding_name"
+        )
+        self.check_dependency_singular(
+            cleaned_data, "relation", "check_in_course", "student_program"
+        )
+        self.check_dependency_singular(
+            cleaned_data, "student_context", "needs_details", "student_context_details"
+        )
+        self.check_dependency_singular(
+            cleaned_data, "relation", "check_in_course", "student_justification"
+        )
 
 
 class ProposalStartPracticeForm(forms.Form):
     practice_reason = forms.ChoiceField(
-        label=_('Ik maak een oefenaanvraag aan'),
+        label=_("Ik maak een oefenaanvraag aan"),
         choices=Proposal.PracticeReasons.choices,
-        widget=forms.RadioSelect())
+        widget=forms.RadioSelect(),
+    )
 
 
 class BaseProposalCopyForm(UserKwargModelFormMixin, forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = ['parent', 'is_revision']
+        fields = ["parent", "is_revision"]
         widgets = {
-            'is_revision': forms.HiddenInput(),
+            "is_revision": forms.HiddenInput(),
         }
 
     parent = ParentChoiceModelField(
         queryset=Proposal.objects.all(),
-        label=_('Te kopiëren aanvraag'),
+        label=_("Te kopiëren aanvraag"),
         help_text=_(
-            'Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende '
-            'bent.'
+            "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende " "bent."
         ),
     )
 
     def __init__(self, *args, **kwargs):
         super(BaseProposalCopyForm, self).__init__(*args, **kwargs)
 
-        self.fields['parent'].queryset = self._get_parent_queryset()
+        self.fields["parent"].queryset = self._get_parent_queryset()
 
     def _get_parent_queryset(self):
         # Return all non-pre-assessments, that are not currently in review
-        return Proposal.objects.filter(
-            is_pre_assessment=False
-        ).filter(
-            Q(applicants=self.user, ) | Q(supervisor=self.user)
-        ).filter(
-            Q(status=Proposal.Statuses.DRAFT) | Q(status__gte=Proposal.Statuses.DECISION_MADE)
-        ).distinct()
+        return (
+            Proposal.objects.filter(is_pre_assessment=False)
+            .filter(
+                Q(
+                    applicants=self.user,
+                )
+                | Q(supervisor=self.user)
+            )
+            .filter(
+                Q(status=Proposal.Statuses.DRAFT)
+                | Q(status__gte=Proposal.Statuses.DECISION_MADE)
+            )
+            .distinct()
+        )
 
 
 class ProposalCopyForm(BaseProposalCopyForm):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
         # Only revisions or amendments are allowed to have a title that's not
@@ -314,81 +340,92 @@ def __init__(self, *args, **kwargs):
 
 
 class RevisionProposalCopyForm(BaseProposalCopyForm):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields['parent'].label = _('Te reviseren aanvraag')
-        self.fields['parent'].help_text = _('Dit veld toont enkel ingediende,'
-                                            ' (nog) niet goedgekeurde aanvragen '
-                                            'waar jij een '
-                                            'medeuitvoerende bent.')
+        self.fields["parent"].label = _("Te reviseren aanvraag")
+        self.fields["parent"].help_text = _(
+            "Dit veld toont enkel ingediende,"
+            " (nog) niet goedgekeurde aanvragen "
+            "waar jij een "
+            "medeuitvoerende bent."
+        )
 
     def _get_parent_queryset(self):
         # Select non-pre-assessments that have been reviewed and rejected and
         # haven't been parented yet.
         # Those are eligible for revisions
-        return Proposal.objects.filter(
-            is_pre_assessment=False,
-            status=Proposal.Statuses.DECISION_MADE,
-            status_review=False,
-            children__isnull=True,
-        ).filter(
-            Q(applicants=self.user, ) | Q(supervisor=self.user)
-        ).distinct()
+        return (
+            Proposal.objects.filter(
+                is_pre_assessment=False,
+                status=Proposal.Statuses.DECISION_MADE,
+                status_review=False,
+                children__isnull=True,
+            )
+            .filter(
+                Q(
+                    applicants=self.user,
+                )
+                | Q(supervisor=self.user)
+            )
+            .distinct()
+        )
 
 
 class AmendmentProposalCopyForm(BaseProposalCopyForm):
-
     def __init__(self, *args, **kwargs):
         super().__init__(*args, **kwargs)
 
-        self.fields['parent'].label = _('Te amenderen aanvraag')
-        self.fields['parent'].help_text = _('Dit veld toont enkel goedgekeurde'
-                                            ' aanvragen waar je zelf een '
-                                            'medeuitvoerende bent.')
+        self.fields["parent"].label = _("Te amenderen aanvraag")
+        self.fields["parent"].help_text = _(
+            "Dit veld toont enkel goedgekeurde"
+            " aanvragen waar je zelf een "
+            "medeuitvoerende bent."
+        )
 
     def _get_parent_queryset(self):
         # Select non-pre-assessments that have been reviewed and approved and
         # haven't been parented yet.
         # Those are eligible for amendments
-        return Proposal.objects.filter(
-            is_pre_assessment=False,
-            status_review=True,
-            children__isnull=True,
-        ).filter(
-            Q(applicants=self.user, ) | Q(supervisor=self.user)
-        ).distinct()
+        return (
+            Proposal.objects.filter(
+                is_pre_assessment=False,
+                status_review=True,
+                children__isnull=True,
+            )
+            .filter(
+                Q(
+                    applicants=self.user,
+                )
+                | Q(supervisor=self.user)
+            )
+            .distinct()
+        )
 
 
 class ProposalConfirmationForm(forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = ['date_confirmed', 'confirmation_comments']
+        fields = ["date_confirmed", "confirmation_comments"]
 
 
 class WmoForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Wmo
-        fields = [
-            'metc', 'metc_details', 'metc_institution',
-            'is_medical']
-        widgets = {
-            'metc':             forms.RadioSelect(),
-            'is_medical':       forms.RadioSelect()}
+        fields = ["metc", "metc_details", "metc_institution", "is_medical"]
+        widgets = {"metc": forms.RadioSelect(), "is_medical": forms.RadioSelect()}
 
-    _soft_validation_fields = ['metc_details', 'metc_institution',
-                               'is_medical']
+    _soft_validation_fields = ["metc_details", "metc_institution", "is_medical"]
 
     def __init__(self, *args, **kwargs):
         """
         - Remove empty label from is_medical/is_behavioristic field and reset the choices
         """
         super(WmoForm, self).__init__(*args, **kwargs)
-        self.fields['metc'].empty_label = None
-        self.fields['metc'].choices = YesNoDoubt.choices
-        self.fields['is_medical'].empty_label = None
-        self.fields['is_medical'].choices = YesNoDoubt.choices
+        self.fields["metc"].empty_label = None
+        self.fields["metc"].choices = YesNoDoubt.choices
+        self.fields["is_medical"].empty_label = None
+        self.fields["is_medical"].choices = YesNoDoubt.choices
 
     def clean(self):
         """
@@ -398,29 +435,37 @@ def clean(self):
         """
         cleaned_data = super(WmoForm, self).clean()
 
-        if 'metc' not in cleaned_data or not cleaned_data['metc']:
-            self.add_error('metc', _('Dit veld is verplicht om verder te '
-                                     'gaan.'))
+        if "metc" not in cleaned_data or not cleaned_data["metc"]:
+            self.add_error("metc", _("Dit veld is verplicht om verder te " "gaan."))
 
-        self.check_dependency(cleaned_data, 'metc', 'metc_details',
-                              f1_value=YesNoDoubt.YES)
-        self.check_dependency(cleaned_data, 'metc', 'metc_institution',
-                              f1_value=YesNoDoubt.YES,
-                              error_message=_(
-                                  'Je dient een instelling op te geven.'))
-        self.check_dependency_list(cleaned_data, 'metc', 'is_medical',
-                                   f1_value_list=[YesNoDoubt.NO, YesNoDoubt.DOUBT])
+        self.check_dependency(
+            cleaned_data, "metc", "metc_details", f1_value=YesNoDoubt.YES
+        )
+        self.check_dependency(
+            cleaned_data,
+            "metc",
+            "metc_institution",
+            f1_value=YesNoDoubt.YES,
+            error_message=_("Je dient een instelling op te geven."),
+        )
+        self.check_dependency_list(
+            cleaned_data,
+            "metc",
+            "is_medical",
+            f1_value_list=[YesNoDoubt.NO, YesNoDoubt.DOUBT],
+        )
 
 
 class WmoCheckForm(forms.ModelForm):
     class Meta:
         model = Wmo
         fields = [
-            'metc', 'is_medical',
+            "metc",
+            "is_medical",
         ]
         widgets = {
-            'metc':             forms.RadioSelect(),
-            'is_medical':       forms.RadioSelect(),
+            "metc": forms.RadioSelect(),
+            "is_medical": forms.RadioSelect(),
         }
 
     def __init__(self, *args, **kwargs):
@@ -428,28 +473,28 @@ def __init__(self, *args, **kwargs):
         - Remove empty label from is_medical/is_behavioristic field and reset the choices
         """
         super(WmoCheckForm, self).__init__(*args, **kwargs)
-        self.fields['is_medical'].empty_label = None
-        self.fields['is_medical'].choices = YesNoDoubt.choices
+        self.fields["is_medical"].empty_label = None
+        self.fields["is_medical"].choices = YesNoDoubt.choices
 
 
 class WmoApplicationForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Wmo
         fields = [
-            'metc_application',
-            'metc_decision',
-            'metc_decision_pdf',
+            "metc_application",
+            "metc_decision",
+            "metc_decision_pdf",
         ]
         widgets = {
-            'metc_application': forms.RadioSelect(choices=YES_NO),
-            'metc_decision':    forms.RadioSelect(choices=YES_NO),
+            "metc_application": forms.RadioSelect(choices=YES_NO),
+            "metc_decision": forms.RadioSelect(choices=YES_NO),
         }
 
     _soft_validation_fields = [
-        'metc_application',
-        'metc_decision',
-        'metc_decision_pdf',
-        ]
+        "metc_application",
+        "metc_decision",
+        "metc_decision_pdf",
+    ]
 
     def clean(self):
         """
@@ -461,49 +506,69 @@ def clean(self):
         # A PDF is always required for this form, but it's in ProposalSubmit
         # validation that this is actually rejected. Otherwise this is soft
         # validation
-        if cleaned_data['metc_decision_pdf'] == None:
+        if cleaned_data["metc_decision_pdf"] == None:
             from django.forms import ValidationError
-            self.add_error('metc_decision_pdf',
-                           ValidationError(
-                               _('In dit geval is een beslissing van een METC vereist'),
-                               )
-                           )
 
-        return cleaned_data # Sticking to Django conventions
+            self.add_error(
+                "metc_decision_pdf",
+                ValidationError(
+                    _("In dit geval is een beslissing van een METC vereist"),
+                ),
+            )
+
+        return cleaned_data  # Sticking to Django conventions
 
 
 class StudyStartForm(forms.ModelForm):
-    study_name_1 = forms.CharField(label=_('Naam traject 1'), max_length=15,
-                                   required=False)
-    study_name_2 = forms.CharField(label=_('Naam traject 2'), max_length=15,
-                                   required=False)
-    study_name_3 = forms.CharField(label=_('Naam traject 3'), max_length=15,
-                                   required=False)
-    study_name_4 = forms.CharField(label=_('Naam traject 4'), max_length=15,
-                                   required=False)
-    study_name_5 = forms.CharField(label=_('Naam traject 5'), max_length=15,
-                                   required=False)
-    study_name_6 = forms.CharField(label=_('Naam traject 6'), max_length=15,
-                                   required=False)
-    study_name_7 = forms.CharField(label=_('Naam traject 7'), max_length=15,
-                                   required=False)
-    study_name_8 = forms.CharField(label=_('Naam traject 8'), max_length=15,
-                                   required=False)
-    study_name_9 = forms.CharField(label=_('Naam traject 9'), max_length=15,
-                                   required=False)
-    study_name_10 = forms.CharField(label=_('Naam traject 10'), max_length=15,
-                                   required=False)
+    study_name_1 = forms.CharField(
+        label=_("Naam traject 1"), max_length=15, required=False
+    )
+    study_name_2 = forms.CharField(
+        label=_("Naam traject 2"), max_length=15, required=False
+    )
+    study_name_3 = forms.CharField(
+        label=_("Naam traject 3"), max_length=15, required=False
+    )
+    study_name_4 = forms.CharField(
+        label=_("Naam traject 4"), max_length=15, required=False
+    )
+    study_name_5 = forms.CharField(
+        label=_("Naam traject 5"), max_length=15, required=False
+    )
+    study_name_6 = forms.CharField(
+        label=_("Naam traject 6"), max_length=15, required=False
+    )
+    study_name_7 = forms.CharField(
+        label=_("Naam traject 7"), max_length=15, required=False
+    )
+    study_name_8 = forms.CharField(
+        label=_("Naam traject 8"), max_length=15, required=False
+    )
+    study_name_9 = forms.CharField(
+        label=_("Naam traject 9"), max_length=15, required=False
+    )
+    study_name_10 = forms.CharField(
+        label=_("Naam traject 10"), max_length=15, required=False
+    )
 
     class Meta:
         model = Proposal
         fields = [
-            'studies_similar', 'studies_number',
-            'study_name_1', 'study_name_2', 'study_name_3', 'study_name_4',
-            'study_name_5', 'study_name_6', 'study_name_7', 'study_name_8',
-            'study_name_9', 'study_name_10',
+            "studies_similar",
+            "studies_number",
+            "study_name_1",
+            "study_name_2",
+            "study_name_3",
+            "study_name_4",
+            "study_name_5",
+            "study_name_6",
+            "study_name_7",
+            "study_name_8",
+            "study_name_9",
+            "study_name_10",
         ]
         widgets = {
-            'studies_similar': forms.RadioSelect(choices=YES_NO),
+            "studies_similar": forms.RadioSelect(choices=YES_NO),
         }
 
     def __init__(self, *args, **kwargs):
@@ -511,12 +576,12 @@ def __init__(self, *args, **kwargs):
         - Set the Proposal for later reference
         - Set initial data for the study_name fields
         """
-        self.proposal = kwargs.pop('proposal', None)
+        self.proposal = kwargs.pop("proposal", None)
 
         super(StudyStartForm, self).__init__(*args, **kwargs)
 
         for n, study in enumerate(self.proposal.study_set.all()):
-            study_name = 'study_name_' + str(n + 1)
+            study_name = "study_name_" + str(n + 1)
             self.fields[study_name].initial = study.name
 
     def clean(self):
@@ -528,62 +593,65 @@ def clean(self):
         """
         cleaned_data = super(StudyStartForm, self).clean()
 
-        if cleaned_data['studies_similar'] is None:
-            self.add_error('studies_similar', _('Dit veld is verplicht om '
-                                                'verder te gaan.'))
-        elif not cleaned_data['studies_similar']:
-            nr_studies = cleaned_data['studies_number']
-            if cleaned_data['studies_number'] < 2:
-                self.add_error('studies_number', _(
-                    'Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee verschillende trajecten zijn.'))
+        if cleaned_data["studies_similar"] is None:
+            self.add_error(
+                "studies_similar", _("Dit veld is verplicht om " "verder te gaan.")
+            )
+        elif not cleaned_data["studies_similar"]:
+            nr_studies = cleaned_data["studies_number"]
+            if cleaned_data["studies_number"] < 2:
+                self.add_error(
+                    "studies_number",
+                    _(
+                        "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee verschillende trajecten zijn."
+                    ),
+                )
             for n in range(nr_studies):
                 if n >= 10:
                     break
-                study_name = 'study_name_' + str(n + 1)
+                study_name = "study_name_" + str(n + 1)
                 if not cleaned_data[study_name]:
-                    self.add_error(study_name, _('Dit veld is verplicht.'))
+                    self.add_error(study_name, _("Dit veld is verplicht."))
 
 
 class ProposalDataManagementForm(SoftValidationMixin, forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = ['privacy_officer', 'dmp_file']
+        fields = ["privacy_officer", "dmp_file"]
         widgets = {
-            'privacy_officer': forms.RadioSelect(choices=YES_NO),
+            "privacy_officer": forms.RadioSelect(choices=YES_NO),
         }
-    
+
     def clean(self):
         cleaned_data = super(ProposalDataManagementForm, self).clean()
 
-        if cleaned_data['privacy_officer'] is None:
+        if cleaned_data["privacy_officer"] is None:
             self.add_error(
-                'privacy_officer', 
-                _('Dit veld is verplicht om verder te gaan.')
+                "privacy_officer", _("Dit veld is verplicht om verder te gaan.")
             )
 
+
 class ProposalUpdateDataManagementForm(forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = [
-            'dmp_file'
-        ]
+        fields = ["dmp_file"]
+
 
 class ProposalUpdateDateStartForm(forms.ModelForm):
-    date_start = DateField(label=_('Nieuwe beoogde startdatum'))
+    date_start = DateField(label=_("Nieuwe beoogde startdatum"))
 
     class Meta:
         model = Proposal
-        fields = [
-            'date_start'
-        ]
+        fields = ["date_start"]
+
 
 class ProposalSubmitForm(forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = ['comments', 'inform_local_staff', 'embargo', 'embargo_end_date']
+        fields = ["comments", "inform_local_staff", "embargo", "embargo_end_date"]
         widgets = {
-            'inform_local_staff': forms.RadioSelect(choices=YES_NO),
-            'embargo': forms.RadioSelect(choices=YES_NO),
+            "inform_local_staff": forms.RadioSelect(choices=YES_NO),
+            "embargo": forms.RadioSelect(choices=YES_NO),
         }
 
     def __init__(self, *args, **kwargs):
@@ -591,20 +659,21 @@ def __init__(self, *args, **kwargs):
         - Mark the label of inform_local_staff as safe
         - Check if the inform_local_staff question should be asked
         """
-        self.proposal = kwargs.pop('proposal', None)
+        self.proposal = kwargs.pop("proposal", None)
 
         # Needed for POST data
-        self.request = kwargs.pop('request', None)
+        self.request = kwargs.pop("request", None)
 
         super(ProposalSubmitForm, self).__init__(*args, **kwargs)
 
-        self.fields['inform_local_staff'].label_suffix = ''
+        self.fields["inform_local_staff"].label_suffix = ""
 
-        self.fields['inform_local_staff'].label = mark_safe(
-            self.fields['inform_local_staff'].label)
+        self.fields["inform_local_staff"].label = mark_safe(
+            self.fields["inform_local_staff"].label
+        )
 
         if not check_local_facilities(self.proposal):
-            del self.fields['inform_local_staff']
+            del self.fields["inform_local_staff"]
 
     def clean(self):
         """
@@ -617,66 +686,77 @@ def clean(self):
 
         cleaned_data = super(ProposalSubmitForm, self).clean()
 
-        if not self.instance.is_pre_assessment and \
-           not self.instance.is_practice() and \
-           not 'js-redirect-submit' in self.request.POST and \
-           not 'save_back' in self.request.POST:
-
-            if check_local_facilities(self.proposal) and cleaned_data[
-                'inform_local_staff'] is None:
-                self.add_error('inform_local_staff', _('Dit veld is verplicht.'))
+        if (
+            not self.instance.is_pre_assessment
+            and not self.instance.is_practice()
+            and not "js-redirect-submit" in self.request.POST
+            and not "save_back" in self.request.POST
+        ):
+            if (
+                check_local_facilities(self.proposal)
+                and cleaned_data["inform_local_staff"] is None
+            ):
+                self.add_error("inform_local_staff", _("Dit veld is verplicht."))
 
             for study in self.instance.study_set.all():
                 documents = Documents.objects.get(study=study)
 
                 if not documents.informed_consent:
-                    self.add_error('comments', _(
-                        'Toestemmingsverklaring voor traject {} nog niet toegevoegd.').format(
-                        study.order))
+                    self.add_error(
+                        "comments",
+                        _(
+                            "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
+                        ).format(study.order),
+                    )
                 if not documents.briefing:
-                    self.add_error('comments', _(
-                        'Informatiebrief voor traject {} nog niet toegevoegd.').format(
-                        study.order))                
+                    self.add_error(
+                        "comments",
+                        _(
+                            "Informatiebrief voor traject {} nog niet toegevoegd."
+                        ).format(study.order),
+                    )
 
-            if cleaned_data['embargo'] is None:
-                self.add_error('embargo', _('Dit veld is verplicht.'))
+            if cleaned_data["embargo"] is None:
+                self.add_error("embargo", _("Dit veld is verplicht."))
 
-            embargo_end_date = cleaned_data['embargo_end_date']
+            embargo_end_date = cleaned_data["embargo_end_date"]
             two_years_from_now = timezone.now().date() + timezone.timedelta(days=730)
 
-            if embargo_end_date is not None and \
-               embargo_end_date > two_years_from_now:
-                self.add_error('embargo_end_date', _(
-                    'De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar van vandaag.'))
-
-            
+            if embargo_end_date is not None and embargo_end_date > two_years_from_now:
+                self.add_error(
+                    "embargo_end_date",
+                    _(
+                        "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar van vandaag."
+                    ),
+                )
 
 
 class TranslatedConsentForms(SoftValidationMixin, forms.ModelForm):
-
     class Meta:
         model = Proposal
-        fields = ['translated_forms', 'translated_forms_languages']
+        fields = ["translated_forms", "translated_forms_languages"]
         widgets = {
-            'translated_forms': forms.RadioSelect(choices=YES_NO),
+            "translated_forms": forms.RadioSelect(choices=YES_NO),
         }
 
-    _soft_validation_fields = ['translated_forms', 'translated_forms_languages']
-    
+    _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()
 
-        if cleaned_data['translated_forms'] is None:
+        if cleaned_data["translated_forms"] is None:
             self.add_error(
-                'translated_forms', 
-                _('Dit veld is verplicht om verder te gaan.')
+                "translated_forms", _("Dit veld is verplicht om verder te gaan.")
             )
-            
-        elif cleaned_data['translated_forms'] == True and not cleaned_data['translated_forms_languages']:
+
+        elif (
+            cleaned_data["translated_forms"] == True
+            and not cleaned_data["translated_forms_languages"]
+        ):
             self.add_error(
-                'translated_forms_languages', 
-                _('Vul in in welke talen de formulieren worden vertaald.')
-            )
\ No newline at end of file
+                "translated_forms_languages",
+                _("Vul in in welke talen de formulieren worden vertaald."),
+            )
diff --git a/proposals/management/commands/export_csv.py b/proposals/management/commands/export_csv.py
index 815d22bf5..4f25722be 100644
--- a/proposals/management/commands/export_csv.py
+++ b/proposals/management/commands/export_csv.py
@@ -2,44 +2,43 @@
 
 from django.core.management.base import BaseCommand
 
-from proposals.utils.statistics_utils import get_qs_for_year, \
-    get_registrations_for_proposal, get_studytypes_for_proposal
+from proposals.utils.statistics_utils import (
+    get_qs_for_year,
+    get_registrations_for_proposal,
+    get_studytypes_for_proposal,
+)
 
 
 class Command(BaseCommand):
-    help = 'Exports reviewed Proposals'
+    help = "Exports reviewed Proposals"
 
     def add_arguments(self, parser):
-        parser.add_argument('year', type=int)
+        parser.add_argument("year", type=int)
 
     def handle(self, *args, **options):
-
-        with open('output.csv', 'w') as csvfile:
+        with open("output.csv", "w") as csvfile:
             csv_writer = csv.writer(
-                csvfile,
-                delimiter=',',
-                quotechar='"',
-                quoting=csv.QUOTE_MINIMAL
+                csvfile, delimiter=",", quotechar='"', quoting=csv.QUOTE_MINIMAL
             )
 
             header = [
-                'title',
-                'reference_number',
-                'reviewing committee',
-                'type(s) of research',
-                'registration type(s)',
-                'applicant',
-                'applicant type',
-                'supervisor',
-                'submitted on',
-                'route',
-                'conclusion',
-                'concluded on'
+                "title",
+                "reference_number",
+                "reviewing committee",
+                "type(s) of research",
+                "registration type(s)",
+                "applicant",
+                "applicant type",
+                "supervisor",
+                "submitted on",
+                "route",
+                "conclusion",
+                "concluded on",
             ]
             csv_writer.writerow(header)
 
             rows = []
-            for proposal in get_qs_for_year(options['year']):
+            for proposal in get_qs_for_year(options["year"]):
                 study_types = get_studytypes_for_proposal(proposal)
                 registrations = get_registrations_for_proposal(proposal)
 
@@ -58,9 +57,9 @@ def handle(self, *args, **options):
                 review = proposal.latest_review()
                 row.extend(
                     [
-                        'short' if review.short_route else 'long',
+                        "short" if review.short_route else "long",
                         review.get_continuation_display(),
-                        review.date_end.date().isoformat()
+                        review.date_end.date().isoformat(),
                     ]
                 )
 
@@ -72,5 +71,5 @@ def handle(self, *args, **options):
 def dict_to_string(dict_):
     result = []
     for k, v in dict_.items():
-        result.append(str(k) + ' - ' + ', '.join(v))
-    return result[0].split(' - ')[1] if len(result) == 1 else '; '.join(result)
+        result.append(str(k) + " - " + ", ".join(v))
+    return result[0].split(" - ")[1] if len(result) == 1 else "; ".join(result)
diff --git a/proposals/management/commands/get_statistics.py b/proposals/management/commands/get_statistics.py
index eb51d6d53..112d42826 100644
--- a/proposals/management/commands/get_statistics.py
+++ b/proposals/management/commands/get_statistics.py
@@ -3,46 +3,45 @@
 from django.conf import settings
 from django.views.i18n import set_language
 
-from proposals.utils.statistics_utils import get_average_turnaround_time, \
-    get_qs_for_long_route_reviews, get_qs_for_short_route_reviews, \
-    get_qs_for_year, \
-    get_qs_for_year_and_committee, get_review_qs_for_proposals, \
-    get_total_long_route_proposals, \
-    get_total_short_route_proposals, \
-    get_total_students, get_total_submitted_proposals
+from proposals.utils.statistics_utils import (
+    get_average_turnaround_time,
+    get_qs_for_long_route_reviews,
+    get_qs_for_short_route_reviews,
+    get_qs_for_year,
+    get_qs_for_year_and_committee,
+    get_review_qs_for_proposals,
+    get_total_long_route_proposals,
+    get_total_short_route_proposals,
+    get_total_students,
+    get_total_submitted_proposals,
+)
 
 
 class Command(BaseCommand):
-    help = 'Calculate statistics for a given year'
+    help = "Calculate statistics for a given year"
 
     def add_arguments(self, parser):
-        parser.add_argument('year', type=int)
+        parser.add_argument("year", type=int)
 
     def handle(self, *args, **options):
         AK = Group.objects.get(name=settings.GROUP_GENERAL_CHAMBER)
         LK = Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
 
         datasets = {
-            'Total': get_qs_for_year(options['year']),
-            'AK': get_qs_for_year_and_committee(options['year'], AK),
-            'LK': get_qs_for_year_and_committee(options['year'], LK)
+            "Total": get_qs_for_year(options["year"]),
+            "AK": get_qs_for_year_and_committee(options["year"], AK),
+            "LK": get_qs_for_year_and_committee(options["year"], LK),
         }
 
         for name, dataset in datasets.items():
             print(name)
 
-            print('Total submitted:', get_total_submitted_proposals(dataset))
-            print(
-                'Total short route:',
-                get_total_short_route_proposals(dataset)
-            )
-            print(
-                'Total long route:',
-                get_total_long_route_proposals(dataset)
-            )
+            print("Total submitted:", get_total_submitted_proposals(dataset))
+            print("Total short route:", get_total_short_route_proposals(dataset))
+            print("Total long route:", get_total_long_route_proposals(dataset))
 
             print()
-            print('Total per relation:')
+            print("Total per relation:")
             for relation, count in get_total_students(dataset).items():
                 print(count, relation)
 
@@ -50,17 +49,13 @@ def handle(self, *args, **options):
             print("Turnaround times:")
             print(
                 "Short route",
-                get_average_turnaround_time(
-                    get_qs_for_short_route_reviews(dataset)
-                ),
-                'days'
+                get_average_turnaround_time(get_qs_for_short_route_reviews(dataset)),
+                "days",
             )
             print(
                 "Long route",
-                get_average_turnaround_time(
-                    get_qs_for_long_route_reviews(dataset)
-                ),
-                'days'
+                get_average_turnaround_time(get_qs_for_long_route_reviews(dataset)),
+                "days",
             )
 
-            print()
\ No newline at end of file
+            print()
diff --git a/proposals/management/commands/regenerate_pdf.py b/proposals/management/commands/regenerate_pdf.py
index a0a4b3781..c66bf1a0c 100644
--- a/proposals/management/commands/regenerate_pdf.py
+++ b/proposals/management/commands/regenerate_pdf.py
@@ -1,13 +1,14 @@
 from django.core.management.base import BaseCommand, CommandError
 from proposals.models import Proposal
 
+
 class Command(BaseCommand):
-    help = 'Regenerates the PDF for a Proposal'
+    help = "Regenerates the PDF for a Proposal"
 
     def add_arguments(self, parser):
         parser.add_argument(
-            'reference_numbers',
-            nargs='+',
+            "reference_numbers",
+            nargs="+",
             type=str,
             help="Space separated list of reference number for which PDFs \
             should be regenerated",
@@ -19,17 +20,21 @@ def add_arguments(self, parser):
             proposal's state. This applies to ALL reference numbers provided.",
         )
 
-    def get_proposals(self, ):
+    def get_proposals(
+        self,
+    ):
         refnums = self.options["reference_numbers"]
         proposals = []
         for num in refnums:
             try:
                 proposal = Proposal.objects.get(reference_number=num)
             except Proposal.DoesNotExist:
-                raise CommandError(f"""
+                raise CommandError(
+                    f"""
                 Proposal with reference number {num} could not be found.
                 Aborting generation of all PDFs.
-                """)
+                """
+                )
             proposals.append(proposal)
         return proposals
 
diff --git a/proposals/menus.py b/proposals/menus.py
index 020f14f31..f62a0aeb9 100644
--- a/proposals/menus.py
+++ b/proposals/menus.py
@@ -18,8 +18,10 @@
         reverse("proposals:start_pre"),
     ),
     MenuItem(
-        _("Nieuwe aanvraag starten (die al goedgekeurd is door een andere "
-          "ethische toetsingscomissie)"),
+        _(
+            "Nieuwe aanvraag starten (die al goedgekeurd is door een andere "
+            "ethische toetsingscomissie)"
+        ),
         reverse("proposals:start_pre_approved"),
     ),
     MenuItem(
@@ -41,10 +43,10 @@
     MenuItem(
         _("Nieuwe aanvraag"),
         "#",
-        slug='new-studies',  # needed for sub-menu!
+        slug="new-studies",  # needed for sub-menu!
         children=new_proposal_menu,
         check=lambda x: x.user.is_authenticated,
-    )
+    ),
 )
 
 my_proposals_menu = (
@@ -79,21 +81,21 @@
     MenuItem(
         _("Mijn aanvragen"),
         reverse("proposals:my_archive"),
-        slug='my-studies',  # needed for sub-menu!
+        slug="my-studies",  # needed for sub-menu!
         children=my_proposals_menu,
         check=lambda x: x.user.is_authenticated,
-    )
+    ),
 )
 
 archive_menu = (
     MenuItem(
         _("Bekijk alle goedgekeurde aanvragen van de Algemene Kamer"),
-        reverse("proposals:archive", args=['AK']),
+        reverse("proposals:archive", args=["AK"]),
         check=lambda x: is_member_of_humanities(x.user),
     ),
     MenuItem(
         _("Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"),
-        reverse("proposals:archive", args=['LK']),
+        reverse("proposals:archive", args=["LK"]),
         check=lambda x: is_member_of_humanities(x.user),
     ),
     MenuItem(
@@ -109,8 +111,8 @@
     MenuItem(
         _("Archief"),
         "#",
-        slug='archive',  # needed for sub-menu!
+        slug="archive",  # needed for sub-menu!
         children=archive_menu,
         check=lambda x: x.user.is_authenticated and is_member_of_humanities(x.user),
-    )
+    ),
 )
diff --git a/proposals/migrations/0001_initial.py b/proposals/migrations/0001_initial.py
index e9bf451f1..0933fa4d5 100644
--- a/proposals/migrations/0001_initial.py
+++ b/proposals/migrations/0001_initial.py
@@ -8,107 +8,308 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Funding',
+            name="Funding",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('requires_review', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("requires_review", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Proposal',
+            name="Proposal",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('reference_number', models.CharField(unique=True, max_length=16)),
-                ('date_start', models.DateField(null=True, verbose_name='Wat is, indien bekend, de beoogde startdatum van uw studie?', blank=True)),
-                ('title', models.CharField(help_text='De titel die u hier opgeeft is zichtbaar voor de ETCL-leden en, wanneer de studie is goedgekeurd, ook voor alle UiL-OTS medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.', unique=True, max_length=200, verbose_name='Wat is de titel van uw studie?')),
-                ('summary', models.TextField(verbose_name='Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. Gebruik maximaal 200 woorden.', validators=[main.validators.MaxWordsValidator(200)])),
-                ('other_applicants', models.BooleanField(default=False, verbose_name='Zijn er nog andere UiL OTS-onderzoekers of -studenten bij deze studie betrokken?')),
-                ('other_stakeholders', models.BooleanField(default=False, verbose_name='Zijn er onderzoekers van buiten UiL OTS bij deze studie betrokken?')),
-                ('stakeholders', models.TextField(verbose_name='Andere betrokkenen', blank=True)),
-                ('funding_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('comments', models.TextField(verbose_name='Ruimte voor eventuele opmerkingen', blank=True)),
-                ('pdf', models.FileField(upload_to=b'', blank=True)),
-                ('studies_similar', models.NullBooleanField(help_text='Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden).', verbose_name='Doorlopen alle deelnemersgroepen in essentie hetzelfde traject?')),
-                ('studies_number', models.PositiveIntegerField(default=1, verbose_name='Hoeveel verschillende trajecten zijn er?', validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(5)])),
-                ('status', models.PositiveIntegerField(default=1, choices=[(1, 'Concept'), (40, 'Opgestuurd ter beoordeling door eindverantwoordelijke'), (50, 'Opgestuurd ter beoordeling door ETCL'), (55, 'Studie is beoordeeld door ETCL'), (60, 'Studie is beoordeeld door METC')])),
-                ('status_review', models.NullBooleanField(default=None)),
-                ('date_created', models.DateTimeField(auto_now_add=True)),
-                ('date_modified', models.DateTimeField(auto_now=True)),
-                ('date_submitted_supervisor', models.DateTimeField(null=True)),
-                ('date_reviewed_supervisor', models.DateTimeField(null=True)),
-                ('date_submitted', models.DateTimeField(null=True)),
-                ('date_reviewed', models.DateTimeField(null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("reference_number", models.CharField(unique=True, max_length=16)),
+                (
+                    "date_start",
+                    models.DateField(
+                        null=True,
+                        verbose_name="Wat is, indien bekend, de beoogde startdatum van uw studie?",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "title",
+                    models.CharField(
+                        help_text="De titel die u hier opgeeft is zichtbaar voor de ETCL-leden en, wanneer de studie is goedgekeurd, ook voor alle UiL-OTS medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.",
+                        unique=True,
+                        max_length=200,
+                        verbose_name="Wat is de titel van uw studie?",
+                    ),
+                ),
+                (
+                    "summary",
+                    models.TextField(
+                        verbose_name="Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. Gebruik maximaal 200 woorden.",
+                        validators=[main.validators.MaxWordsValidator(200)],
+                    ),
+                ),
+                (
+                    "other_applicants",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Zijn er nog andere UiL OTS-onderzoekers of -studenten bij deze studie betrokken?",
+                    ),
+                ),
+                (
+                    "other_stakeholders",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Zijn er onderzoekers van buiten UiL OTS bij deze studie betrokken?",
+                    ),
+                ),
+                (
+                    "stakeholders",
+                    models.TextField(verbose_name="Andere betrokkenen", blank=True),
+                ),
+                (
+                    "funding_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "comments",
+                    models.TextField(
+                        verbose_name="Ruimte voor eventuele opmerkingen", blank=True
+                    ),
+                ),
+                ("pdf", models.FileField(upload_to=b"", blank=True)),
+                (
+                    "studies_similar",
+                    models.NullBooleanField(
+                        help_text="Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden).",
+                        verbose_name="Doorlopen alle deelnemersgroepen in essentie hetzelfde traject?",
+                    ),
+                ),
+                (
+                    "studies_number",
+                    models.PositiveIntegerField(
+                        default=1,
+                        verbose_name="Hoeveel verschillende trajecten zijn er?",
+                        validators=[
+                            django.core.validators.MinValueValidator(1),
+                            django.core.validators.MaxValueValidator(5),
+                        ],
+                    ),
+                ),
+                (
+                    "status",
+                    models.PositiveIntegerField(
+                        default=1,
+                        choices=[
+                            (1, "Concept"),
+                            (
+                                40,
+                                "Opgestuurd ter beoordeling door eindverantwoordelijke",
+                            ),
+                            (50, "Opgestuurd ter beoordeling door ETCL"),
+                            (55, "Studie is beoordeeld door ETCL"),
+                            (60, "Studie is beoordeeld door METC"),
+                        ],
+                    ),
+                ),
+                ("status_review", models.NullBooleanField(default=None)),
+                ("date_created", models.DateTimeField(auto_now_add=True)),
+                ("date_modified", models.DateTimeField(auto_now=True)),
+                ("date_submitted_supervisor", models.DateTimeField(null=True)),
+                ("date_reviewed_supervisor", models.DateTimeField(null=True)),
+                ("date_submitted", models.DateTimeField(null=True)),
+                ("date_reviewed", models.DateTimeField(null=True)),
             ],
         ),
         migrations.CreateModel(
-            name='Relation',
+            name="Relation",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_supervisor', models.BooleanField(default=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_supervisor", models.BooleanField(default=True)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Wmo',
+            name="Wmo",
             fields=[
-                ('metc', models.CharField(default=None, max_length=1, verbose_name='Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling waar toetsing door een METC verplicht is gesteld?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('metc_details', models.TextField(verbose_name='Licht toe', blank=True)),
-                ('metc_institution', models.CharField(max_length=200, verbose_name='Welke instelling?', blank=True)),
-                ('is_medical', models.CharField(blank=True, help_text='De definitie van medisch-wetenschappelijk onderzoek is: Medisch-wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden van een vraag op het gebied van ziekte en gezondheid (etiologie, pathogenese, verschijnselen/symptomen, diagnose, preventie, uitkomst of behandeling van ziekte), door het op systematische wijze vergaren en bestuderen van gegevens. Het onderzoek beoogt bij te dragen aan medische kennis die ook geldend is voor populaties buiten de directe onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk onderzoek, 2005, ccmo.nl)', max_length=1, verbose_name='Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd door de WMO)?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('is_behavioristic', models.CharField(blank=True, help_text='Een handeling of opgelegde gedragsregel varieert tussen het afnemen van weefsel bij een deelnemer tot de deelnemer een knop/toets in laten drukken. Bij observatieonderzoek waarbij er niets van de deelnemers gevraagd wordt, deze dus uitsluitend geobserveerd worden in hun leven zoals het ook had plaatsgevonden zonder de observatie, slechts dan kan "nee" ingevuld worden.', max_length=1, verbose_name='Worden de deelnemers aan een handeling onderworpen of worden hen gedragsregels opgelegd (zoals gedefinieerd door de WMO)?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('metc_application', models.BooleanField(default=False, verbose_name='Uw studie moet beoordeeld worden door de METC, maar dient nog wel bij de ETCL te worden geregistreerd. Is deze studie al aangemeld bij een METC?')),
-                ('metc_decision', models.BooleanField(default=False, verbose_name='Is de METC al tot een beslissing gekomen?')),
-                ('metc_decision_pdf', models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc])),
-                ('status', models.PositiveIntegerField(default=0, choices=[(0, 'Geen beoordeling door METC noodzakelijk'), (1, 'In afwachting beslissing METC'), (2, 'Beslissing METC ge\xfcpload')])),
-                ('enforced_by_commission', models.BooleanField(default=False)),
-                ('proposal', models.OneToOneField(primary_key=True, serialize=False, to='proposals.Proposal', on_delete=models.CASCADE)),
+                (
+                    "metc",
+                    models.CharField(
+                        default=None,
+                        max_length=1,
+                        verbose_name="Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling waar toetsing door een METC verplicht is gesteld?",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "metc_details",
+                    models.TextField(verbose_name="Licht toe", blank=True),
+                ),
+                (
+                    "metc_institution",
+                    models.CharField(
+                        max_length=200, verbose_name="Welke instelling?", blank=True
+                    ),
+                ),
+                (
+                    "is_medical",
+                    models.CharField(
+                        blank=True,
+                        help_text="De definitie van medisch-wetenschappelijk onderzoek is: Medisch-wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden van een vraag op het gebied van ziekte en gezondheid (etiologie, pathogenese, verschijnselen/symptomen, diagnose, preventie, uitkomst of behandeling van ziekte), door het op systematische wijze vergaren en bestuderen van gegevens. Het onderzoek beoogt bij te dragen aan medische kennis die ook geldend is voor populaties buiten de directe onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk onderzoek, 2005, ccmo.nl)",
+                        max_length=1,
+                        verbose_name="Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd door de WMO)?",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "is_behavioristic",
+                    models.CharField(
+                        blank=True,
+                        help_text='Een handeling of opgelegde gedragsregel varieert tussen het afnemen van weefsel bij een deelnemer tot de deelnemer een knop/toets in laten drukken. Bij observatieonderzoek waarbij er niets van de deelnemers gevraagd wordt, deze dus uitsluitend geobserveerd worden in hun leven zoals het ook had plaatsgevonden zonder de observatie, slechts dan kan "nee" ingevuld worden.',
+                        max_length=1,
+                        verbose_name="Worden de deelnemers aan een handeling onderworpen of worden hen gedragsregels opgelegd (zoals gedefinieerd door de WMO)?",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "metc_application",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Uw studie moet beoordeeld worden door de METC, maar dient nog wel bij de ETCL te worden geregistreerd. Is deze studie al aangemeld bij een METC?",
+                    ),
+                ),
+                (
+                    "metc_decision",
+                    models.BooleanField(
+                        default=False,
+                        verbose_name="Is de METC al tot een beslissing gekomen?",
+                    ),
+                ),
+                (
+                    "metc_decision_pdf",
+                    models.FileField(
+                        blank=True,
+                        upload_to=b"",
+                        verbose_name="Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)",
+                        validators=[main.validators.validate_pdf_or_doc],
+                    ),
+                ),
+                (
+                    "status",
+                    models.PositiveIntegerField(
+                        default=0,
+                        choices=[
+                            (0, "Geen beoordeling door METC noodzakelijk"),
+                            (1, "In afwachting beslissing METC"),
+                            (2, "Beslissing METC ge\xfcpload"),
+                        ],
+                    ),
+                ),
+                ("enforced_by_commission", models.BooleanField(default=False)),
+                (
+                    "proposal",
+                    models.OneToOneField(
+                        primary_key=True,
+                        serialize=False,
+                        to="proposals.Proposal",
+                        on_delete=models.CASCADE,
+                    ),
+                ),
             ],
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='applicants',
-            field=models.ManyToManyField(help_text='Als uw medeonderzoeker niet in de lijst voorkomt, vraag hem dan een keer in te loggen in het webportaal.', related_name='applicants', verbose_name='Uitvoerende(n) (inclusief uzelf)', to=settings.AUTH_USER_MODEL),
+            model_name="proposal",
+            name="applicants",
+            field=models.ManyToManyField(
+                help_text="Als uw medeonderzoeker niet in de lijst voorkomt, vraag hem dan een keer in te loggen in het webportaal.",
+                related_name="applicants",
+                verbose_name="Uitvoerende(n) (inclusief uzelf)",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='created_by',
-            field=models.ForeignKey(related_name='created_by', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
+            model_name="proposal",
+            name="created_by",
+            field=models.ForeignKey(
+                related_name="created_by",
+                to=settings.AUTH_USER_MODEL,
+                on_delete=models.CASCADE,
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='funding',
-            field=models.ManyToManyField(to='proposals.Funding', verbose_name='Hoe wordt dit onderzoek gefinancierd?'),
+            model_name="proposal",
+            name="funding",
+            field=models.ManyToManyField(
+                to="proposals.Funding",
+                verbose_name="Hoe wordt dit onderzoek gefinancierd?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='parent',
-            field=models.ForeignKey(verbose_name='Te kopi\xebren studie', on_delete=models.CASCADE, to='proposals.Proposal', help_text='Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.', null=True),
+            model_name="proposal",
+            name="parent",
+            field=models.ForeignKey(
+                verbose_name="Te kopi\xebren studie",
+                on_delete=models.CASCADE,
+                to="proposals.Proposal",
+                help_text="Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.",
+                null=True,
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='relation',
-            field=models.ForeignKey(verbose_name='In welke hoedanigheid bent u betrokken bij deze UiL OTS studie?', to='proposals.Relation', on_delete=models.CASCADE),
+            model_name="proposal",
+            name="relation",
+            field=models.ForeignKey(
+                verbose_name="In welke hoedanigheid bent u betrokken bij deze UiL OTS studie?",
+                to="proposals.Relation",
+                on_delete=models.CASCADE,
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='supervisor',
-            field=models.ForeignKey(blank=True, to=settings.AUTH_USER_MODEL, help_text='Aan het einde van de procedure kunt u deze studie ter verificatie naar uw eindverantwoordelijke sturen. De eindverantwoordelijke zal de studie vervolgens kunnen aanpassen en indienen bij de ETCL.', null=True, verbose_name='Eindverantwoordelijke onderzoeker', on_delete=models.CASCADE),
+            model_name="proposal",
+            name="supervisor",
+            field=models.ForeignKey(
+                blank=True,
+                to=settings.AUTH_USER_MODEL,
+                help_text="Aan het einde van de procedure kunt u deze studie ter verificatie naar uw eindverantwoordelijke sturen. De eindverantwoordelijke zal de studie vervolgens kunnen aanpassen en indienen bij de ETCL.",
+                null=True,
+                verbose_name="Eindverantwoordelijke onderzoeker",
+                on_delete=models.CASCADE,
+            ),
         ),
     ]
diff --git a/proposals/migrations/0002_proposal_is_revision.py b/proposals/migrations/0002_proposal_is_revision.py
index bc76f6851..6a8d79280 100644
--- a/proposals/migrations/0002_proposal_is_revision.py
+++ b/proposals/migrations/0002_proposal_is_revision.py
@@ -5,15 +5,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0001_initial'),
+        ("proposals", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='is_revision',
-            field=models.BooleanField(default=False, verbose_name='Is deze studie een revisie van of amendement op een ingediende studie?'),
+            model_name="proposal",
+            name="is_revision",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Is deze studie een revisie van of amendement op een ingediende studie?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0003_auto_20161008_2238.py b/proposals/migrations/0003_auto_20161008_2238.py
index ab09ed246..cfe97162c 100644
--- a/proposals/migrations/0003_auto_20161008_2238.py
+++ b/proposals/migrations/0003_auto_20161008_2238.py
@@ -5,20 +5,22 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0002_proposal_is_revision'),
+        ("proposals", "0002_proposal_is_revision"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='in_course',
-            field=models.BooleanField(default=False, verbose_name='Ik vul deze portal in in de context van een cursus'),
+            model_name="proposal",
+            name="in_course",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Ik vul deze portal in in de context van een cursus",
+            ),
         ),
         migrations.AddField(
-            model_name='relation',
-            name='check_in_course',
+            model_name="relation",
+            name="check_in_course",
             field=models.BooleanField(default=True),
         ),
     ]
diff --git a/proposals/migrations/0004_auto_20161013_1508.py b/proposals/migrations/0004_auto_20161013_1508.py
index a2c471920..1e4cc6c4e 100644
--- a/proposals/migrations/0004_auto_20161013_1508.py
+++ b/proposals/migrations/0004_auto_20161013_1508.py
@@ -5,30 +5,29 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0003_auto_20161008_2238'),
+        ("proposals", "0003_auto_20161008_2238"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='funding',
-            name='description_en',
+            model_name="funding",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='funding',
-            name='description_nl',
+            model_name="funding",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='relation',
-            name='description_en',
+            model_name="relation",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='relation',
-            name='description_nl',
+            model_name="relation",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/proposals/migrations/0005_proposal_in_archive.py b/proposals/migrations/0005_proposal_in_archive.py
index 47806fd2c..d3d7cebf0 100644
--- a/proposals/migrations/0005_proposal_in_archive.py
+++ b/proposals/migrations/0005_proposal_in_archive.py
@@ -5,15 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0004_auto_20161013_1508'),
+        ("proposals", "0004_auto_20161013_1508"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='in_archive',
+            model_name="proposal",
+            name="in_archive",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/proposals/migrations/0006_proposal_is_pre_assessment.py b/proposals/migrations/0006_proposal_is_pre_assessment.py
index 8f8677cbb..50deac2c1 100644
--- a/proposals/migrations/0006_proposal_is_pre_assessment.py
+++ b/proposals/migrations/0006_proposal_is_pre_assessment.py
@@ -5,15 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0005_proposal_in_archive'),
+        ("proposals", "0005_proposal_in_archive"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='is_pre_assessment',
+            model_name="proposal",
+            name="is_pre_assessment",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/proposals/migrations/0007_auto_20161219_1141.py b/proposals/migrations/0007_auto_20161219_1141.py
index 533581ea4..1d045b243 100644
--- a/proposals/migrations/0007_auto_20161219_1141.py
+++ b/proposals/migrations/0007_auto_20161219_1141.py
@@ -5,20 +5,25 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0006_proposal_is_pre_assessment'),
+        ("proposals", "0006_proposal_is_pre_assessment"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='is_exploration',
-            field=models.BooleanField(default=False, verbose_name='Ik vul de portal in om de portal te exploreren'),
+            model_name="proposal",
+            name="is_exploration",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Ik vul de portal in om de portal te exploreren",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='in_course',
-            field=models.BooleanField(default=False, verbose_name='Ik vul de portal in in het kader van een cursus'),
+            model_name="proposal",
+            name="in_course",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Ik vul de portal in in het kader van een cursus",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0008_relation_check_pre_assessment.py b/proposals/migrations/0008_relation_check_pre_assessment.py
index f5b002ef6..0f69d595f 100644
--- a/proposals/migrations/0008_relation_check_pre_assessment.py
+++ b/proposals/migrations/0008_relation_check_pre_assessment.py
@@ -5,15 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0007_auto_20161219_1141'),
+        ("proposals", "0007_auto_20161219_1141"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='relation',
-            name='check_pre_assessment',
+            model_name="relation",
+            name="check_pre_assessment",
             field=models.BooleanField(default=True),
         ),
     ]
diff --git a/proposals/migrations/0009_proposal_pre_assessment_pdf.py b/proposals/migrations/0009_proposal_pre_assessment_pdf.py
index a0b8e8d33..f37d48ce9 100644
--- a/proposals/migrations/0009_proposal_pre_assessment_pdf.py
+++ b/proposals/migrations/0009_proposal_pre_assessment_pdf.py
@@ -6,15 +6,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0008_relation_check_pre_assessment'),
+        ("proposals", "0008_relation_check_pre_assessment"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='pre_assessment_pdf',
-            field=models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier uw aanvraag (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc]),
+            model_name="proposal",
+            name="pre_assessment_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to=b"",
+                verbose_name="Upload hier uw aanvraag (in .pdf of .doc(x)-formaat)",
+                validators=[main.validators.validate_pdf_or_doc],
+            ),
         ),
     ]
diff --git a/proposals/migrations/0010_auto_20170328_1238.py b/proposals/migrations/0010_auto_20170328_1238.py
index 045bacad4..e1fc4b9f1 100644
--- a/proposals/migrations/0010_auto_20170328_1238.py
+++ b/proposals/migrations/0010_auto_20170328_1238.py
@@ -6,30 +6,44 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0009_proposal_pre_assessment_pdf'),
+        ("proposals", "0009_proposal_pre_assessment_pdf"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='funding',
-            name='needs_name',
+            model_name="funding",
+            name="needs_name",
             field=models.BooleanField(default=True),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='funding_name',
-            field=models.CharField(help_text='De titel die u hier opgeeft zal in de formele toestemmingsbrief gebruikt worden.', max_length=200, verbose_name='Wat is de naam van het gefinancierde project?', blank=True),
+            model_name="proposal",
+            name="funding_name",
+            field=models.CharField(
+                help_text="De titel die u hier opgeeft zal in de formele toestemmingsbrief gebruikt worden.",
+                max_length=200,
+                verbose_name="Wat is de naam van het gefinancierde project?",
+                blank=True,
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='applicants',
-            field=models.ManyToManyField(help_text='Als uw medeonderzoeker niet in de lijst voorkomt, vraag hem dan een keer in te loggen in het webportaal.', related_name='applicants', verbose_name='Uitvoerende(n) (inclusief uzelf). Uitvoerende(n) kunnen pas worden toegevoegd als ze eerst een keer zelf zijn ingelogd.', to=settings.AUTH_USER_MODEL),
+            model_name="proposal",
+            name="applicants",
+            field=models.ManyToManyField(
+                help_text="Als uw medeonderzoeker niet in de lijst voorkomt, vraag hem dan een keer in te loggen in het webportaal.",
+                related_name="applicants",
+                verbose_name="Uitvoerende(n) (inclusief uzelf). Uitvoerende(n) kunnen pas worden toegevoegd als ze eerst een keer zelf zijn ingelogd.",
+                to=settings.AUTH_USER_MODEL,
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='title',
-            field=models.CharField(help_text='De titel die u hier opgeeft is zichtbaar voor de ETCL-leden en, wanneer de studie is goedgekeurd, ook voor alle UiL-OTS medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.', unique=True, max_length=200, verbose_name='Wat is de titel van uw studie? Deze titel zal worden gebruikt in alle formele correspondentie.'),
+            model_name="proposal",
+            name="title",
+            field=models.CharField(
+                help_text="De titel die u hier opgeeft is zichtbaar voor de ETCL-leden en, wanneer de studie is goedgekeurd, ook voor alle UiL-OTS medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.",
+                unique=True,
+                max_length=200,
+                verbose_name="Wat is de titel van uw studie? Deze titel zal worden gebruikt in alle formele correspondentie.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0011_auto_20170525_0005.py b/proposals/migrations/0011_auto_20170525_0005.py
index bd0c4ba92..4a5d6eded 100644
--- a/proposals/migrations/0011_auto_20170525_0005.py
+++ b/proposals/migrations/0011_auto_20170525_0005.py
@@ -5,20 +5,23 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0010_auto_20170328_1238'),
+        ("proposals", "0010_auto_20170328_1238"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='confirmation_comments',
-            field=models.TextField(verbose_name='Ruimte voor eventuele opmerkingen', blank=True),
+            model_name="proposal",
+            name="confirmation_comments",
+            field=models.TextField(
+                verbose_name="Ruimte voor eventuele opmerkingen", blank=True
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='date_confirmed',
-            field=models.DateField(null=True, verbose_name='Datum bevestigingsbrief verstuurd'),
+            model_name="proposal",
+            name="date_confirmed",
+            field=models.DateField(
+                null=True, verbose_name="Datum bevestigingsbrief verstuurd"
+            ),
         ),
     ]
diff --git a/proposals/migrations/0012_proposal_inform_local_staff.py b/proposals/migrations/0012_proposal_inform_local_staff.py
index 3d9431842..a93ccc5c1 100644
--- a/proposals/migrations/0012_proposal_inform_local_staff.py
+++ b/proposals/migrations/0012_proposal_inform_local_staff.py
@@ -5,15 +5,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0011_auto_20170525_0005'),
+        ("proposals", "0011_auto_20170525_0005"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='inform_local_staff',
-            field=models.NullBooleanField(default=None, verbose_name='<p>U hebt aangegeven dat u gebruik wilt gaan maken van \xe9\xe9n van de faciliteiten van het UiL OTS, namelijk de database, Zep software en/of het UiL OTS lab. Het lab supportteam van het UiL OTS zou graag op de hoogte willen worden gesteld van aankomende studies. Daarom vragen wij hier u toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vindt u het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Uw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van de studie <br/> - De titel van de studie <br/> - De beoogde startdatum <br/> - Van welke faciliteiten u gebruik wilt maken (database, lab, Zep software)'),
+            model_name="proposal",
+            name="inform_local_staff",
+            field=models.NullBooleanField(
+                default=None,
+                verbose_name="<p>U hebt aangegeven dat u gebruik wilt gaan maken van \xe9\xe9n van de faciliteiten van het UiL OTS, namelijk de database, Zep software en/of het UiL OTS lab. Het lab supportteam van het UiL OTS zou graag op de hoogte willen worden gesteld van aankomende studies. Daarom vragen wij hier u toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vindt u het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Uw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van de studie <br/> - De titel van de studie <br/> - De beoogde startdatum <br/> - Van welke faciliteiten u gebruik wilt maken (database, lab, Zep software)",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0013_proposal_public.py b/proposals/migrations/0013_proposal_public.py
index 30a02880a..b76949d2e 100644
--- a/proposals/migrations/0013_proposal_public.py
+++ b/proposals/migrations/0013_proposal_public.py
@@ -5,15 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0012_proposal_inform_local_staff'),
+        ("proposals", "0012_proposal_inform_local_staff"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='public',
+            model_name="proposal",
+            name="public",
             field=models.BooleanField(default=True),
         ),
     ]
diff --git a/proposals/migrations/0014_auto_20180808_1129.py b/proposals/migrations/0014_auto_20180808_1129.py
index 45f1f5c6e..2f08c0d6f 100644
--- a/proposals/migrations/0014_auto_20180808_1129.py
+++ b/proposals/migrations/0014_auto_20180808_1129.py
@@ -8,45 +8,75 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0013_proposal_public'),
+        ("proposals", "0013_proposal_public"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='applicants',
-            field=models.ManyToManyField(related_name='applicants', to=settings.AUTH_USER_MODEL, verbose_name='Uitvoerende(n) (inclusief uzelf)'),
+            model_name="proposal",
+            name="applicants",
+            field=models.ManyToManyField(
+                related_name="applicants",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Uitvoerende(n) (inclusief uzelf)",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='pdf',
-            field=models.FileField(blank=True, upload_to=''),
+            model_name="proposal",
+            name="pdf",
+            field=models.FileField(blank=True, upload_to=""),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='pre_assessment_pdf',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier uw aanvraag (in .pdf of .doc(x)-formaat)'),
+            model_name="proposal",
+            name="pre_assessment_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier uw aanvraag (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='is_behavioristic',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='Een handeling of opgelegde gedragsregel varieert tussen het afnemen van weefsel bij een deelnemer tot de deelnemer een knop/toets in laten drukken. Bij observatieonderzoek waarbij er niets van de deelnemers gevraagd wordt, deze dus uitsluitend geobserveerd worden in hun leven zoals het ook had plaatsgevonden zonder de observatie, slechts dan kan "nee" ingevuld worden.', max_length=1, verbose_name='Worden de deelnemers aan een handeling onderworpen of worden hen gedragsregels opgelegd (zoals gedefinieerd door de WMO)?'),
+            model_name="wmo",
+            name="is_behavioristic",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text='Een handeling of opgelegde gedragsregel varieert tussen het afnemen van weefsel bij een deelnemer tot de deelnemer een knop/toets in laten drukken. Bij observatieonderzoek waarbij er niets van de deelnemers gevraagd wordt, deze dus uitsluitend geobserveerd worden in hun leven zoals het ook had plaatsgevonden zonder de observatie, slechts dan kan "nee" ingevuld worden.',
+                max_length=1,
+                verbose_name="Worden de deelnemers aan een handeling onderworpen of worden hen gedragsregels opgelegd (zoals gedefinieerd door de WMO)?",
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='is_medical',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='De definitie van medisch-wetenschappelijk onderzoek is: Medisch-wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden van een vraag op het gebied van ziekte en gezondheid (etiologie, pathogenese, verschijnselen/symptomen, diagnose, preventie, uitkomst of behandeling van ziekte), door het op systematische wijze vergaren en bestuderen van gegevens. Het onderzoek beoogt bij te dragen aan medische kennis die ook geldend is voor populaties buiten de directe onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk onderzoek, 2005, ccmo.nl)', max_length=1, verbose_name='Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd door de WMO)?'),
+            model_name="wmo",
+            name="is_medical",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text="De definitie van medisch-wetenschappelijk onderzoek is: Medisch-wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden van een vraag op het gebied van ziekte en gezondheid (etiologie, pathogenese, verschijnselen/symptomen, diagnose, preventie, uitkomst of behandeling van ziekte), door het op systematische wijze vergaren en bestuderen van gegevens. Het onderzoek beoogt bij te dragen aan medische kennis die ook geldend is voor populaties buiten de directe onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk onderzoek, 2005, ccmo.nl)",
+                max_length=1,
+                verbose_name="Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd door de WMO)?",
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='metc',
-            field=models.CharField(choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], default=None, max_length=1, verbose_name='Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling waar toetsing door een METC verplicht is gesteld?'),
+            model_name="wmo",
+            name="metc",
+            field=models.CharField(
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                default=None,
+                max_length=1,
+                verbose_name="Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling waar toetsing door een METC verplicht is gesteld?",
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='metc_decision_pdf',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)'),
+            model_name="wmo",
+            name="metc_decision_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0015_auto_20181004_1043.py b/proposals/migrations/0015_auto_20181004_1043.py
index 6e39a8ae6..d2715743d 100644
--- a/proposals/migrations/0015_auto_20181004_1043.py
+++ b/proposals/migrations/0015_auto_20181004_1043.py
@@ -6,20 +6,22 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0014_auto_20180808_1129'),
+        ("proposals", "0014_auto_20180808_1129"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='has_minor_revision',
-            field=models.BooleanField(default=False, verbose_name='Is er een revisie geweest na het indienen van deze studie?'),
+            model_name="proposal",
+            name="has_minor_revision",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Is er een revisie geweest na het indienen van deze studie?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='minor_revision_description',
-            field=models.TextField(blank=True, null=True, verbose_name='Leg uit'),
+            model_name="proposal",
+            name="minor_revision_description",
+            field=models.TextField(blank=True, null=True, verbose_name="Leg uit"),
         ),
     ]
diff --git a/proposals/migrations/0016_auto_20181005_1011.py b/proposals/migrations/0016_auto_20181005_1011.py
index 7cda03093..9cc12087d 100644
--- a/proposals/migrations/0016_auto_20181005_1011.py
+++ b/proposals/migrations/0016_auto_20181005_1011.py
@@ -7,25 +7,37 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0015_auto_20181004_1043'),
+        ("proposals", "0015_auto_20181004_1043"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='is_pre_approved',
-            field=models.NullBooleanField(default=None, verbose_name='Heeft u formele toestemming van een ethische toetsingcommissie, uitgezonderd deze EtCL commissie?'),
+            model_name="proposal",
+            name="is_pre_approved",
+            field=models.NullBooleanField(
+                default=None,
+                verbose_name="Heeft u formele toestemming van een ethische toetsingcommissie, uitgezonderd deze EtCL commissie?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='pre_approval_institute',
-            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Welk instituut heeft de studie goedgekeurd?'),
+            model_name="proposal",
+            name="pre_approval_institute",
+            field=models.CharField(
+                blank=True,
+                max_length=200,
+                null=True,
+                verbose_name="Welk instituut heeft de studie goedgekeurd?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='pre_approval_pdf',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier uw formele toestemmingsbrief van dit instituut (in .pdf of .doc(x)-formaat)'),
+            model_name="proposal",
+            name="pre_approval_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier uw formele toestemmingsbrief van dit instituut (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0017_proposal_reviewing_committee.py b/proposals/migrations/0017_proposal_reviewing_committee.py
index 473345201..acc29e201 100644
--- a/proposals/migrations/0017_proposal_reviewing_committee.py
+++ b/proposals/migrations/0017_proposal_reviewing_committee.py
@@ -7,17 +7,21 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('auth', '0008_alter_user_username_max_length'),
-        ('proposals', '0016_auto_20181005_1011'),
+        ("auth", "0008_alter_user_username_max_length"),
+        ("proposals", "0016_auto_20181005_1011"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='reviewing_committee',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.CASCADE, to='auth.Group', verbose_name='Door welke comissie dient deze studie te worden beoordeeld?'),
+            model_name="proposal",
+            name="reviewing_committee",
+            field=models.ForeignKey(
+                default=1,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="auth.Group",
+                verbose_name="Door welke comissie dient deze studie te worden beoordeeld?",
+            ),
             preserve_default=False,
         ),
     ]
diff --git a/proposals/migrations/0018_auto_20190124_1533.py b/proposals/migrations/0018_auto_20190124_1533.py
index a27777e31..bc67c1416 100644
--- a/proposals/migrations/0018_auto_20190124_1533.py
+++ b/proposals/migrations/0018_auto_20190124_1533.py
@@ -8,30 +8,47 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0017_proposal_reviewing_committee'),
+        ("proposals", "0017_proposal_reviewing_committee"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='funding',
-            field=models.ManyToManyField(blank=True, to='proposals.Funding', verbose_name='Hoe wordt dit onderzoek gefinancierd?'),
+            model_name="proposal",
+            name="funding",
+            field=models.ManyToManyField(
+                blank=True,
+                to="proposals.Funding",
+                verbose_name="Hoe wordt dit onderzoek gefinancierd?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='relation',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Relation', verbose_name='In welke hoedanigheid bent u betrokken bij deze UiL OTS studie?'),
+            model_name="proposal",
+            name="relation",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="proposals.Relation",
+                verbose_name="In welke hoedanigheid bent u betrokken bij deze UiL OTS studie?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='reviewing_committee',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='auth.Group', verbose_name='Door welke comissie dient deze studie te worden beoordeeld?'),
+            model_name="proposal",
+            name="reviewing_committee",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                to="auth.Group",
+                verbose_name="Door welke comissie dient deze studie te worden beoordeeld?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='summary',
-            field=models.TextField(blank=True, validators=[main.validators.MaxWordsValidator(200)], verbose_name='Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. Gebruik maximaal 200 woorden.'),
+            model_name="proposal",
+            name="summary",
+            field=models.TextField(
+                blank=True,
+                validators=[main.validators.MaxWordsValidator(200)],
+                verbose_name="Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. Gebruik maximaal 200 woorden.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0019_auto_20190401_1343.py b/proposals/migrations/0019_auto_20190401_1343.py
index 889d48190..ad45c6279 100644
--- a/proposals/migrations/0019_auto_20190401_1343.py
+++ b/proposals/migrations/0019_auto_20190401_1343.py
@@ -8,71 +8,133 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('auth', '0008_alter_user_username_max_length'),
-        ('proposals', '0018_auto_20190124_1533'),
+        ("auth", "0008_alter_user_username_max_length"),
+        ("proposals", "0018_auto_20190124_1533"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Institution',
+            name="Institution",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('reviewing_chamber', models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='auth.Group')),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                (
+                    "reviewing_chamber",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.PROTECT, to="auth.Group"
+                    ),
+                ),
             ],
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='is_pre_approved',
-            field=models.NullBooleanField(default=None, verbose_name='Heeft u formele toestemming van een ethische toetsingcommissie, uitgezonderd deze FETC-GW commissie?'),
+            model_name="proposal",
+            name="is_pre_approved",
+            field=models.NullBooleanField(
+                default=None,
+                verbose_name="Heeft u formele toestemming van een ethische toetsingcommissie, uitgezonderd deze FETC-GW commissie?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='other_applicants',
-            field=models.BooleanField(default=False, verbose_name='Zijn er nog andere onderzoekers bij deze studie betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of UiL OTS?'),
+            model_name="proposal",
+            name="other_applicants",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zijn er nog andere onderzoekers bij deze studie betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of UiL OTS?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='other_stakeholders',
-            field=models.BooleanField(default=False, verbose_name='Zijn er nog andere onderzoekers bij deze studie betrokken die <strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten van de Faculteit Geestwetenschappen van de UU? '),
+            model_name="proposal",
+            name="other_stakeholders",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zijn er nog andere onderzoekers bij deze studie betrokken die <strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten van de Faculteit Geestwetenschappen van de UU? ",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='relation',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Relation', verbose_name='In welke hoedanigheid bent u betrokken bij deze studie?'),
+            model_name="proposal",
+            name="relation",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="proposals.Relation",
+                verbose_name="In welke hoedanigheid bent u betrokken bij deze studie?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='status',
-            field=models.PositiveIntegerField(choices=[(1, 'Concept'), (40, 'Opgestuurd ter beoordeling door eindverantwoordelijke'), (50, 'Opgestuurd ter beoordeling door FETC-GW'), (55, 'Studie is beoordeeld door FETC-GW'), (60, 'Studie is beoordeeld door FETC-GW')], default=1),
+            model_name="proposal",
+            name="status",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (1, "Concept"),
+                    (40, "Opgestuurd ter beoordeling door eindverantwoordelijke"),
+                    (50, "Opgestuurd ter beoordeling door FETC-GW"),
+                    (55, "Studie is beoordeeld door FETC-GW"),
+                    (60, "Studie is beoordeeld door FETC-GW"),
+                ],
+                default=1,
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='supervisor',
-            field=models.ForeignKey(blank=True, help_text='Aan het einde van de procedure kunt u deze studie ter verificatie naar uw eindverantwoordelijke sturen. De eindverantwoordelijke zal de studie vervolgens kunnen aanpassen en indienen bij de FETC-GW.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Eindverantwoordelijke onderzoeker'),
+            model_name="proposal",
+            name="supervisor",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Aan het einde van de procedure kunt u deze studie ter verificatie naar uw eindverantwoordelijke sturen. De eindverantwoordelijke zal de studie vervolgens kunnen aanpassen en indienen bij de FETC-GW.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Eindverantwoordelijke onderzoeker",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='title',
-            field=models.CharField(help_text='De titel die u hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer de studie is goedgekeurd, ook voor alle medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.', max_length=200, unique=True, verbose_name='Wat is de titel van uw studie? Deze titel zal worden gebruikt in alle formele correspondentie.'),
+            model_name="proposal",
+            name="title",
+            field=models.CharField(
+                help_text="De titel die u hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer de studie is goedgekeurd, ook voor alle medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.",
+                max_length=200,
+                unique=True,
+                verbose_name="Wat is de titel van uw studie? Deze titel zal worden gebruikt in alle formele correspondentie.",
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='metc',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], default=None, max_length=1, verbose_name='Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling waar toetsing door een METC verplicht is gesteld?'),
+            model_name="wmo",
+            name="metc",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                default=None,
+                max_length=1,
+                verbose_name="Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling waar toetsing door een METC verplicht is gesteld?",
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='metc_application',
-            field=models.BooleanField(default=False, verbose_name='Uw studie moet beoordeeld worden door de METC, maar dient nog wel bij de FETC-GW te worden geregistreerd. Is deze studie al aangemeld bij een METC?'),
+            model_name="wmo",
+            name="metc_application",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Uw studie moet beoordeeld worden door de METC, maar dient nog wel bij de FETC-GW te worden geregistreerd. Is deze studie al aangemeld bij een METC?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='institution',
-            field=models.ForeignKey(default=1, on_delete=django.db.models.deletion.PROTECT, to='proposals.Institution', verbose_name='Aan welk onderzoeksinstituut bent u verbonden?'),
+            model_name="proposal",
+            name="institution",
+            field=models.ForeignKey(
+                default=1,
+                on_delete=django.db.models.deletion.PROTECT,
+                to="proposals.Institution",
+                verbose_name="Aan welk onderzoeksinstituut bent u verbonden?",
+            ),
             preserve_default=False,
         ),
     ]
diff --git a/proposals/migrations/0020_auto_20190401_1348.py b/proposals/migrations/0020_auto_20190401_1348.py
index c0bd75b98..03433cdbc 100644
--- a/proposals/migrations/0020_auto_20190401_1348.py
+++ b/proposals/migrations/0020_auto_20190401_1348.py
@@ -6,24 +6,23 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0019_auto_20190401_1343'),
+        ("proposals", "0019_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='institution',
-            options={'ordering': ['order']},
+            name="institution",
+            options={"ordering": ["order"]},
         ),
         migrations.AddField(
-            model_name='institution',
-            name='description_en',
+            model_name="institution",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='institution',
-            name='description_nl',
+            model_name="institution",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/proposals/migrations/0021_auto_20190926_1559.py b/proposals/migrations/0021_auto_20190926_1559.py
index eabb6f7a3..b3af10480 100644
--- a/proposals/migrations/0021_auto_20190926_1559.py
+++ b/proposals/migrations/0021_auto_20190926_1559.py
@@ -6,15 +6,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0020_auto_20190401_1348'),
+        ("proposals", "0020_auto_20190401_1348"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='reference_number',
+            model_name="proposal",
+            name="reference_number",
             field=models.CharField(max_length=20, unique=True),
         ),
     ]
diff --git a/proposals/migrations/0022_auto_20191107_1438.py b/proposals/migrations/0022_auto_20191107_1438.py
index d75baae1a..f12efe740 100644
--- a/proposals/migrations/0022_auto_20191107_1438.py
+++ b/proposals/migrations/0022_auto_20191107_1438.py
@@ -6,15 +6,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0021_auto_20190926_1559'),
+        ("proposals", "0021_auto_20190926_1559"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='title',
-            field=models.CharField(help_text='De titel die u hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer de studie is goedgekeurd, ook voor alle medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.', max_length=200, verbose_name='Wat is de titel van uw studie? Deze titel zal worden gebruikt in alle formele correspondentie.'),
+            model_name="proposal",
+            name="title",
+            field=models.CharField(
+                help_text="De titel die u hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer de studie is goedgekeurd, ook voor alle medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een studie die u heeft ingediend.",
+                max_length=200,
+                verbose_name="Wat is de titel van uw studie? Deze titel zal worden gebruikt in alle formele correspondentie.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0023_auto_20200428_1337.py b/proposals/migrations/0023_auto_20200428_1337.py
index 573817864..8c8bc954d 100644
--- a/proposals/migrations/0023_auto_20200428_1337.py
+++ b/proposals/migrations/0023_auto_20200428_1337.py
@@ -4,30 +4,44 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0022_auto_20191107_1438'),
+        ("proposals", "0022_auto_20191107_1438"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='inform_local_staff',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='<p>U hebt aangegeven dat u gebruik wilt gaan maken van één van de faciliteiten van het UiL OTS, namelijk de database, Zep software en/of het UiL OTS lab. Het lab supportteam van het UiL OTS zou graag op de hoogte willen worden gesteld van aankomende studies. Daarom vragen wij hier u toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vindt u het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Uw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van de studie <br/> - De titel van de studie <br/> - De beoogde startdatum <br/> - Van welke faciliteiten u gebruik wilt maken (database, lab, Zep software)'),
+            model_name="proposal",
+            name="inform_local_staff",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="<p>U hebt aangegeven dat u gebruik wilt gaan maken van één van de faciliteiten van het UiL OTS, namelijk de database, Zep software en/of het UiL OTS lab. Het lab supportteam van het UiL OTS zou graag op de hoogte willen worden gesteld van aankomende studies. Daarom vragen wij hier u toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vindt u het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Uw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van de studie <br/> - De titel van de studie <br/> - De beoogde startdatum <br/> - Van welke faciliteiten u gebruik wilt maken (database, lab, Zep software)",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='is_pre_approved',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Heeft u formele toestemming van een ethische toetsingcommissie, uitgezonderd deze FETC-GW commissie?'),
+            model_name="proposal",
+            name="is_pre_approved",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="Heeft u formele toestemming van een ethische toetsingcommissie, uitgezonderd deze FETC-GW commissie?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='status_review',
+            model_name="proposal",
+            name="status_review",
             field=models.BooleanField(blank=True, default=None, null=True),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='studies_similar',
-            field=models.BooleanField(blank=True, help_text='Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden).', null=True, verbose_name='Doorlopen alle deelnemersgroepen in essentie hetzelfde traject?'),
+            model_name="proposal",
+            name="studies_similar",
+            field=models.BooleanField(
+                blank=True,
+                help_text="Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden).",
+                null=True,
+                verbose_name="Doorlopen alle deelnemersgroepen in essentie hetzelfde traject?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0023_auto_20201203_0906.py b/proposals/migrations/0023_auto_20201203_0906.py
index 927ecb1dc..9259d1aad 100644
--- a/proposals/migrations/0023_auto_20201203_0906.py
+++ b/proposals/migrations/0023_auto_20201203_0906.py
@@ -8,20 +8,31 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0022_auto_20191107_1438'),
+        ("proposals", "0022_auto_20191107_1438"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='applicants',
-            field=models.ManyToManyField(help_text='Klik in het vlak hiernaast en type een aantal letters van de voornaam, achternaam, of Solis ID van             de persoon die u toe wilt voegen. Klik vervolgens om de persoon toe te voegen. Merk op dat het laden even kan duren.', related_name='applicants', to=settings.AUTH_USER_MODEL, verbose_name='Uitvoerende(n) (inclusief uzelf)'),
+            model_name="proposal",
+            name="applicants",
+            field=models.ManyToManyField(
+                help_text="Klik in het vlak hiernaast en type een aantal letters van de voornaam, achternaam, of Solis ID van             de persoon die u toe wilt voegen. Klik vervolgens om de persoon toe te voegen. Merk op dat het laden even kan duren.",
+                related_name="applicants",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Uitvoerende(n) (inclusief uzelf)",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='supervisor',
-            field=models.ForeignKey(blank=True, help_text='Aan het einde van de procedure kunt u deze studie ter verificatie naar uw eindverantwoordelijke\n            sturen. De eindverantwoordelijke zal de studie vervolgens kunnen aanpassen en indienen bij de FETC-GW.\n            <br><br><strong>Tip</strong>: Type een aantal letters van de voornaam, achternaam, of Solis ID van\n            de persoon die u toe wilt voegen in de zoekbalk hiernaast. Merk op dat het laden even kan duren.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Eindverantwoordelijke onderzoeker'),
+            model_name="proposal",
+            name="supervisor",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Aan het einde van de procedure kunt u deze studie ter verificatie naar uw eindverantwoordelijke\n            sturen. De eindverantwoordelijke zal de studie vervolgens kunnen aanpassen en indienen bij de FETC-GW.\n            <br><br><strong>Tip</strong>: Type een aantal letters van de voornaam, achternaam, of Solis ID van\n            de persoon die u toe wilt voegen in de zoekbalk hiernaast. Merk op dat het laden even kan duren.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Eindverantwoordelijke onderzoeker",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0024_remove_wmo_is_behavioristic.py b/proposals/migrations/0024_remove_wmo_is_behavioristic.py
index 6773249a9..b4783d8f9 100644
--- a/proposals/migrations/0024_remove_wmo_is_behavioristic.py
+++ b/proposals/migrations/0024_remove_wmo_is_behavioristic.py
@@ -6,14 +6,13 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0023_auto_20201203_0906'),
+        ("proposals", "0023_auto_20201203_0906"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='wmo',
-            name='is_behavioristic',
+            model_name="wmo",
+            name="is_behavioristic",
         ),
     ]
diff --git a/proposals/migrations/0025_merge_20201222_1654.py b/proposals/migrations/0025_merge_20201222_1654.py
index 763ab150b..be1655a4b 100644
--- a/proposals/migrations/0025_merge_20201222_1654.py
+++ b/proposals/migrations/0025_merge_20201222_1654.py
@@ -4,11 +4,9 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0024_remove_wmo_is_behavioristic'),
-        ('proposals', '0023_auto_20200428_1337'),
+        ("proposals", "0024_remove_wmo_is_behavioristic"),
+        ("proposals", "0023_auto_20200428_1337"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/proposals/migrations/0026_auto_20210112_1632.py b/proposals/migrations/0026_auto_20210112_1632.py
index c457cc98d..19d8a775d 100644
--- a/proposals/migrations/0026_auto_20210112_1632.py
+++ b/proposals/migrations/0026_auto_20210112_1632.py
@@ -6,20 +6,30 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0025_merge_20201222_1654'),
+        ("proposals", "0025_merge_20201222_1654"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='applicants',
-            field=models.ManyToManyField(related_name='applicants', to=settings.AUTH_USER_MODEL, verbose_name='Uitvoerende(n) (inclusief uzelf)'),
+            model_name="proposal",
+            name="applicants",
+            field=models.ManyToManyField(
+                related_name="applicants",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Uitvoerende(n) (inclusief uzelf)",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='parent',
-            field=models.ForeignKey(help_text='Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='proposals.Proposal', verbose_name='Te kopiëren studie'),
+            model_name="proposal",
+            name="parent",
+            field=models.ForeignKey(
+                help_text="Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="children",
+                to="proposals.Proposal",
+                verbose_name="Te kopiëren studie",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0027_auto_20210118_1735.py b/proposals/migrations/0027_auto_20210118_1735.py
index 8b20ce1fc..c67507236 100644
--- a/proposals/migrations/0027_auto_20210118_1735.py
+++ b/proposals/migrations/0027_auto_20210118_1735.py
@@ -5,15 +5,21 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0026_auto_20210112_1632'),
+        ("proposals", "0026_auto_20210112_1632"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='studies_number',
-            field=models.PositiveIntegerField(default=1, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(10)], verbose_name='Hoeveel verschillende trajecten zijn er?'),
+            model_name="proposal",
+            name="studies_number",
+            field=models.PositiveIntegerField(
+                default=1,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(10),
+                ],
+                verbose_name="Hoeveel verschillende trajecten zijn er?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0028_auto_20210125_1159.py b/proposals/migrations/0028_auto_20210125_1159.py
index 6b1be609f..a649268d6 100644
--- a/proposals/migrations/0028_auto_20210125_1159.py
+++ b/proposals/migrations/0028_auto_20210125_1159.py
@@ -7,25 +7,42 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0027_auto_20210118_1735'),
+        ("proposals", "0027_auto_20210118_1735"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='parent',
-            field=models.ForeignKey(help_text='Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.', null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Proposal', verbose_name='Te kopiëren studie'),
+            model_name="proposal",
+            name="parent",
+            field=models.ForeignKey(
+                help_text="Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="proposals.Proposal",
+                verbose_name="Te kopiëren studie",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='pdf',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Proposal')),
+            model_name="proposal",
+            name="pdf",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory("Proposal"),
+            ),
         ),
         migrations.AlterField(
-            model_name='wmo',
-            name='metc_decision_pdf',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('METC_Decision'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)'),
+            model_name="wmo",
+            name="metc_decision_pdf",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "METC_Decision"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0029_auto_20210129_1717.py b/proposals/migrations/0029_auto_20210129_1717.py
index 8ee0a28d5..d7ca8b9ca 100644
--- a/proposals/migrations/0029_auto_20210129_1717.py
+++ b/proposals/migrations/0029_auto_20210129_1717.py
@@ -6,15 +6,21 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0028_auto_20210125_1159'),
+        ("proposals", "0028_auto_20210125_1159"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='pre_assessment_pdf',
-            field=models.FileField(blank=True, upload_to=proposals.utils.proposal_utils.FilenameFactory('Preassessment'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier uw aanvraag (in .pdf of .doc(x)-formaat)'),
+            model_name="proposal",
+            name="pre_assessment_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Preassessment"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier uw aanvraag (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0030_auto_20210201_1514.py b/proposals/migrations/0030_auto_20210201_1514.py
index 89311ed04..b1c52e34a 100644
--- a/proposals/migrations/0030_auto_20210201_1514.py
+++ b/proposals/migrations/0030_auto_20210201_1514.py
@@ -5,15 +5,21 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0029_auto_20210129_1717'),
+        ("proposals", "0029_auto_20210129_1717"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='parent',
-            field=models.ForeignKey(help_text='Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='proposals.Proposal', verbose_name='Te kopiëren studie'),
+            model_name="proposal",
+            name="parent",
+            field=models.ForeignKey(
+                help_text="Dit veld toont enkel studies waar u zelf een medeuitvoerende bent.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="children",
+                to="proposals.Proposal",
+                verbose_name="Te kopiëren studie",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0031_auto_20210201_1519.py b/proposals/migrations/0031_auto_20210201_1519.py
index a842d302c..97e1558fd 100644
--- a/proposals/migrations/0031_auto_20210201_1519.py
+++ b/proposals/migrations/0031_auto_20210201_1519.py
@@ -6,15 +6,21 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0030_auto_20210201_1514'),
+        ("proposals", "0030_auto_20210201_1514"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='pre_approval_pdf',
-            field=models.FileField(blank=True, upload_to=proposals.utils.proposal_utils.FilenameFactory('Pre_Approval'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier uw formele toestemmingsbrief van dit instituut (in .pdf of .doc(x)-formaat)'),
+            model_name="proposal",
+            name="pre_approval_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Pre_Approval"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier uw formele toestemmingsbrief van dit instituut (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0032_proposal_avg_understood.py b/proposals/migrations/0032_proposal_avg_understood.py
index 1efbe9b9e..dfa303d79 100644
--- a/proposals/migrations/0032_proposal_avg_understood.py
+++ b/proposals/migrations/0032_proposal_avg_understood.py
@@ -4,15 +4,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0031_auto_20210201_1519'),
+        ("proposals", "0031_auto_20210201_1519"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='avg_understood',
+            model_name="proposal",
+            name="avg_understood",
             field=models.BooleanField(default=None, null=True),
         ),
     ]
diff --git a/proposals/migrations/0033_auto_20210521_1154.py b/proposals/migrations/0033_auto_20210521_1154.py
index 9e4c24677..68b8b9534 100644
--- a/proposals/migrations/0033_auto_20210521_1154.py
+++ b/proposals/migrations/0033_auto_20210521_1154.py
@@ -6,20 +6,25 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0032_proposal_avg_understood'),
+        ("proposals", "0032_proposal_avg_understood"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='dmp_file',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('DMP'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Als u een Data Management Plan heeft voor deze studie, kunt u kiezen om deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het toetsingsproces aanzienlijk.'),
+            model_name="proposal",
+            name="dmp_file",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory("DMP"),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Als u een Data Management Plan heeft voor deze studie, kunt u kiezen om deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het toetsingsproces aanzienlijk.",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='avg_understood',
+            model_name="proposal",
+            name="avg_understood",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/proposals/migrations/0034_auto_20211213_1503.py b/proposals/migrations/0034_auto_20211213_1503.py
index a5afdc58d..43c269528 100644
--- a/proposals/migrations/0034_auto_20211213_1503.py
+++ b/proposals/migrations/0034_auto_20211213_1503.py
@@ -6,122 +6,227 @@
 import main.validators
 import proposals.utils.proposal_utils
 
+
 def AVGUnderstoodValidator():
-    '''This was formerly a validator, imported from proposals.validators,
+    """This was formerly a validator, imported from proposals.validators,
     but it is currently no longer required, so it has been removed.
-    To prevent an error, it has been replaced with this stub.'''
+    To prevent an error, it has been replaced with this stub."""
     pass
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
-        ('proposals', '0033_auto_20210521_1154'),
+        ("proposals", "0033_auto_20210521_1154"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='avg_understood',
-            field=models.BooleanField(default=False, validators=[AVGUnderstoodValidator], verbose_name='Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='date_start',
-            field=models.DateField(blank=True, null=True, verbose_name='Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt ingediend?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='dmp_file',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('DMP'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het toetsingsproces aanzienlijk.'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='funding_name',
-            field=models.CharField(blank=True, help_text='De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt worden.', max_length=200, verbose_name='Wat is de naam van het gefinancierde project?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='has_minor_revision',
-            field=models.BooleanField(default=False, verbose_name='Is er een revisie geweest na het indienen van deze aanvraag?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='inform_local_staff',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de faciliteiten van het UiL OTS, namelijk de database, Zep software en/of het UiL OTS lab. Het lab supportteam van het UiL OTS zou graag op de hoogte willen worden gesteld van aankomende onderzoeken. Daarom vragen wij hier jouw toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vind je het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Jouw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van het onderzoek <br/> - De titel van het onderzoek <br/> - De beoogde startdatum <br/> - Van welke faciliteiten je gebruik wil maken (database, lab, Zep software)'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='institution',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='proposals.Institution', verbose_name='Aan welk onderzoeksinstituut ben je verbonden?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='is_pre_approved',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd deze FETC-GW commissie?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='is_revision',
-            field=models.BooleanField(default=False, verbose_name='Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='other_applicants',
-            field=models.BooleanField(default=False, verbose_name='Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of UiL OTS?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='other_stakeholders',
-            field=models.BooleanField(default=False, verbose_name='Zijn er nog andere onderzoekers bij deze aanvraag betrokken die <strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten van de Faculteit Geestwetenschappen van de UU? '),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='parent',
-            field=models.ForeignKey(help_text='Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent.', null=True, on_delete=django.db.models.deletion.CASCADE, related_name='children', to='proposals.Proposal', verbose_name='Te kopiëren aanvraag'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='pre_approval_institute',
-            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Welk instituut heeft de aanvraag goedgekeurd?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='pre_approval_pdf',
-            field=models.FileField(blank=True, upload_to=proposals.utils.proposal_utils.FilenameFactory('Pre_Approval'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of .doc(x)-formaat)'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='pre_assessment_pdf',
-            field=models.FileField(blank=True, upload_to=proposals.utils.proposal_utils.FilenameFactory('Preassessment'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier je aanvraag (in .pdf of .doc(x)-formaat)'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='relation',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.Relation', verbose_name='In welke hoedanigheid ben je betrokken bij dit onderzoek?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='reviewing_committee',
-            field=models.ForeignKey(on_delete=django.db.models.deletion.PROTECT, to='auth.Group', verbose_name='Door welke comissie dient deze aanvraag te worden beoordeeld?'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='status',
-            field=models.PositiveIntegerField(choices=[(1, 'Concept'), (40, 'Opgestuurd ter beoordeling door eindverantwoordelijke'), (50, 'Opgestuurd ter beoordeling door FETC-GW'), (55, 'Aanvraag is beoordeeld door FETC-GW'), (60, 'Aanvraag is beoordeeld door FETC-GW')], default=1),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='supervisor',
-            field=models.ForeignKey(blank=True, help_text='Aan het einde van de procedure kan je deze aanvraag ter\n        verificatie naar je eindverantwoordelijke sturen. De\n        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen en\n        indienen bij de FETC-GW. <br><br><strong>Tip</strong>: Type een\n        aantal letters van de voornaam, achternaam, of Solis ID van het\n        persoon die je toe wilt voegen in de zoekbalk hiernaast.\n        Merk op dat het laden even kan duren.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Eindverantwoordelijke onderzoeker'),
-        ),
-        migrations.AlterField(
-            model_name='proposal',
-            name='title',
-            field=models.CharField(help_text='De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een aanvraag die je hebt ingediend.', max_length=200, verbose_name='Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle formele correspondentie.'),
-        ),
-        migrations.AlterField(
-            model_name='wmo',
-            name='metc_application',
-            field=models.BooleanField(default=False, verbose_name='Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?'),
+            model_name="proposal",
+            name="avg_understood",
+            field=models.BooleanField(
+                default=False,
+                validators=[AVGUnderstoodValidator],
+                verbose_name="Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="date_start",
+            field=models.DateField(
+                blank=True,
+                null=True,
+                verbose_name="Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt ingediend?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="dmp_file",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory("DMP"),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het toetsingsproces aanzienlijk.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="funding_name",
+            field=models.CharField(
+                blank=True,
+                help_text="De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt worden.",
+                max_length=200,
+                verbose_name="Wat is de naam van het gefinancierde project?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="has_minor_revision",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Is er een revisie geweest na het indienen van deze aanvraag?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="inform_local_staff",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de faciliteiten van het UiL OTS, namelijk de database, Zep software en/of het UiL OTS lab. Het lab supportteam van het UiL OTS zou graag op de hoogte willen worden gesteld van aankomende onderzoeken. Daarom vragen wij hier jouw toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vind je het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Jouw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van het onderzoek <br/> - De titel van het onderzoek <br/> - De beoogde startdatum <br/> - Van welke faciliteiten je gebruik wil maken (database, lab, Zep software)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="institution",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                to="proposals.Institution",
+                verbose_name="Aan welk onderzoeksinstituut ben je verbonden?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="is_pre_approved",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd deze FETC-GW commissie?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="is_revision",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="other_applicants",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of UiL OTS?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="other_stakeholders",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zijn er nog andere onderzoekers bij deze aanvraag betrokken die <strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten van de Faculteit Geestwetenschappen van de UU? ",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="parent",
+            field=models.ForeignKey(
+                help_text="Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                related_name="children",
+                to="proposals.Proposal",
+                verbose_name="Te kopiëren aanvraag",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="pre_approval_institute",
+            field=models.CharField(
+                blank=True,
+                max_length=200,
+                null=True,
+                verbose_name="Welk instituut heeft de aanvraag goedgekeurd?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="pre_approval_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Pre_Approval"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of .doc(x)-formaat)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="pre_assessment_pdf",
+            field=models.FileField(
+                blank=True,
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Preassessment"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier je aanvraag (in .pdf of .doc(x)-formaat)",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="relation",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="proposals.Relation",
+                verbose_name="In welke hoedanigheid ben je betrokken bij dit onderzoek?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="reviewing_committee",
+            field=models.ForeignKey(
+                on_delete=django.db.models.deletion.PROTECT,
+                to="auth.Group",
+                verbose_name="Door welke comissie dient deze aanvraag te worden beoordeeld?",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="status",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (1, "Concept"),
+                    (40, "Opgestuurd ter beoordeling door eindverantwoordelijke"),
+                    (50, "Opgestuurd ter beoordeling door FETC-GW"),
+                    (55, "Aanvraag is beoordeeld door FETC-GW"),
+                    (60, "Aanvraag is beoordeeld door FETC-GW"),
+                ],
+                default=1,
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="supervisor",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Aan het einde van de procedure kan je deze aanvraag ter\n        verificatie naar je eindverantwoordelijke sturen. De\n        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen en\n        indienen bij de FETC-GW. <br><br><strong>Tip</strong>: Type een\n        aantal letters van de voornaam, achternaam, of Solis ID van het\n        persoon die je toe wilt voegen in de zoekbalk hiernaast.\n        Merk op dat het laden even kan duren.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Eindverantwoordelijke onderzoeker",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="title",
+            field=models.CharField(
+                help_text="De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van deze portal kijken. De titel mag niet identiek zijn aan een vorige titel van een aanvraag die je hebt ingediend.",
+                max_length=200,
+                verbose_name="Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle formele correspondentie.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="wmo",
+            name="metc_application",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0035_auto_20220607_1315.py b/proposals/migrations/0035_auto_20220607_1315.py
index abde2c4c0..a3b280893 100644
--- a/proposals/migrations/0035_auto_20220607_1315.py
+++ b/proposals/migrations/0035_auto_20220607_1315.py
@@ -6,21 +6,32 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('proposals', '0034_auto_20211213_1503'),
+        ("proposals", "0034_auto_20211213_1503"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='studies_similar',
-            field=models.BooleanField(blank=True, help_text='Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan zijn dit verschillende trajecten.', null=True, verbose_name='Doorlopen alle deelnemersgroepen in essentie hetzelfde traject?'),
+            model_name="proposal",
+            name="studies_similar",
+            field=models.BooleanField(
+                blank=True,
+                help_text="Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan zijn dit verschillende trajecten.",
+                null=True,
+                verbose_name="Doorlopen alle deelnemersgroepen in essentie hetzelfde traject?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='supervisor',
-            field=models.ForeignKey(blank=True, help_text='Aan het einde van de procedure kan je deze aanvraag ter\n        verificatie naar je eindverantwoordelijke sturen. De\n        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen en\n        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog wel\n        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor je de\n        aanvraag indient.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Eindverantwoordelijke onderzoeker'),
+            model_name="proposal",
+            name="supervisor",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Aan het einde van de procedure kan je deze aanvraag ter\n        verificatie naar je eindverantwoordelijke sturen. De\n        eindverantwoordelijke zal de aanvraag vervolgens kunnen aanpassen en\n        indienen bij de FETC-GW. <br><br><strong>NB</strong>: als je je\n        eindverantwoordelijke niet kunt vinden met dit veld, moeten zij\n        waarschijnlijk eerst één keer inloggen in deze portal. Je kunt nog wel\n        verder met de aanvraag, maar vergeet dit veld niet in te vullen voor je de\n        aanvraag indient.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Eindverantwoordelijke onderzoeker",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0036_proposal_self_assesment.py b/proposals/migrations/0036_proposal_self_assesment.py
index 5d1b1eff6..ddfd22a63 100644
--- a/proposals/migrations/0036_proposal_self_assesment.py
+++ b/proposals/migrations/0036_proposal_self_assesment.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0035_auto_20220607_1315'),
+        ("proposals", "0035_auto_20220607_1315"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='self_assesment',
-            field=models.TextField(blank=True, max_length=500, verbose_name='Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf kort hoe ga je daarmee omgaat.'),
+            model_name="proposal",
+            name="self_assesment",
+            field=models.TextField(
+                blank=True,
+                max_length=500,
+                verbose_name="Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf kort hoe ga je daarmee omgaat.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0037_rename_self_assesment_proposal_self_assessment.py b/proposals/migrations/0037_rename_self_assesment_proposal_self_assessment.py
index 9662a8831..83c48fb41 100644
--- a/proposals/migrations/0037_rename_self_assesment_proposal_self_assessment.py
+++ b/proposals/migrations/0037_rename_self_assesment_proposal_self_assessment.py
@@ -4,15 +4,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0036_proposal_self_assesment'),
+        ("proposals", "0036_proposal_self_assesment"),
     ]
 
     operations = [
         migrations.RenameField(
-            model_name='proposal',
-            old_name='self_assesment',
-            new_name='self_assessment',
+            model_name="proposal",
+            old_name="self_assesment",
+            new_name="self_assessment",
         ),
     ]
diff --git a/proposals/migrations/0038_auto_20220830_1357.py b/proposals/migrations/0038_auto_20220830_1357.py
index 56a11c130..ed27ee484 100644
--- a/proposals/migrations/0038_auto_20220830_1357.py
+++ b/proposals/migrations/0038_auto_20220830_1357.py
@@ -4,20 +4,26 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0037_rename_self_assesment_proposal_self_assessment'),
+        ("proposals", "0037_rename_self_assesment_proposal_self_assessment"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='student_program',
-            field=models.CharField(blank=True, max_length=200, verbose_name='Wat is je studierichting?'),
+            model_name="proposal",
+            name="student_program",
+            field=models.CharField(
+                blank=True, max_length=200, verbose_name="Wat is je studierichting?"
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='studies_similar',
-            field=models.BooleanField(blank=True, help_text='Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject, en voldoet één set documenten voor de informed consent. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan kan dit niet en zijn dit afzonderlijke trajecten.', null=True, verbose_name='Kan voor alle deelnemersgroepen dezelfde informatiebrief en         toestemmingsverklaring gebruikt worden?'),
+            model_name="proposal",
+            name="studies_similar",
+            field=models.BooleanField(
+                blank=True,
+                help_text="Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject, en voldoet één set documenten voor de informed consent. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan kan dit niet en zijn dit afzonderlijke trajecten.",
+                null=True,
+                verbose_name="Kan voor alle deelnemersgroepen dezelfde informatiebrief en         toestemmingsverklaring gebruikt worden?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0039_auto_20220830_1526.py b/proposals/migrations/0039_auto_20220830_1526.py
index 2289aabab..0336d73b5 100644
--- a/proposals/migrations/0039_auto_20220830_1526.py
+++ b/proposals/migrations/0039_auto_20220830_1526.py
@@ -5,29 +5,42 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0038_auto_20220830_1357'),
+        ("proposals", "0038_auto_20220830_1357"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='StudentContext',
+            name="StudentContext",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('description_nl', models.CharField(max_length=200, null=True)),
-                ('description_en', models.CharField(max_length=200, null=True)),
-                ('needs_details', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("description_nl", models.CharField(max_length=200, null=True)),
+                ("description_en", models.CharField(max_length=200, null=True)),
+                ("needs_details", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='student_context',
-            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.studentcontext', verbose_name='In welke context doe je dit onderzoek?'),
+            model_name="proposal",
+            name="student_context",
+            field=models.ForeignKey(
+                blank=True,
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="proposals.studentcontext",
+                verbose_name="In welke context doe je dit onderzoek?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0040_auto_20220830_1634.py b/proposals/migrations/0040_auto_20220830_1634.py
index 21751278b..88e85d5f1 100644
--- a/proposals/migrations/0040_auto_20220830_1634.py
+++ b/proposals/migrations/0040_auto_20220830_1634.py
@@ -5,20 +5,26 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0039_auto_20220830_1526'),
+        ("proposals", "0039_auto_20220830_1526"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='student_context_details',
-            field=models.CharField(blank=True, max_length=200, null=True, verbose_name='Namelijk:'),
+            model_name="proposal",
+            name="student_context_details",
+            field=models.CharField(
+                blank=True, max_length=200, null=True, verbose_name="Namelijk:"
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='relation',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.CASCADE, to='proposals.relation', verbose_name='In welke hoedanigheid ben je betrokken bij dit onderzoek?'),
+            model_name="proposal",
+            name="relation",
+            field=models.ForeignKey(
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="proposals.relation",
+                verbose_name="In welke hoedanigheid ben je betrokken bij dit onderzoek?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0041_alter_proposal_funding_name.py b/proposals/migrations/0041_alter_proposal_funding_name.py
index 0530d177f..869054df2 100644
--- a/proposals/migrations/0041_alter_proposal_funding_name.py
+++ b/proposals/migrations/0041_alter_proposal_funding_name.py
@@ -4,15 +4,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0040_auto_20220830_1634'),
+        ("proposals", "0040_auto_20220830_1634"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='funding_name',
-            field=models.CharField(blank=True, help_text='De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt worden.', max_length=200, verbose_name='Wat is de naam van het gefinancierde project en wat is het projectnummer?'),
+            model_name="proposal",
+            name="funding_name",
+            field=models.CharField(
+                blank=True,
+                help_text="De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt worden.",
+                max_length=200,
+                verbose_name="Wat is de naam van het gefinancierde project en wat is het projectnummer?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0042_proposal_student_justification.py b/proposals/migrations/0042_proposal_student_justification.py
index d07381a3a..e914c3638 100644
--- a/proposals/migrations/0042_proposal_student_justification.py
+++ b/proposals/migrations/0042_proposal_student_justification.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0041_alter_proposal_funding_name'),
+        ("proposals", "0041_alter_proposal_funding_name"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='student_justification',
-            field=models.TextField(blank=True, max_length=500, verbose_name='Studenten (die mensgebonden onderzoek uitvoeren binnen hun             studieprogramma) hoeven in principe geen aanvraag in te dienen bij de             FETC-GW. Bespreek met je begeleider of je daadwerkelijk een aanvraag             moet indienen. Als dat niet hoeft kun je nu je aanvraag afbreken.             Als dat wel moet, geef dan hier aan wat de reden is:'),
+            model_name="proposal",
+            name="student_justification",
+            field=models.TextField(
+                blank=True,
+                max_length=500,
+                verbose_name="Studenten (die mensgebonden onderzoek uitvoeren binnen hun             studieprogramma) hoeven in principe geen aanvraag in te dienen bij de             FETC-GW. Bespreek met je begeleider of je daadwerkelijk een aanvraag             moet indienen. Als dat niet hoeft kun je nu je aanvraag afbreken.             Als dat wel moet, geef dan hier aan wat de reden is:",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0043_auto_20221025_1057.py b/proposals/migrations/0043_auto_20221025_1057.py
index 0da4e7a26..07635ce51 100644
--- a/proposals/migrations/0043_auto_20221025_1057.py
+++ b/proposals/migrations/0043_auto_20221025_1057.py
@@ -4,20 +4,28 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0042_proposal_student_justification'),
+        ("proposals", "0042_proposal_student_justification"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='date_start',
-            field=models.DateField(blank=True, help_text='NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer gegeven worden; de FETC-GW geeft in die gevallen een post-hoc advies.', null=True, verbose_name='Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt ingediend?'),
+            model_name="proposal",
+            name="date_start",
+            field=models.DateField(
+                blank=True,
+                help_text="NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer gegeven worden; de FETC-GW geeft in die gevallen een post-hoc advies.",
+                null=True,
+                verbose_name="Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt ingediend?",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='student_justification',
-            field=models.TextField(blank=True, max_length=500, verbose_name='Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met je begeleider of je daadwerkelijk een aanvraag moet indienen. Als dat niet hoeft kun je nu je aanvraag afbreken. Als dat wel moet, geef dan hier aan wat de reden is:'),
+            model_name="proposal",
+            name="student_justification",
+            field=models.TextField(
+                blank=True,
+                max_length=500,
+                verbose_name="Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met je begeleider of je daadwerkelijk een aanvraag moet indienen. Als dat niet hoeft kun je nu je aanvraag afbreken. Als dat wel moet, geef dan hier aan wat de reden is:",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0044_auto_20221206_1518.py b/proposals/migrations/0044_auto_20221206_1518.py
index 2490a8033..b7e3db739 100644
--- a/proposals/migrations/0044_auto_20221206_1518.py
+++ b/proposals/migrations/0044_auto_20221206_1518.py
@@ -4,20 +4,27 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0043_auto_20221025_1057'),
+        ("proposals", "0043_auto_20221025_1057"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='inform_local_staff',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS lab. Het lab supportteam van het ILS zou graag op de hoogte willen worden gesteld van aankomende onderzoeken. Daarom vragen wij hier jouw toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vind je het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Jouw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van het onderzoek <br/> - De titel van het onderzoek <br/> - De beoogde startdatum <br/> - Van welke faciliteiten je gebruik wil maken (database, lab, Zep software)'),
+            model_name="proposal",
+            name="inform_local_staff",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS lab. Het lab supportteam van het ILS zou graag op de hoogte willen worden gesteld van aankomende onderzoeken. Daarom vragen wij hier jouw toestemming om delen van deze aanvraag door te sturen naar het lab supportteam.</p> <p>Vind je het goed dat de volgende delen uit de aanvraag worden doorgestuurd:</p> - Jouw naam en de namen van de andere betrokkenen <br/> - De eindverantwoordelijke van het onderzoek <br/> - De titel van het onderzoek <br/> - De beoogde startdatum <br/> - Van welke faciliteiten je gebruik wil maken (database, lab, Zep software)",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='other_applicants',
-            field=models.BooleanField(default=False, verbose_name='Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?'),
+            model_name="proposal",
+            name="other_applicants",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0045_alter_proposal_self_assessment.py b/proposals/migrations/0045_alter_proposal_self_assessment.py
index 6e6686877..e47d95310 100644
--- a/proposals/migrations/0045_alter_proposal_self_assessment.py
+++ b/proposals/migrations/0045_alter_proposal_self_assessment.py
@@ -5,15 +5,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0044_auto_20221206_1518'),
+        ("proposals", "0044_auto_20221206_1518"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='self_assessment',
-            field=models.TextField(blank=True, validators=[main.validators.MaxWordsValidator(300)], verbose_name='Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf kort hoe ga je daarmee omgaat.  Gebruik maximaal 300 woorden.'),
+            model_name="proposal",
+            name="self_assessment",
+            field=models.TextField(
+                blank=True,
+                validators=[main.validators.MaxWordsValidator(300)],
+                verbose_name="Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf kort hoe ga je daarmee omgaat.  Gebruik maximaal 300 woorden.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0046_auto_20230711_1634.py b/proposals/migrations/0046_auto_20230711_1634.py
index d88ad49d1..4a96bce28 100644
--- a/proposals/migrations/0046_auto_20230711_1634.py
+++ b/proposals/migrations/0046_auto_20230711_1634.py
@@ -5,30 +5,48 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0045_alter_proposal_self_assessment'),
+        ("proposals", "0045_alter_proposal_self_assessment"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='proposal',
-            name='translated_forms',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Worden de informed consent formulieren nog vertaald naar een andere taal dan Nederlands of Engels?'),
+            model_name="proposal",
+            name="translated_forms",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="Worden de informed consent formulieren nog vertaald naar een andere taal dan Nederlands of Engels?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='translated_forms_languages',
-            field=models.CharField(blank=True, default=None, max_length=255, null=True, verbose_name='Andere talen:'),
+            model_name="proposal",
+            name="translated_forms_languages",
+            field=models.CharField(
+                blank=True,
+                default=None,
+                max_length=255,
+                null=True,
+                verbose_name="Andere talen:",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='comments',
-            field=models.TextField(blank=True, validators=[main.validators.MaxWordsValidator(1000)], verbose_name='Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden.'),
+            model_name="proposal",
+            name="comments",
+            field=models.TextField(
+                blank=True,
+                validators=[main.validators.MaxWordsValidator(1000)],
+                verbose_name="Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden.",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='self_assessment',
-            field=models.TextField(blank=True, validators=[main.validators.MaxWordsValidator(1000)], verbose_name='Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden.'),
+            model_name="proposal",
+            name="self_assessment",
+            field=models.TextField(
+                blank=True,
+                validators=[main.validators.MaxWordsValidator(1000)],
+                verbose_name="Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0047_auto_20230718_1626.py b/proposals/migrations/0047_auto_20230718_1626.py
index 64ea89125..2c44a8986 100644
--- a/proposals/migrations/0047_auto_20230718_1626.py
+++ b/proposals/migrations/0047_auto_20230718_1626.py
@@ -4,24 +4,32 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0046_auto_20230711_1634'),
+        ("proposals", "0046_auto_20230711_1634"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='proposal',
-            name='public',
+            model_name="proposal",
+            name="public",
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='embargo',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Als de deelnemers van je onderzoek moeten worden misleid, kan           je ervoor kiezen je applicatie pas later op te laten nemen in het           semi-publieke archief. Wil je dat jouw onderzoek tijdelijk onder           embargo wordt geplaatst?'),
+            model_name="proposal",
+            name="embargo",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="Als de deelnemers van je onderzoek moeten worden misleid, kan           je ervoor kiezen je applicatie pas later op te laten nemen in het           semi-publieke archief. Wil je dat jouw onderzoek tijdelijk onder           embargo wordt geplaatst?",
+            ),
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='embargo_end_date',
-            field=models.DateField(blank=True, null=True, verbose_name='Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?'),
+            model_name="proposal",
+            name="embargo_end_date",
+            field=models.DateField(
+                blank=True,
+                null=True,
+                verbose_name="Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0048_auto_20231016_1202.py b/proposals/migrations/0048_auto_20231016_1202.py
index d05e09b71..bcc8ceb39 100644
--- a/proposals/migrations/0048_auto_20231016_1202.py
+++ b/proposals/migrations/0048_auto_20231016_1202.py
@@ -5,21 +5,29 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('proposals', '0047_auto_20230718_1626'),
+        ("proposals", "0047_auto_20230718_1626"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='applicants',
-            field=models.ManyToManyField(related_name='applicants', to=settings.AUTH_USER_MODEL, verbose_name='Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren.'),
+            model_name="proposal",
+            name="applicants",
+            field=models.ManyToManyField(
+                related_name="applicants",
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren.",
+            ),
         ),
         migrations.AlterField(
-            model_name='proposal',
-            name='embargo',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Als de deelnemers van je onderzoek moeten worden misleid, kan           je ervoor kiezen je applicatie pas later op te laten nemen in het           publieke archief en het archief voor gebruikers           van dit portaal. Wil je dat jouw onderzoek tijdelijk onder           embargo wordt geplaatst?'),
+            model_name="proposal",
+            name="embargo",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="Als de deelnemers van je onderzoek moeten worden misleid, kan           je ervoor kiezen je applicatie pas later op te laten nemen in het           publieke archief en het archief voor gebruikers           van dit portaal. Wil je dat jouw onderzoek tijdelijk onder           embargo wordt geplaatst?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0049_alter_proposal_supervisor.py b/proposals/migrations/0049_alter_proposal_supervisor.py
index 3ea070c38..98a2f8d4e 100644
--- a/proposals/migrations/0049_alter_proposal_supervisor.py
+++ b/proposals/migrations/0049_alter_proposal_supervisor.py
@@ -6,16 +6,22 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
-        ('proposals', '0048_auto_20231016_1202'),
+        ("proposals", "0048_auto_20231016_1202"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='supervisor',
-            field=models.ForeignKey(blank=True, help_text='Je aanvraag moet, als je alles hebt ingevuld, via de portal \n                    naar je promotor of begeleider gestuurd worden. Deze persoon \n                    is de eindverantwoordelijk onderzoeker, en zal de aanvraag \n                    vervolgens waar nodig kunnen aanpassen en indienen bij de FETC-GW.\n                    <br><br><strong>Belangrijk</strong>: als je je promotor of \n                    begeleider niet kunt vinden met dit veld, dan moeten zij \n                    waarschijnlijk eerst één keer inloggen in deze portal. \n                    Je kunt nog wel verder met de aanvraag, maar vergeet dit veld \n                    niet in te vullen voor je de aanvraag indient. Je aanvraag \n                    zal dan namelijk niet in behandeling kunnen worden genomen.', null=True, on_delete=django.db.models.deletion.CASCADE, to=settings.AUTH_USER_MODEL, verbose_name='Promotor/Begeleider'),
+            model_name="proposal",
+            name="supervisor",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Je aanvraag moet, als je alles hebt ingevuld, via de portal \n                    naar je promotor of begeleider gestuurd worden. Deze persoon \n                    is de eindverantwoordelijk onderzoeker, en zal de aanvraag \n                    vervolgens waar nodig kunnen aanpassen en indienen bij de FETC-GW.\n                    <br><br><strong>Belangrijk</strong>: als je je promotor of \n                    begeleider niet kunt vinden met dit veld, dan moeten zij \n                    waarschijnlijk eerst één keer inloggen in deze portal. \n                    Je kunt nog wel verder met de aanvraag, maar vergeet dit veld \n                    niet in te vullen voor je de aanvraag indient. Je aanvraag \n                    zal dan namelijk niet in behandeling kunnen worden genomen.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to=settings.AUTH_USER_MODEL,
+                verbose_name="Promotor/Begeleider",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0050_alter_proposal_other_applicants.py b/proposals/migrations/0050_alter_proposal_other_applicants.py
index a8756a846..cd3b0dc56 100644
--- a/proposals/migrations/0050_alter_proposal_other_applicants.py
+++ b/proposals/migrations/0050_alter_proposal_other_applicants.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0049_alter_proposal_supervisor'),
+        ("proposals", "0049_alter_proposal_supervisor"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='other_applicants',
-            field=models.BooleanField(default=False, help_text='Werk je samen met een onderzoeker of organisatie buiten de UU en is je onderzoek niet strikt anoniem? Neem dan contact op met de <a href="mailto:privacy.gw@uu.nl">privacy officer</a>. Er moeten dan wellicht afspraken worden gemaakt over de verwerking van persoonsgegevens.', verbose_name='Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?'),
+            model_name="proposal",
+            name="other_applicants",
+            field=models.BooleanField(
+                default=False,
+                help_text='Werk je samen met een onderzoeker of organisatie buiten de UU en is je onderzoek niet strikt anoniem? Neem dan contact op met de <a href="mailto:privacy.gw@uu.nl">privacy officer</a>. Er moeten dan wellicht afspraken worden gemaakt over de verwerking van persoonsgegevens.',
+                verbose_name="Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0050_auto_20231116_1413.py b/proposals/migrations/0050_auto_20231116_1413.py
index 2de122f4d..b5adf91e5 100644
--- a/proposals/migrations/0050_auto_20231116_1413.py
+++ b/proposals/migrations/0050_auto_20231116_1413.py
@@ -4,19 +4,23 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0049_alter_proposal_supervisor'),
+        ("proposals", "0049_alter_proposal_supervisor"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='proposal',
-            name='avg_understood',
+            model_name="proposal",
+            name="avg_understood",
         ),
         migrations.AddField(
-            model_name='proposal',
-            name='privacy_officer',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+            model_name="proposal",
+            name="privacy_officer",
+            field=models.BooleanField(
+                blank=True,
+                default=None,
+                null=True,
+                verbose_name="Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.",
+            ),
         ),
     ]
diff --git a/proposals/migrations/0051_merge_20231121_1606.py b/proposals/migrations/0051_merge_20231121_1606.py
index 0ef8b45a1..a6fa2718d 100644
--- a/proposals/migrations/0051_merge_20231121_1606.py
+++ b/proposals/migrations/0051_merge_20231121_1606.py
@@ -4,11 +4,9 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0050_alter_proposal_other_applicants'),
-        ('proposals', '0050_auto_20231116_1413'),
+        ("proposals", "0050_alter_proposal_other_applicants"),
+        ("proposals", "0050_auto_20231116_1413"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/proposals/migrations/0052_alter_proposal_studies_similar.py b/proposals/migrations/0052_alter_proposal_studies_similar.py
index 4b0c0be62..a7d366dd7 100644
--- a/proposals/migrations/0052_alter_proposal_studies_similar.py
+++ b/proposals/migrations/0052_alter_proposal_studies_similar.py
@@ -4,15 +4,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0051_merge_20231121_1606'),
+        ("proposals", "0051_merge_20231121_1606"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='proposal',
-            name='studies_similar',
-            field=models.BooleanField(blank=True, help_text='Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject, en voldoet één set documenten voor de informed consent. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan kan dit niet en zijn dit afzonderlijke trajecten.', null=True, verbose_name='Kan voor alle deelnemers dezelfde informatiebrief en, indien van           toepassing, dezelfde toestemmingsverklaring gebruikt worden?'),
+            model_name="proposal",
+            name="studies_similar",
+            field=models.BooleanField(
+                blank=True,
+                help_text="Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is sprake van in essentie hetzelfde traject, en voldoet één set documenten voor de informed consent. Denk hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van een set verhaaltjes te lezen krijgt, en de andere groep in taak X de andere helft. Of aan interventieonderzoek waarin drie vergelijkbare groepen op hetzelfde moment een verschillende interventie-variant krijgen (specificeer dan wel bij de beschrijving van de interventie welke varianten precies gebruikt worden). Let op: als verschillende groepen deelnemers verschillende <i>soorten</i> taken krijgen, dan kan dit niet en zijn dit afzonderlijke trajecten.",
+                null=True,
+                verbose_name="Kan voor alle deelnemers dezelfde informatiebrief en, indien van           toepassing, dezelfde toestemmingsverklaring gebruikt worden?",
+            ),
         ),
     ]
diff --git a/proposals/mixins.py b/proposals/mixins.py
index 0a018bfd9..a3c2d0b15 100644
--- a/proposals/mixins.py
+++ b/proposals/mixins.py
@@ -14,29 +14,29 @@
 from .forms import ProposalForm
 from .utils.proposal_utils import pdf_link_callback
 
+
 class ProposalMixin(UserFormKwargsMixin):
     model = Proposal
     form_class = ProposalForm
-    success_message = _('Aanvraag %(title)s bewerkt')
+    success_message = _("Aanvraag %(title)s bewerkt")
 
     def get_next_url(self):
         """If the Proposal has a Wmo model attached, go to update, else, go to create"""
         proposal = self.object
-        if hasattr(proposal, 'wmo'):
-            return reverse('proposals:wmo_update', args=(proposal.pk,))
+        if hasattr(proposal, "wmo"):
+            return reverse("proposals:wmo_update", args=(proposal.pk,))
         else:
-            return reverse('proposals:wmo_create', args=(proposal.pk,))
+            return reverse("proposals:wmo_create", args=(proposal.pk,))
 
 
 class ProposalContextMixin:
-
     def current_user_is_supervisor(self):
         return self.object.supervisor == self.request.user
 
     def get_context_data(self, **kwargs):
         context = super(ProposalContextMixin, self).get_context_data(**kwargs)
-        context['is_supervisor'] = self.current_user_is_supervisor()
-        context['is_practice'] = self.object.is_practice()
+        context["is_supervisor"] = self.current_user_is_supervisor()
+        context["is_practice"] = self.object.is_practice()
         return context
 
 
@@ -92,8 +92,8 @@ def get_content_disposition(self):
             cd = "inline"
 
         self.content_disposition = '{}; filename="{}"'.format(
-            cd,
-            self.get_pdf_filename())
+            cd, self.get_pdf_filename()
+        )
 
         return self.content_disposition
 
@@ -104,8 +104,8 @@ def get_pdf_response(self, context, dest=None, **response_kwargs):
         if not dest:
             # Create a Django response object, and specify content_type as pdf
             # This is the default when using this view
-            response = HttpResponse(content_type='application/pdf')
-            response['Content-Disposition'] = self.get_content_disposition()
+            response = HttpResponse(content_type="application/pdf")
+            response["Content-Disposition"] = self.get_content_disposition()
             dest = response
 
         # find the template and render it.
@@ -130,12 +130,11 @@ def get_pdf_response(self, context, dest=None, **response_kwargs):
         )
 
         if pisa_status.err:
-            return HttpResponse('We had some errors <pre>' + html + '</pre>')
+            return HttpResponse("We had some errors <pre>" + html + "</pre>")
         return dest
 
     def render_to_response(self, context, **response_kwargs):
-
-        response = HttpResponse(content_type='application/pdf')
-        response['Content-Disposition'] = self.get_content_disposition()
+        response = HttpResponse(content_type="application/pdf")
+        response["Content-Disposition"] = self.get_content_disposition()
 
         return self.get_pdf_response(context, **response_kwargs, dest=response)
diff --git a/proposals/models.py b/proposals/models.py
index a7d177d42..014acead1 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -11,6 +11,7 @@
 
 from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
+
 mark_safe_lazy = lazy(mark_safe, str)
 
 from main.models import YesNoDoubt
@@ -23,11 +24,11 @@
 SUMMARY_MAX_WORDS = 200
 SELF_ASSESSMENT_MAX_WORDS = 1000
 COMMENTS_MAX_WORDS = 1000
-PROPOSAL_FILENAME = FilenameFactory('Proposal')
-PREASSESSMENT_FILENAME = FilenameFactory('Preassessment')
-DMP_FILENAME = FilenameFactory('DMP')
-METC_DECISION_FILENAME = FilenameFactory('METC_Decision')
-PRE_APPROVAL_FILENAME = FilenameFactory('Pre_Approval')
+PROPOSAL_FILENAME = FilenameFactory("Proposal")
+PREASSESSMENT_FILENAME = FilenameFactory("Preassessment")
+DMP_FILENAME = FilenameFactory("DMP")
+METC_DECISION_FILENAME = FilenameFactory("METC_Decision")
+PRE_APPROVAL_FILENAME = FilenameFactory("Pre_Approval")
 
 
 class Relation(models.Model):
@@ -38,18 +39,19 @@ class Relation(models.Model):
     check_pre_assessment = models.BooleanField(default=True)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
 
+
 class StudentContext(models.Model):
     order = models.PositiveIntegerField(unique=True)
     description = models.CharField(max_length=200)
     needs_details = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
@@ -63,7 +65,7 @@ class Funding(models.Model):
     requires_review = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
@@ -78,72 +80,86 @@ class Institution(models.Model):
     )
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
 
-class ProposalQuerySet(models.QuerySet):
 
+class ProposalQuerySet(models.QuerySet):
     DECISION_MADE = 55
 
     def archive_pre_filter(self):
-        return self.filter(status__gte=self.DECISION_MADE,
-                                             status_review=True,
-                                             in_archive=True,
+        return self.filter(
+            status__gte=self.DECISION_MADE,
+            status_review=True,
+            in_archive=True,
         )
 
     def no_embargo(self):
-        return self.filter(models.Q(embargo_end_date__isnull=True)
-             | models.Q(embargo_end_date__lt=date.today())
-             )
+        return self.filter(
+            models.Q(embargo_end_date__isnull=True)
+            | models.Q(embargo_end_date__lt=date.today())
+        )
 
     def public_archive(self):
-        two_years_ago = (
-                date.today() -
-                timedelta(weeks=104)
-        )
-        return self.archive_pre_filter().no_embargo().filter(
-                                        date_confirmed__gt=two_years_ago,
-        ).order_by(
-            "-date_reviewed"
+        two_years_ago = date.today() - timedelta(weeks=104)
+        return (
+            self.archive_pre_filter()
+            .no_embargo()
+            .filter(
+                date_confirmed__gt=two_years_ago,
+            )
+            .order_by("-date_reviewed")
         )
 
     def export(self):
-        return self.archive_pre_filter().order_by(
-            "-date_reviewed"
-        )
+        return self.archive_pre_filter().order_by("-date_reviewed")
 
     def users_only_archive(self, committee):
-        return self.archive_pre_filter().no_embargo().filter(
-                                       is_pre_assessment=False,
-                                       reviewing_committee=committee,
-                                       ).select_related(
-            # this optimizes the loading a bit
-            'supervisor', 'parent', 'relation',
-            'parent__supervisor', 'parent__relation',
-        ).prefetch_related(
-            'applicants', 'review_set', 'parent__review_set', 'study_set',
-            'study_set__observation', 'study_set__session_set',
-            'study_set__intervention', 'study_set__session_set__task_set'
+        return (
+            self.archive_pre_filter()
+            .no_embargo()
+            .filter(
+                is_pre_assessment=False,
+                reviewing_committee=committee,
+            )
+            .select_related(
+                # this optimizes the loading a bit
+                "supervisor",
+                "parent",
+                "relation",
+                "parent__supervisor",
+                "parent__relation",
+            )
+            .prefetch_related(
+                "applicants",
+                "review_set",
+                "parent__review_set",
+                "study_set",
+                "study_set__observation",
+                "study_set__session_set",
+                "study_set__intervention",
+                "study_set__session_set__task_set",
+            )
         )
 
 
 class Proposal(models.Model):
-
     objects = ProposalQuerySet.as_manager()
 
     class Statuses(models.IntegerChoices):
-        DRAFT = 1, _('Concept')
-        SUBMITTED_TO_SUPERVISOR = 40, _('Opgestuurd ter beoordeling door eindverantwoordelijke')
-        SUBMITTED = 50, _('Opgestuurd ter beoordeling door FETC-GW')
-        DECISION_MADE = 55, _('Aanvraag is beoordeeld door FETC-GW')
-        WMO_DECISION_MADE = 60, _('Aanvraag is beoordeeld door FETC-GW')
+        DRAFT = 1, _("Concept")
+        SUBMITTED_TO_SUPERVISOR = 40, _(
+            "Opgestuurd ter beoordeling door eindverantwoordelijke"
+        )
+        SUBMITTED = 50, _("Opgestuurd ter beoordeling door FETC-GW")
+        DECISION_MADE = 55, _("Aanvraag is beoordeeld door FETC-GW")
+        WMO_DECISION_MADE = 60, _("Aanvraag is beoordeeld door FETC-GW")
 
     class PracticeReasons(models.IntegerChoices):
-        COURSE = 1, _('om de portal te exploreren')
-        EXPLORATION = 2, _('in het kader van een cursus')
-
+        COURSE = 1, _("om de portal te exploreren")
+        EXPLORATION = 2, _("in het kader van een cursus")
 
     # Fields of a proposal
     reference_number = models.CharField(
@@ -153,46 +169,48 @@ class PracticeReasons(models.IntegerChoices):
 
     reviewing_committee = models.ForeignKey(
         Group,
-        verbose_name=_(
-            'Door welke comissie dient deze aanvraag te worden beoordeeld?'
-        ),
+        verbose_name=_("Door welke comissie dient deze aanvraag te worden beoordeeld?"),
         help_text="",
         on_delete=models.PROTECT,
     )
 
     institution = models.ForeignKey(
         Institution,
-        verbose_name=_(
-            'Aan welk onderzoeksinstituut ben je verbonden?'
-        ),
+        verbose_name=_("Aan welk onderzoeksinstituut ben je verbonden?"),
         on_delete=models.PROTECT,
     )
 
     date_start = models.DateField(
-        _('Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt ingediend?'),
-        help_text=_("NB: Voor een aanvraag van een onderzoek dat al gestart is voordat \
+        _(
+            "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt ingediend?"
+        ),
+        help_text=_(
+            "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat \
 de FETC-GW de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer \
-gegeven worden; de FETC-GW geeft in die gevallen een post-hoc advies."),
+gegeven worden; de FETC-GW geeft in die gevallen een post-hoc advies."
+        ),
         blank=True,
         null=True,
     )
 
     title = models.CharField(
         _(
-            'Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in '
-            'alle formele correspondentie.'
+            "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in "
+            "alle formele correspondentie."
         ),
         max_length=200,
         unique=False,
-        help_text=_('De titel die je hier opgeeft is zichtbaar voor de \
+        help_text=_(
+            "De titel die je hier opgeeft is zichtbaar voor de \
 FETC-GW-leden en, wanneer de aanvraag is goedgekeurd, ook voor alle \
 medewerkers die in het archief van deze portal kijken. De titel mag niet \
-identiek zijn aan een vorige titel van een aanvraag die je hebt ingediend.'),
+identiek zijn aan een vorige titel van een aanvraag die je hebt ingediend."
+        ),
     )
 
     summary = models.TextField(
         _(
-            'Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. Gebruik maximaal 200 woorden.'
+            "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. Gebruik maximaal 200 woorden."
         ),
         validators=[MaxWordsValidator(SUMMARY_MAX_WORDS)],
         blank=True,
@@ -200,42 +218,54 @@ class PracticeReasons(models.IntegerChoices):
 
     other_applicants = models.BooleanField(
         _(
-            'Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?'
+            "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?"
         ),
         default=False,
-        help_text=mark_safe_lazy(_('Werk je samen met een onderzoeker of '
-                                   'organisatie buiten de UU en is je '
-                                   'onderzoek niet strikt anoniem? Neem dan '
-                                   'contact op met de <a '
-                                   'href="mailto:privacy.gw@uu.nl">privacy '
-                                   'officer</a>. '
-                                   'Er moeten dan wellicht afspraken worden '
-                                   'gemaakt over de verwerking van '
-                                   'persoonsgegevens.')),
+        help_text=mark_safe_lazy(
+            _(
+                "Werk je samen met een onderzoeker of "
+                "organisatie buiten de UU en is je "
+                "onderzoek niet strikt anoniem? Neem dan "
+                "contact op met de <a "
+                'href="mailto:privacy.gw@uu.nl">privacy '
+                "officer</a>. "
+                "Er moeten dan wellicht afspraken worden "
+                "gemaakt over de verwerking van "
+                "persoonsgegevens."
+            )
+        ),
     )
 
     other_stakeholders = models.BooleanField(
-        mark_safe_lazy(_('Zijn er nog andere onderzoekers bij deze aanvraag betrokken '
-          'die <strong>niet</strong> geaffilieerd zijn aan een van de '
-          'onderzoeksinstituten van de Faculteit Geestwetenschappen van de '
-          'UU? ')), # Note: form labels with HTML are hard-coded in form Meta classes
+        mark_safe_lazy(
+            _(
+                "Zijn er nog andere onderzoekers bij deze aanvraag betrokken "
+                "die <strong>niet</strong> geaffilieerd zijn aan een van de "
+                "onderzoeksinstituten van de Faculteit Geestwetenschappen van de "
+                "UU? "
+            )
+        ),  # Note: form labels with HTML are hard-coded in form Meta classes
         default=False,
     )
 
     stakeholders = models.TextField(
-        _('Andere betrokkenen'),
+        _("Andere betrokkenen"),
         blank=True,
     )
 
     translated_forms = models.BooleanField(
-        mark_safe_lazy(_('Worden de informed consent formulieren nog vertaald naar een andere taal dan Nederlands of Engels?')),
+        mark_safe_lazy(
+            _(
+                "Worden de informed consent formulieren nog vertaald naar een andere taal dan Nederlands of Engels?"
+            )
+        ),
         default=None,
         blank=True,
         null=True,
     )
 
     translated_forms_languages = models.CharField(
-        _('Andere talen:'),
+        _("Andere talen:"),
         max_length=255,
         default=None,
         blank=True,
@@ -244,34 +274,35 @@ class PracticeReasons(models.IntegerChoices):
 
     funding = models.ManyToManyField(
         Funding,
-        verbose_name=_('Hoe wordt dit onderzoek gefinancierd?'),
+        verbose_name=_("Hoe wordt dit onderzoek gefinancierd?"),
         blank=True,
     )
 
     funding_details = models.CharField(
-        _('Namelijk'),
+        _("Namelijk"),
         max_length=200,
         blank=True,
     )
 
     funding_name = models.CharField(
-        _('Wat is de naam van het gefinancierde project en wat is het projectnummer?'),
+        _("Wat is de naam van het gefinancierde project en wat is het projectnummer?"),
         max_length=200,
         blank=True,
         help_text=_(
-            'De titel die je hier opgeeft zal in de formele toestemmingsbrief '
-            'gebruikt worden.'
+            "De titel die je hier opgeeft zal in de formele toestemmingsbrief "
+            "gebruikt worden."
         ),
     )
 
     comments = models.TextField(
-        _('Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden.'),
+        _("Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."),
         validators=[MaxWordsValidator(COMMENTS_MAX_WORDS)],
         blank=True,
     )
 
     inform_local_staff = models.BooleanField(
-        _('<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één \
+        _(
+            "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één \
 van de faciliteiten van het ILS, namelijk de database, Zep software \
 en/of het ILS lab. Het lab supportteam van het ILS zou graag op \
 de hoogte willen worden gesteld van aankomende onderzoeken. \
@@ -284,27 +315,30 @@ class PracticeReasons(models.IntegerChoices):
 - De titel van het onderzoek <br/> \
 - De beoogde startdatum <br/> \
 - Van welke faciliteiten je gebruik wil maken (database, lab, \
-Zep software)'),
+Zep software)"
+        ),
         default=None,
         blank=True,
-        null=True
+        null=True,
     )
 
     embargo = models.BooleanField(
-        _('Als de deelnemers van je onderzoek moeten worden misleid, kan \
+        _(
+            "Als de deelnemers van je onderzoek moeten worden misleid, kan \
           je ervoor kiezen je applicatie pas later op te laten nemen in het \
           publieke archief en het archief voor gebruikers \
           van dit portaal. Wil je dat jouw onderzoek tijdelijk onder \
-          embargo wordt geplaatst?'),
-          default=None,
-          blank=True,
-          null=True
+          embargo wordt geplaatst?"
+        ),
+        default=None,
+        blank=True,
+        null=True,
     )
 
     embargo_end_date = models.DateField(
-        _('Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?'),
+        _("Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"),
         blank=True,
-        null=True
+        null=True,
     )
 
     in_archive = models.BooleanField(default=False)
@@ -312,7 +346,7 @@ class PracticeReasons(models.IntegerChoices):
     is_pre_assessment = models.BooleanField(default=False)
 
     pre_assessment_pdf = models.FileField(
-        _('Upload hier je aanvraag (in .pdf of .doc(x)-formaat)'),
+        _("Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"),
         blank=True,
         upload_to=PREASSESSMENT_FILENAME,
         validators=[validate_pdf_or_doc],
@@ -320,15 +354,16 @@ class PracticeReasons(models.IntegerChoices):
 
     is_pre_approved = models.BooleanField(
         _(
-            'Heb je formele toestemming van een ethische toetsingcommissie, '
-            'uitgezonderd deze FETC-GW commissie?'),
+            "Heb je formele toestemming van een ethische toetsingcommissie, "
+            "uitgezonderd deze FETC-GW commissie?"
+        ),
         default=None,
         null=True,
         blank=True,
     )
 
     pre_approval_institute = models.CharField(
-        _('Welk instituut heeft de aanvraag goedgekeurd?'),
+        _("Welk instituut heeft de aanvraag goedgekeurd?"),
         max_length=200,
         blank=True,
         null=True,
@@ -336,34 +371,38 @@ class PracticeReasons(models.IntegerChoices):
 
     pre_approval_pdf = models.FileField(
         _(
-            'Upload hier je formele toestemmingsbrief van dit instituut (in '
-            '.pdf of .doc(x)-formaat)'),
+            "Upload hier je formele toestemmingsbrief van dit instituut (in "
+            ".pdf of .doc(x)-formaat)"
+        ),
         blank=True,
         upload_to=PRE_APPROVAL_FILENAME,
         validators=[validate_pdf_or_doc],
     )
 
     in_course = models.BooleanField(
-        _('Ik vul de portal in in het kader van een cursus'),
+        _("Ik vul de portal in in het kader van een cursus"),
         default=False,
     )
 
     is_exploration = models.BooleanField(
-        _('Ik vul de portal in om de portal te exploreren'),
+        _("Ik vul de portal in om de portal te exploreren"),
         default=False,
     )
 
     pdf = models.FileField(
-        blank = True,
+        blank=True,
         upload_to=PROPOSAL_FILENAME,
         storage=OverwriteStorage(),
     )
 
     # Fields with respect to Studies
     studies_similar = models.BooleanField(
-        _('Kan voor alle deelnemers dezelfde informatiebrief en, indien van \
-          toepassing, dezelfde toestemmingsverklaring gebruikt worden?'),
-        help_text=_('Daar waar de verschillen klein en qua belasting of \
+        _(
+            "Kan voor alle deelnemers dezelfde informatiebrief en, indien van \
+          toepassing, dezelfde toestemmingsverklaring gebruikt worden?"
+        ),
+        help_text=_(
+            "Daar waar de verschillen klein en qua belasting of \
 risico irrelevant zijn is sprake van in essentie hetzelfde traject, en \
 voldoet één set documenten voor de informed consent. Denk \
 hierbij aan taakonderzoek waarin de ene groep in taak X de ene helft van \
@@ -373,13 +412,14 @@ class PracticeReasons(models.IntegerChoices):
 dan wel bij de beschrijving van de interventie welke varianten precies \
 gebruikt worden). Let op: als verschillende groepen deelnemers verschillende \
 <i>soorten</i> taken krijgen, dan kan dit niet en zijn dit afzonderlijke \
-trajecten.'),
+trajecten."
+        ),
         blank=True,
         null=True,
     )
 
     studies_number = models.PositiveIntegerField(
-        _('Hoeveel verschillende trajecten zijn er?'),
+        _("Hoeveel verschillende trajecten zijn er?"),
         default=1,
         validators=[MinValueValidator(1), MaxValueValidator(10)],
     )
@@ -397,26 +437,29 @@ class PracticeReasons(models.IntegerChoices):
     )
 
     privacy_officer = models.BooleanField(
-        _('Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'),
+        _(
+            "Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer."
+        ),
         default=None,
         null=True,
         blank=True,
     )
 
     dmp_file = models.FileField(
-        _('Als je een Data Management Plan hebt voor deze aanvraag, '
-          'kan je kiezen om deze hier bij te voegen. Het aanleveren van een '
-          'DMP vergemakkelijkt het toetsingsproces aanzienlijk.'),
+        _(
+            "Als je een Data Management Plan hebt voor deze aanvraag, "
+            "kan je kiezen om deze hier bij te voegen. Het aanleveren van een "
+            "DMP vergemakkelijkt het toetsingsproces aanzienlijk."
+        ),
         blank=True,
         validators=[validate_pdf_or_doc],
         upload_to=DMP_FILENAME,
         storage=OverwriteStorage(),
     )
 
-
     # Confirmation
     confirmation_comments = models.TextField(
-        _('Ruimte voor eventuele opmerkingen'),
+        _("Ruimte voor eventuele opmerkingen"),
         blank=True,
     )
 
@@ -428,46 +471,48 @@ class PracticeReasons(models.IntegerChoices):
     date_submitted = models.DateTimeField(null=True)
     date_reviewed = models.DateTimeField(null=True)
     date_confirmed = models.DateField(
-        _('Datum bevestigingsbrief verstuurd'),
+        _("Datum bevestigingsbrief verstuurd"),
         null=True,
     )
 
     has_minor_revision = models.BooleanField(
-        _('Is er een revisie geweest na het indienen van deze aanvraag?'),
+        _("Is er een revisie geweest na het indienen van deze aanvraag?"),
         default=False,
     )
 
     minor_revision_description = models.TextField(
-        _('Leg uit'),
+        _("Leg uit"),
         null=True,
         blank=True,
     )
 
     self_assessment = models.TextField(
-        _('Wat zijn de belangrijkste ethische kwesties in dit onderzoek en '
-          'beschrijf kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 '
-          'woorden.'),
+        _(
+            "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en "
+            "beschrijf kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 "
+            "woorden."
+        ),
         blank=True,
         validators=[
-            MaxWordsValidator(
-                SELF_ASSESSMENT_MAX_WORDS
-            ),
-        ]
+            MaxWordsValidator(SELF_ASSESSMENT_MAX_WORDS),
+        ],
     )
 
     # References to other models
     relation = models.ForeignKey(
         Relation,
-        verbose_name=_('In welke hoedanigheid ben je betrokken \
-bij dit onderzoek?'),
+        verbose_name=_(
+            "In welke hoedanigheid ben je betrokken \
+bij dit onderzoek?"
+        ),
         on_delete=models.CASCADE,
         blank=False,
         null=True,
     )
 
     student_program = models.CharField(
-        verbose_name=_('Wat is je studierichting?'),
-        max_length = 200,
+        verbose_name=_("Wat is je studierichting?"),
+        max_length=200,
         blank=True,
     )
 
@@ -480,41 +525,46 @@ class PracticeReasons(models.IntegerChoices):
     )
 
     student_context_details = models.CharField(
-        verbose_name=_('Namelijk:'),
+        verbose_name=_("Namelijk:"),
         max_length=200,
         blank=True,
         null=True,
     )
 
     student_justification = models.TextField(
-        verbose_name=_('Studenten (die mensgebonden onderzoek uitvoeren binnen hun \
+        verbose_name=_(
+            "Studenten (die mensgebonden onderzoek uitvoeren binnen hun \
 studieprogramma) hoeven in principe geen aanvraag in te dienen bij de \
 FETC-GW. Bespreek met je begeleider of je daadwerkelijk een aanvraag \
 moet indienen. Als dat niet hoeft kun je nu je aanvraag afbreken. \
-Als dat wel moet, geef dan hier aan wat de reden is:'),
+Als dat wel moet, geef dan hier aan wat de reden is:"
+        ),
         max_length=500,
         blank=True,
     )
 
     created_by = models.ForeignKey(
         settings.AUTH_USER_MODEL,
-        related_name='created_by',
+        related_name="created_by",
         on_delete=models.CASCADE,
     )
 
     applicants = models.ManyToManyField(
         settings.AUTH_USER_MODEL,
-        verbose_name=_('Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten \
-        ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren.'),
-        related_name='applicants',
+        verbose_name=_(
+            "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten \
+        ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
+        ),
+        related_name="applicants",
     )
 
     supervisor = models.ForeignKey(
         settings.AUTH_USER_MODEL,
-        verbose_name=_('Promotor/Begeleider'),
+        verbose_name=_("Promotor/Begeleider"),
         blank=True,
         null=True,
-        help_text=_('''Je aanvraag moet, als je alles hebt ingevuld, via de portal 
+        help_text=_(
+            """Je aanvraag moet, als je alles hebt ingevuld, via de portal 
                     naar je promotor of begeleider gestuurd worden. Deze persoon 
                     is de eindverantwoordelijk onderzoeker, en zal de aanvraag 
                     vervolgens waar nodig kunnen aanpassen en indienen bij de FETC-GW.
@@ -523,38 +573,39 @@ class PracticeReasons(models.IntegerChoices):
                     waarschijnlijk eerst één keer inloggen in deze portal. 
                     Je kunt nog wel verder met de aanvraag, maar vergeet dit veld 
                     niet in te vullen voor je de aanvraag indient. Je aanvraag 
-                    zal dan namelijk niet in behandeling kunnen worden genomen.'''),
+                    zal dan namelijk niet in behandeling kunnen worden genomen."""
+        ),
         on_delete=models.CASCADE,
     )
 
     # Copying an existing Proposal
     parent = models.ForeignKey(
-        'self',
+        "self",
         null=True,
-        related_name='children',
-        verbose_name=_('Te kopiëren aanvraag'),
+        related_name="children",
+        verbose_name=_("Te kopiëren aanvraag"),
         help_text=_(
-            'Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende '
-            'bent.'),
+            "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende " "bent."
+        ),
         on_delete=models.CASCADE,
     )
 
     is_revision = models.BooleanField(
-        _(
-            'Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?'
-        ),
+        _("Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"),
         default=False,
     )
 
     @property
     def is_revisable(self):
         """A check to see if a proposal is revisable. For use in Querysets,
-        keep in mind to also check if the user is one of the applicants 
+        keep in mind to also check if the user is one of the applicants
         or the supervisor."""
-        if not self.is_pre_assessment and \
-           not self.status_review and \
-           self.status == self.Statuses.DECISION_MADE and \
-           not self.children.all():
+        if (
+            not self.is_pre_assessment
+            and not self.status_review
+            and self.status == self.Statuses.DECISION_MADE
+            and not self.children.all()
+        ):
             return True
         return False
 
@@ -580,7 +631,7 @@ def continue_url(self):
     def committee_prefixed_refnum(self):
         """Returns the reference number including the reviewing committee"""
         parts = (self.reviewing_committee.name, self.reference_number)
-        return '-'.join(parts)
+        return "-".join(parts)
 
     def available_urls(self):
         """Returns the available URLs for this Proposal"""
@@ -588,13 +639,11 @@ def available_urls(self):
 
     def first_study(self):
         """Returns the first Study in this Proposal, or None if there's none."""
-        return self.study_set.order_by('order')[
-            0] if self.study_set.count() else None
+        return self.study_set.order_by("order")[0] if self.study_set.count() else None
 
     def last_study(self):
         """Returns the last Study in this Proposal, or None if there's none."""
-        return self.study_set.order_by('-order')[
-            0] if self.study_set.count() else None
+        return self.study_set.order_by("-order")[0] if self.study_set.count() else None
 
     def current_study(self):
         """
@@ -616,7 +665,7 @@ def current_session(self):
         - If no Sessions have yet been created, None is returned.
         """
         current_session = None
-        for study in self.study_set.all().prefetch_related('session_set'):
+        for study in self.study_set.all().prefetch_related("session_set"):
             for session in study.session_set.all():
                 current_session = session
                 if session.tasks_duration is None:
@@ -625,22 +674,22 @@ def current_session(self):
 
     def amendment_or_revision(self):
         if self.is_revision and self.parent:
-            return _('Amendement') if self.parent.status_review else _('Revisie')
+            return _("Amendement") if self.parent.status_review else _("Revisie")
 
     def type(self):
         """
         Returns the type of a Study: either normal, revision, amendment, preliminary assessment or practice
         """
-        result = _('Normaal')
+        result = _("Normaal")
         amendment_or_revision = self.amendment_or_revision()
         if amendment_or_revision is not None:
             result = amendment_or_revision
         elif self.is_pre_assessment:
-            result = _('Voortoetsing')
+            result = _("Voortoetsing")
         elif self.is_practice():
-            result = _('Oefening')
+            result = _("Oefening")
         elif self.is_pre_approved:
-            result = _('Extern getoetst')
+            result = _("Extern getoetst")
 
         return result
 
@@ -650,14 +699,14 @@ def supervisor_decision(self):
 
         if self.supervisor and self.status == Proposal.Statuses.SUBMITTED_TO_SUPERVISOR:
             decisions = Decision.objects.filter(
-                review__proposal=self,
-                review__stage=Review.Stages.SUPERVISOR
-            ).order_by('-pk')
+                review__proposal=self, review__stage=Review.Stages.SUPERVISOR
+            ).order_by("-pk")
 
             if decisions:
                 return decisions[0]
 
             from reviews.utils import start_supervisor_phase
+
             start_supervisor_phase(self)
 
             return self.supervisor_decision()
@@ -681,8 +730,10 @@ def mark_reviewed(self, continuation, time=None):
         self.status = self.Statuses.DECISION_MADE
         # Importing here to prevent circular import
         from reviews.models import Review
+
         self.status_review = continuation in [
-            Review.Continuations.GO, Review.Continuations.GO_POST_HOC
+            Review.Continuations.GO,
+            Review.Continuations.GO_POST_HOC,
         ]
         self.date_reviewed = time
         self.generate_pdf()
@@ -693,11 +744,9 @@ def generate_pdf(self, force_overwrite=False):
         The currently existing PDF will not be overwritten unless the
         force_overwrite keyword is True."""
         from proposals.utils import generate_pdf
+
         pdf = generate_pdf(self)
-        if (force_overwrite is True
-            or not self.use_canonical_pdf
-            or not self.pdf
-            ):
+        if force_overwrite is True or not self.use_canonical_pdf or not self.pdf:
             self.pdf.save(
                 PROPOSAL_FILENAME(self, "document.pdf"),
                 pdf,
@@ -719,19 +768,21 @@ def use_canonical_pdf(self):
 
     def __str__(self):
         if self.is_practice():
-            return '{} ({}) (Practice)'.format(self.title, self.created_by)
-        return '{} ({})'.format(self.title, self.created_by)
+            return "{} ({}) (Practice)".format(self.title, self.created_by)
+        return "{} ({})".format(self.title, self.created_by)
 
 
 class Wmo(models.Model):
     class WMOStatuses(models.IntegerChoices):
-        NO_WMO = 0, _('Geen beoordeling door METC noodzakelijk')
-        WAITING = 1, _('In afwachting beslissing METC')
-        JUDGED = 2, _('Beslissing METC geüpload')
+        NO_WMO = 0, _("Geen beoordeling door METC noodzakelijk")
+        WAITING = 1, _("In afwachting beslissing METC")
+        JUDGED = 2, _("Beslissing METC geüpload")
 
     metc = models.CharField(
-        _('Vindt de dataverzameling plaats binnen het UMC Utrecht of \
-andere instelling waar toetsing door een METC verplicht is gesteld?'),
+        _(
+            "Vindt de dataverzameling plaats binnen het UMC Utrecht of \
+andere instelling waar toetsing door een METC verplicht is gesteld?"
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
         blank=True,
@@ -739,20 +790,23 @@ class WMOStatuses(models.IntegerChoices):
     )
 
     metc_details = models.TextField(
-        _('Licht toe'),
+        _("Licht toe"),
         blank=True,
     )
 
     metc_institution = models.CharField(
-        _('Welke instelling?'),
+        _("Welke instelling?"),
         max_length=200,
         blank=True,
     )
 
     is_medical = models.CharField(
-        _('Is de onderzoeksvraag medisch-wetenschappelijk van aard \
-(zoals gedefinieerd door de WMO)?'),
-        help_text=_('De definitie van medisch-wetenschappelijk onderzoek is: \
+        _(
+            "Is de onderzoeksvraag medisch-wetenschappelijk van aard \
+(zoals gedefinieerd door de WMO)?"
+        ),
+        help_text=_(
+            "De definitie van medisch-wetenschappelijk onderzoek is: \
 Medisch-wetenschappelijk onderzoek is onderzoek dat als doel heeft het \
 beantwoorden van een vraag op het gebied van ziekte en gezondheid \
 (etiologie, pathogenese, verschijnselen/symptomen, diagnose, preventie, \
@@ -760,28 +814,32 @@ class WMOStatuses(models.IntegerChoices):
 vergaren en bestuderen van gegevens. Het onderzoek beoogt bij te dragen \
 aan medische kennis die ook geldend is voor populaties buiten de directe \
 onderzoekspopulatie. (CCMO-notitie, Definitie medisch-wetenschappelijk \
-onderzoek, 2005, ccmo.nl)'),
+onderzoek, 2005, ccmo.nl)"
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
         blank=True,
     )
 
-
     metc_application = models.BooleanField(
-        _('Je onderzoek moet beoordeeld worden door een METC, maar dient nog \
+        _(
+            "Je onderzoek moet beoordeeld worden door een METC, maar dient nog \
 wel bij de FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld \
-bij een METC?'),
+bij een METC?"
+        ),
         default=False,
     )
 
     metc_decision = models.BooleanField(
-        _('Is de METC al tot een beslissing gekomen?'),
+        _("Is de METC al tot een beslissing gekomen?"),
         default=False,
     )
 
     metc_decision_pdf = models.FileField(
-        _('Upload hier de beslissing van het METC \
-(in .pdf of .doc(x)-formaat)'),
+        _(
+            "Upload hier de beslissing van het METC \
+(in .pdf of .doc(x)-formaat)"
+        ),
         blank=True,
         validators=[validate_pdf_or_doc],
         upload_to=METC_DECISION_FILENAME,
@@ -809,7 +867,11 @@ def save(self, *args, **kwargs):
         super(Wmo, self).save(*args, **kwargs)
 
     def update_status(self):
-        if self.metc == YesNoDoubt.YES or self.is_medical == YesNoDoubt.YES or self.enforced_by_commission:
+        if (
+            self.metc == YesNoDoubt.YES
+            or self.is_medical == YesNoDoubt.YES
+            or self.enforced_by_commission
+        ):
             if self.metc_decision and self.metc_decision_pdf:
                 self.status = self.WMOStatuses.JUDGED
             else:
@@ -818,5 +880,6 @@ def update_status(self):
             self.status = self.WMOStatuses.NO_WMO
 
     def __str__(self):
-        return _('WMO {title}, status {status}').format(
-            title=self.proposal.title, status=self.status)
+        return _("WMO {title}, status {status}").format(
+            title=self.proposal.title, status=self.status
+        )
diff --git a/proposals/templatetags/diff_tags.py b/proposals/templatetags/diff_tags.py
index 578ec2bac..ffb0d62a9 100644
--- a/proposals/templatetags/diff_tags.py
+++ b/proposals/templatetags/diff_tags.py
@@ -4,7 +4,7 @@
 register = template.Library()
 
 
-@register.filter(name='zip_equalize_lists')
+@register.filter(name="zip_equalize_lists")
 def zip_equalize_lists(a, b):
     """
     A zip implementation which will not stop when reaching the end of the
@@ -13,7 +13,7 @@ def zip_equalize_lists(a, b):
 
     a = [] if a is None else list(a)
     b = [] if b is None else list(b)
-    
+
     a_len = len(a)
     b_len = len(b)
     diff = abs(a_len - b_len)
diff --git a/proposals/templatetags/proposal_filters.py b/proposals/templatetags/proposal_filters.py
index 2ee7688a7..d67684795 100644
--- a/proposals/templatetags/proposal_filters.py
+++ b/proposals/templatetags/proposal_filters.py
@@ -7,8 +7,9 @@
 
 register = template.Library()
 
+
 @register.filter
-def needs_details(selected_values, field='needs_details'):
+def needs_details(selected_values, field="needs_details"):
     for sv in selected_values:
         if getattr(sv, field):
             return True
@@ -16,7 +17,7 @@ def needs_details(selected_values, field='needs_details'):
 
 
 @register.filter
-def medical_traits(selected_values, field='medical_traits'):
+def medical_traits(selected_values, field="medical_traits"):
     for sv in selected_values:
         if getattr(sv, field):
             return True
@@ -25,24 +26,24 @@ def medical_traits(selected_values, field='medical_traits'):
 
 @register.filter
 def has_adults(study):
-    age_groups = study.age_groups.values_list('id', flat=True)
+    age_groups = study.age_groups.values_list("id", flat=True)
     return check_has_adults(age_groups)
 
 
 @register.filter
 def necessity_required(study):
-    age_groups = study.age_groups.values_list('id', flat=True)
+    age_groups = study.age_groups.values_list("id", flat=True)
     return check_necessity_required(study.proposal, age_groups, study.legally_incapable)
 
 
 @register.simple_tag
 def show_yesno(doubt=False):
-    result = '<ul>'
-    result += '<li>{}</li>'.format('ja')
-    result += '<li>{}</li>'.format('nee')
+    result = "<ul>"
+    result += "<li>{}</li>".format("ja")
+    result += "<li>{}</li>".format("nee")
     if doubt:
-        result += '<li>{}</li>'.format('twijfel')
-    result += '</ul>'
+        result += "<li>{}</li>".format("twijfel")
+    result += "</ul>"
     return mark_safe(result)
 
 
@@ -72,7 +73,7 @@ def render(self, context):
                 ).objects.get(study=study)
             except (ObjectDoesNotExist, MultipleObjectsReturned):
                 context[self.var_name] = None
-        return u""
+        return ""
 
 
 @register.tag
@@ -102,9 +103,13 @@ def __init__(self, var_name, study):
 
     def render(self, context):
         proposal = self.var_value.resolve(context)
-        context[self.var_name] = apps.get_model("studies", "Documents").objects.filter(proposal=proposal, study=None).all()
+        context[self.var_name] = (
+            apps.get_model("studies", "Documents")
+            .objects.filter(proposal=proposal, study=None)
+            .all()
+        )
 
-        return u""
+        return ""
 
 
 @register.tag
@@ -121,4 +126,3 @@ def get_extra_documents(parser, token):
     parts = token.split_contents()
 
     return ExtraDocumentsNode(parts[1], parts[2])
-
diff --git a/proposals/tests/misc_tests.py b/proposals/tests/misc_tests.py
index 5c52f4761..4498f9dcd 100644
--- a/proposals/tests/misc_tests.py
+++ b/proposals/tests/misc_tests.py
@@ -13,30 +13,47 @@
 from proposals.api.views import MyProposalsApiView
 from proposals.copy import copy_proposal
 from proposals.models import Proposal, Relation, Wmo, Institution
-from proposals.utils import generate_ref_number, check_local_facilities, generate_revision_ref_number
+from proposals.utils import (
+    generate_ref_number,
+    check_local_facilities,
+    generate_revision_ref_number,
+)
 
 
 class MiscProposalTestCase(TestCase):
-    fixtures = ['relations', 'compensations', 'recruitments', 'settings',
-                'registrations', 'groups', 'institutions']
+    fixtures = [
+        "relations",
+        "compensations",
+        "recruitments",
+        "settings",
+        "registrations",
+        "groups",
+        "institutions",
+    ]
 
     def setUp(self):
-        self.user = User.objects.create_user(username='test0101', email='test@test.com', password='secret')
+        self.user = User.objects.create_user(
+            username="test0101", email="test@test.com", password="secret"
+        )
         self.secretary = User.objects.create_user(
-            username='secretarytest010101',
-            email='test@test.nl',
-            password='more_secret')
-        Group.objects.get(name=settings.GROUP_PRIMARY_SECRETARY).user_set.add(self.secretary)
+            username="secretarytest010101", email="test@test.nl", password="more_secret"
+        )
+        Group.objects.get(name=settings.GROUP_PRIMARY_SECRETARY).user_set.add(
+            self.secretary
+        )
         self.chamber = Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
         self.institution = Institution.objects.get(pk=1)
         self.chamber.user_set.add(self.secretary)
         self.relation = Relation.objects.get(pk=4)
-        self.p1 = Proposal.objects.create(title='p1', reference_number=generate_ref_number(),
-                                          date_start=datetime.now(),
-                                          created_by=self.user,
-                                          relation=self.relation,
-                                          reviewing_committee=self.chamber,
-                                          institution=self.institution)
+        self.p1 = Proposal.objects.create(
+            title="p1",
+            reference_number=generate_ref_number(),
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
         self.p1.applicants.add(self.user)
         self.p1.save()
 
@@ -47,34 +64,45 @@ def test_reference_number(self):
 
         # Add a proposal for the same user, check new reference number
         ref_number = generate_ref_number()
-        p2 = Proposal.objects.create(title='p2', reference_number=ref_number,
-                                     date_start=datetime.now(),
-                                     created_by=self.user,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     institution=self.institution)
-        self.assertEqual(ref_number, current_year[2:] + '-002-01')
+        p2 = Proposal.objects.create(
+            title="p2",
+            reference_number=ref_number,
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
+        self.assertEqual(ref_number, current_year[2:] + "-002-01")
 
         # Delete a proposal, check new reference number
         p2.delete()
         ref_number2 = generate_ref_number()
-        Proposal.objects.create(title='p2', reference_number=ref_number2,
-                                date_start=datetime.now(),
-                                created_by=self.user,
-                                relation=self.relation,
-                                reviewing_committee=self.chamber,
-                                institution=self.institution)
-        self.assertEqual(ref_number2, current_year[2:] + '-002-01')
+        Proposal.objects.create(
+            title="p2",
+            reference_number=ref_number2,
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
+        self.assertEqual(ref_number2, current_year[2:] + "-002-01")
 
         # Add a proposal for another user
-        user2 = User.objects.create_user(username='test0102', email='test@test.com', password='secret')
-        p3 = Proposal.objects.create(title='p3', reference_number=generate_ref_number(),
-                                     date_start=datetime.now(),
-                                     created_by=user2,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     institution=self.institution)
-        self.assertEqual(p3.reference_number, current_year[2:] + '-003-01')
+        user2 = User.objects.create_user(
+            username="test0102", email="test@test.com", password="secret"
+        )
+        p3 = Proposal.objects.create(
+            title="p3",
+            reference_number=generate_ref_number(),
+            date_start=datetime.now(),
+            created_by=user2,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
+        self.assertEqual(p3.reference_number, current_year[2:] + "-003-01")
 
     def test_revision_reference_number(self):
         current_year = str(datetime.now().year)
@@ -82,26 +110,32 @@ def test_revision_reference_number(self):
         # Add a revision proposal for p1, check new reference number
         # Should be 01-02 (first proposal, second version)
         ref_number = generate_revision_ref_number(self.p1)
-        p2 = Proposal.objects.create(title='p2', reference_number=ref_number,
-                                     date_start=datetime.now(),
-                                     created_by=self.user,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     is_revision=True,
-                                     parent=self.p1,
-                                     institution=self.institution)
-        self.assertEqual(ref_number, current_year[2:] + '-001-02')
+        p2 = Proposal.objects.create(
+            title="p2",
+            reference_number=ref_number,
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            is_revision=True,
+            parent=self.p1,
+            institution=self.institution,
+        )
+        self.assertEqual(ref_number, current_year[2:] + "-001-02")
 
         # Add a proposal for the same user, check new reference number
         # Should be 02-01 (second proposal, first version)
         ref_number = generate_ref_number()
-        p3 = Proposal.objects.create(title='p3', reference_number=ref_number,
-                                     date_start=datetime.now(),
-                                     created_by=self.user,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     institution=self.institution)
-        self.assertEqual(ref_number, current_year[2:] + '-002-01')
+        p3 = Proposal.objects.create(
+            title="p3",
+            reference_number=ref_number,
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
+        self.assertEqual(ref_number, current_year[2:] + "-002-01")
 
         # Add new proposal using an old 3-part ref.number and make a revision
         # number using the proposal.
@@ -109,31 +143,35 @@ def test_revision_reference_number(self):
         # (The year in the ref.num. and the creation_date won't line up,
         # but in this case it doesn't matter as generate_revision_ref_number
         # only looks at the ref.num. of the parent).
-        p4 = Proposal.objects.create(title='p4',
-                                     reference_number='97-001-01',
-                                     date_start=datetime.now(),
-                                     created_by=self.user,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     institution=self.institution)
+        p4 = Proposal.objects.create(
+            title="p4",
+            reference_number="97-001-01",
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
         ref_number = generate_revision_ref_number(p4)
-        p2 = Proposal.objects.create(title='p5', reference_number=ref_number,
-                                     date_start=datetime.now(),
-                                     created_by=self.user,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     is_revision=True,
-                                     parent=p4,
-                                     institution=self.institution)
-        self.assertEqual(ref_number, '97-001-02')
+        p2 = Proposal.objects.create(
+            title="p5",
+            reference_number=ref_number,
+            date_start=datetime.now(),
+            created_by=self.user,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            is_revision=True,
+            parent=p4,
+            institution=self.institution,
+        )
+        self.assertEqual(ref_number, "97-001-02")
 
         # Generate a new revision ref.number using the original proposal
         # This tests whether the right version number is created even if the
         # parent isn't the latest version
         # Should be 01-03-1997 (First proposal in 1997, third version)
         ref_number = generate_revision_ref_number(p4)
-        self.assertEqual(ref_number, '97-001-03')
-
+        self.assertEqual(ref_number, "97-001-03")
 
     def test_status(self):
         proposal = self.p1
@@ -144,10 +182,10 @@ def test_status(self):
         wmo.metc = YesNoDoubt.NO
         wmo.save()
         self.assertEqual(proposal.wmo.status, Wmo.WMOStatuses.NO_WMO)
-        #self.assertEqual(proposal.continue_url(), '/studies/create/1/')
+        # self.assertEqual(proposal.continue_url(), '/studies/create/1/')
 
         s = Study.objects.create(proposal=proposal, order=1)
-        #self.assertEqual(proposal.continue_url(), '/studies/design/1/')
+        # self.assertEqual(proposal.continue_url(), '/studies/design/1/')
 
         s.sessions_number = 2
         s.save()
@@ -157,8 +195,8 @@ def test_status(self):
         s1.tasks_number = 2
         s1.save()
 
-        s1_t1 = Task.objects.create(session=s1, order=1, name='t1')
-        Task.objects.create(session=s1, order=2, name='t2')
+        s1_t1 = Task.objects.create(session=s1, order=1, name="t1")
+        Task.objects.create(session=s1, order=2, name="t2")
 
         s1.tasks_duration = 45
         s1.save()
@@ -181,7 +219,10 @@ def test_check_local_facilities(self):
 
         facs = check_local_facilities(self.p1)
         self.assertEqual(len(facs), 1)
-        self.assertSetEqual(facs[Recruitment._meta.verbose_name], set([r.description for r in recruitments]))
+        self.assertSetEqual(
+            facs[Recruitment._meta.verbose_name],
+            set([r.description for r in recruitments]),
+        )
 
         # If we remove local Recruitment, we should again return no facilities
         s.recruitment.set(Recruitment.objects.filter(is_local=False))
@@ -200,7 +241,9 @@ def test_check_local_facilities(self):
 
         facs = check_local_facilities(self.p1)
         self.assertEqual(len(facs), 1)
-        self.assertSetEqual(facs[Setting._meta.verbose_name], set([st.description for st in settings]))
+        self.assertSetEqual(
+            facs[Setting._meta.verbose_name], set([st.description for st in settings])
+        )
 
         # If we add a Sessions part, we should return facilities when we add local Registrations
         s.has_sessions = True
@@ -211,7 +254,7 @@ def test_check_local_facilities(self):
         s1.tasks_number = 2
         s1.save()
 
-        s1_t1 = Task.objects.create(session=s1, order=1, name='t1')
+        s1_t1 = Task.objects.create(session=s1, order=1, name="t1")
 
         registrations = Registration.objects.filter(is_local=True)
         s1_t1.registrations.set(registrations)
@@ -219,7 +262,10 @@ def test_check_local_facilities(self):
 
         facs = check_local_facilities(self.p1)
         self.assertEqual(len(facs), 2)
-        self.assertSetEqual(facs[Registration._meta.verbose_name], set([r.description for r in registrations]))
+        self.assertSetEqual(
+            facs[Registration._meta.verbose_name],
+            set([r.description for r in registrations]),
+        )
 
 
 class ProposalsViewTestCase(MiscProposalTestCase):
@@ -228,34 +274,39 @@ def setUp(self):
         self.factory = RequestFactory()
 
     def test_supervisor(self):
-        request = self.factory.get('/proposals/api/my_archive')
+        request = self.factory.get("/proposals/api/my_archive")
         request.user = self.user
 
         response = MyProposalsApiView.as_view()(request)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['items'][0]['pk'], self.p1.pk)
+        self.assertEqual(response.data["items"][0]["pk"], self.p1.pk)
 
         # Add a Proposal for another User
-        user2 = User.objects.create_user(username='test0102', email='test@test.com', password='secret')
-        p2 = Proposal.objects.create(title='p3', reference_number=generate_ref_number(),
-                                     date_start=datetime.now(),
-                                     created_by=user2,
-                                     relation=self.relation,
-                                     reviewing_committee=self.chamber,
-                                     institution=self.institution)
+        user2 = User.objects.create_user(
+            username="test0102", email="test@test.com", password="secret"
+        )
+        p2 = Proposal.objects.create(
+            title="p3",
+            reference_number=generate_ref_number(),
+            date_start=datetime.now(),
+            created_by=user2,
+            relation=self.relation,
+            reviewing_committee=self.chamber,
+            institution=self.institution,
+        )
         p2.applicants.add(user2)
         p2.save()
 
         # Sanity test: response should still be the same
         response = MyProposalsApiView.as_view()(request)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['items'][0]['pk'], self.p1.pk)
+        self.assertEqual(response.data["items"][0]["pk"], self.p1.pk)
 
         # Second user should only see his Proposal
         request.user = user2
         response = MyProposalsApiView.as_view()(request)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['items'][0]['pk'], p2.pk)
+        self.assertEqual(response.data["items"][0]["pk"], p2.pk)
 
         # If we set self.user to be the supervisor, he should see both Proposals
         p2.supervisor = self.user
@@ -265,11 +316,8 @@ def test_supervisor(self):
         response = MyProposalsApiView.as_view()(request)
         self.assertEqual(response.status_code, 200)
         self.assertSequenceEqual(
-            [
-                response.data['items'][0]['pk'],
-                response.data['items'][1]['pk']
-            ],
-            [self.p1.pk, p2.pk]
+            [response.data["items"][0]["pk"], response.data["items"][1]["pk"]],
+            [self.p1.pk, p2.pk],
         )
 
 
@@ -291,14 +339,13 @@ def test_status(self):
 
         self.assertEqual(self.wmo.status, Wmo.WMOStatuses.WAITING)
 
-        self.wmo.metc_decision_pdf = SimpleUploadedFile('test.pdf', b'contents')
+        self.wmo.metc_decision_pdf = SimpleUploadedFile("test.pdf", b"contents")
         self.wmo.save()
 
         self.assertEqual(self.wmo.status, Wmo.WMOStatuses.JUDGED)
 
 
 class CopyTestCase(MiscProposalTestCase):
-
     def setUp(self):
         super().setUp()
 
@@ -336,32 +383,20 @@ def setUp(self):
 
     def test_parent_present_for_rev(self):
         """Test if parent is set when making a revision/amendment copy"""
-        p2 = copy_proposal(
-            self.p1,
-            True,
-            self.user
-        )
+        p2 = copy_proposal(self.p1, True, self.user)
 
         self.assertIsNotNone(p2.parent)
         self.assertEqual(p2.parent.pk, self.p1.pk)
 
     def test_parent_missing_for_copy(self):
         """Test if parent is missing if making a regular copy"""
-        p2 = copy_proposal(
-            self.p1,
-            False,
-            self.user
-        )
+        p2 = copy_proposal(self.p1, False, self.user)
 
         self.assertIsNone(p2.parent)
 
     def test_related_copying(self):
         """Test if related objects are copied during copying"""
-        p2 = copy_proposal(
-            self.p1,
-            False,
-            self.user
-        )
+        p2 = copy_proposal(self.p1, False, self.user)
 
         self.assertEqual(p2.study_set.count(), 1)
 
diff --git a/proposals/tests/proposal_submission_tests.py b/proposals/tests/proposal_submission_tests.py
index 6d77a3499..999c33f14 100644
--- a/proposals/tests/proposal_submission_tests.py
+++ b/proposals/tests/proposal_submission_tests.py
@@ -56,22 +56,12 @@ def setup_users(self):
         )
 
         self.secretary.groups.add(
-            Group.objects.get(
-                name=settings.GROUP_PRIMARY_SECRETARY
-            )
-        )
-        self.secretary.groups.add(
-            Group.objects.get(
-                name=settings.GROUP_SECRETARY
-            )
+            Group.objects.get(name=settings.GROUP_PRIMARY_SECRETARY)
         )
+        self.secretary.groups.add(Group.objects.get(name=settings.GROUP_SECRETARY))
 
-        self.c1.groups.add(
-            Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
-        )
-        self.c2.groups.add(
-            Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
-        )
+        self.c1.groups.add(Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER))
+        self.c2.groups.add(Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER))
 
     def setup_proposal(self):
         """
@@ -99,8 +89,8 @@ def refresh(self):
 
 
 class ProposalSubmitTestCase(
-        BaseViewTestCase,
-        BaseProposalTestCase,
+    BaseViewTestCase,
+    BaseProposalTestCase,
 ):
     view_class = ProposalSubmit
 
@@ -119,20 +109,22 @@ def get_post_data(self):
             "embargo_end_date": "2025-01-01",
         }
 
-    def test_access(self,):
+    def test_access(
+        self,
+    ):
         # NB: The proposal creator does not have access by default
         # Be sure to add them to the applicants list as well.
         self.assertEqual(
             self.check_access(
                 self.proposal.created_by,
             ),
-            True
+            True,
         )
         self.assertEqual(
             self.check_access(
                 AnonymousUser,
             ),
-            False
+            False,
         )
 
     def test_submission_unsupervised(self):
@@ -158,10 +150,7 @@ def test_submission_unsupervised(self):
             self.get_post_data(),
             user=self.user,
         )
-        self.assertIn(
-            page.status_code,
-            [302, 200]
-        )
+        self.assertIn(page.status_code, [302, 200])
         self.refresh()
         # Post-submission tests
         self.assertNotEqual(
@@ -205,10 +194,7 @@ def test_proposal_supervised(self):
             self.get_post_data(),
             user=self.user,
         )
-        self.assertIn(
-            page.status_code,
-            [302, 200]
-        )
+        self.assertIn(page.status_code, [302, 200])
         self.refresh()
         # Post-submission tests
         self.assertNotEqual(
@@ -226,7 +212,7 @@ def test_proposal_supervised(self):
 
 
 class PreassessmentSubmitTestCase(
-        ProposalSubmitTestCase,
+    ProposalSubmitTestCase,
 ):
     view_class = ProposalSubmitPreAssessment
 
@@ -236,7 +222,7 @@ def setUp(self):
 
 
 class PreapprovedSubmitTestCase(
-        ProposalSubmitTestCase,
+    ProposalSubmitTestCase,
 ):
     view_class = ProposalSubmitPreApproved
 
diff --git a/proposals/translation.py b/proposals/translation.py
index 36fbdc94f..0c3f26eb6 100644
--- a/proposals/translation.py
+++ b/proposals/translation.py
@@ -5,18 +5,19 @@
 
 @register(Funding)
 class FundingTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(Institution)
 class FundingTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(Relation)
 class RelationTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
+
 
 @register(StudentContext)
 class RelationTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
diff --git a/proposals/urls.py b/proposals/urls.py
index 8b42ab94c..8d1ec593a 100644
--- a/proposals/urls.py
+++ b/proposals/urls.py
@@ -1,182 +1,296 @@
 from django.urls import path, include
 
-from .views.proposal_views import CompareDocumentsView, MyConceptsView, \
-    MyPracticeView, \
-    MySubmittedView, MyCompletedView, MySupervisedView, MyProposalsView, \
-    ProposalCreate, ProposalUpdate, ProposalDelete, ProposalStart, \
-    ProposalDataManagement, ProposalSubmit, ProposalSubmitted, \
-    ProposalConfirmation, ProposalCopy, ProposalCopyRevision, \
-    ProposalDifference, ProposalAsPdf, ProposalCreatePreAssessment, \
-    ProposalUpdatePreAssessment, ProposalStartPreAssessment, \
-    ProposalSubmitPreAssessment, ProposalSubmittedPreAssessment, \
-    ProposalCreatePractice, ProposalUpdatePractice, ProposalStartPractice, \
-    ChangeArchiveStatusView, ProposalsExportView, ProposalStartPreApproved, \
-    ProposalCreatePreApproved, ProposalSubmittedPreApproved, \
-    ProposalSubmitPreApproved, ProposalUpdatePreApproved, \
-    ProposalUsersOnlyArchiveView, \
-    ProposalCopyAmendment, ProposalsPublicArchiveView, \
-    ProposalUpdateDataManagement, TranslatedConsentFormsView, \
-    ProposalUpdateDateStart
+from .views.proposal_views import (
+    CompareDocumentsView,
+    MyConceptsView,
+    MyPracticeView,
+    MySubmittedView,
+    MyCompletedView,
+    MySupervisedView,
+    MyProposalsView,
+    ProposalCreate,
+    ProposalUpdate,
+    ProposalDelete,
+    ProposalStart,
+    ProposalDataManagement,
+    ProposalSubmit,
+    ProposalSubmitted,
+    ProposalConfirmation,
+    ProposalCopy,
+    ProposalCopyRevision,
+    ProposalDifference,
+    ProposalAsPdf,
+    ProposalCreatePreAssessment,
+    ProposalUpdatePreAssessment,
+    ProposalStartPreAssessment,
+    ProposalSubmitPreAssessment,
+    ProposalSubmittedPreAssessment,
+    ProposalCreatePractice,
+    ProposalUpdatePractice,
+    ProposalStartPractice,
+    ChangeArchiveStatusView,
+    ProposalsExportView,
+    ProposalStartPreApproved,
+    ProposalCreatePreApproved,
+    ProposalSubmittedPreApproved,
+    ProposalSubmitPreApproved,
+    ProposalUpdatePreApproved,
+    ProposalUsersOnlyArchiveView,
+    ProposalCopyAmendment,
+    ProposalsPublicArchiveView,
+    ProposalUpdateDataManagement,
+    TranslatedConsentFormsView,
+    ProposalUpdateDateStart,
+)
 
 from .views.study_views import StudyStart, StudyConsent
-from .views.wmo_views import WmoCreate, WmoUpdate, \
-    WmoApplication, WmoCheck, check_wmo, \
-    WmoCreatePreAssessment, WmoUpdatePreAssessment, WmoApplicationPreAssessment
+from .views.wmo_views import (
+    WmoCreate,
+    WmoUpdate,
+    WmoApplication,
+    WmoCheck,
+    check_wmo,
+    WmoCreatePreAssessment,
+    WmoUpdatePreAssessment,
+    WmoApplicationPreAssessment,
+)
 
-app_name = 'proposals'
+app_name = "proposals"
 
 urlpatterns = [
-    path('api/', include('proposals.api.urls', namespace='api')),
+    path("api/", include("proposals.api.urls", namespace="api")),
     # List views
-    path('archive/', include([
-        path('public/', ProposalsPublicArchiveView.as_view(),
-             name='public_archive'),
-        path('export/', ProposalsExportView.as_view(), name='archive_export'),
-        path('export/<int:pk>/', ProposalsExportView.as_view(),
-            name='archive_export'),
-        path('archive_status/<int:pk>/', ChangeArchiveStatusView.as_view(),
-            name='archive_status'),
-        # WARNING! This one needs to be LAST in the list. (Django goes
-        # through the list and picks the first one that fits, and the regex
-        # will always fit for the other 2 URL's, effectively superseding them
-        # if it's above them).
-        path('<str:committee>/', ProposalUsersOnlyArchiveView.as_view(),
-             name='archive'),
-    ])),
-
-    path('my_concepts/', MyConceptsView.as_view(), name='my_concepts'),
-    path('my_practice/', MyPracticeView.as_view(), name='my_practice'),
-    path('my_submitted/', MySubmittedView.as_view(), name='my_submitted'),
-    path('my_completed/', MyCompletedView.as_view(), name='my_completed'),
-    path('my_supervised/', MySupervisedView.as_view(), name='my_supervised'),
-    path('my_archive/', MyProposalsView.as_view(), name='my_archive'),
-
+    path(
+        "archive/",
+        include(
+            [
+                path(
+                    "public/",
+                    ProposalsPublicArchiveView.as_view(),
+                    name="public_archive",
+                ),
+                path("export/", ProposalsExportView.as_view(), name="archive_export"),
+                path(
+                    "export/<int:pk>/",
+                    ProposalsExportView.as_view(),
+                    name="archive_export",
+                ),
+                path(
+                    "archive_status/<int:pk>/",
+                    ChangeArchiveStatusView.as_view(),
+                    name="archive_status",
+                ),
+                # WARNING! This one needs to be LAST in the list. (Django goes
+                # through the list and picks the first one that fits, and the regex
+                # will always fit for the other 2 URL's, effectively superseding them
+                # if it's above them).
+                path(
+                    "<str:committee>/",
+                    ProposalUsersOnlyArchiveView.as_view(),
+                    name="archive",
+                ),
+            ]
+        ),
+    ),
+    path("my_concepts/", MyConceptsView.as_view(), name="my_concepts"),
+    path("my_practice/", MyPracticeView.as_view(), name="my_practice"),
+    path("my_submitted/", MySubmittedView.as_view(), name="my_submitted"),
+    path("my_completed/", MyCompletedView.as_view(), name="my_completed"),
+    path("my_supervised/", MySupervisedView.as_view(), name="my_supervised"),
+    path("my_archive/", MyProposalsView.as_view(), name="my_archive"),
     # Proposal
-    path('create/', include([
-        path('', ProposalCreate.as_view(), name='create'),
-        path('pre/', ProposalCreatePreAssessment.as_view(),
-             name='create_pre'),
-        path('practice/<int:reason>/', ProposalCreatePractice.as_view(),
-             name='create_practice'),
-        path('pre_approved/', ProposalCreatePreApproved.as_view(),
-             name='create_pre_approved'),
-    ])),
-    path('update/<int:pk>/', include([
-        path('', ProposalUpdate.as_view(), name='update'),
-        path('pre/', ProposalUpdatePreAssessment.as_view(),
-             name='update_pre'),
-        path('practice/', ProposalUpdatePractice.as_view(),
-             name='update_practice'),
-        path('pre_approved/', ProposalUpdatePreApproved.as_view(),
-             name='update_pre_approved'),
-    ])),
-    path('delete/<int:pk>/', ProposalDelete.as_view(), name='delete'),
-
-    path('start/', include([
-        path('', ProposalStart.as_view(), name='start'),
-        path('pre/', ProposalStartPreAssessment.as_view(), name='start_pre'),
-        path('practice/', ProposalStartPractice.as_view(),
-             name='start_practice'),
-        path('pre_approved/', ProposalStartPreApproved.as_view(),
-             name='start_pre_approved'),
-    ])),
-
-    path('data_management/<int:pk>/', ProposalDataManagement.as_view(),
-         name='data_management'),
-    path('update_data_management/<int:pk>/', ProposalUpdateDataManagement.as_view(), 
-         name='update_data_management'),
-    path('update_date_start/<int:pk>/', ProposalUpdateDateStart.as_view(), 
-         name='update_date_start'),
-
-    path('submit/<int:pk>/', include([
-        path('', ProposalSubmit.as_view(), name='submit'),
-        path('pre/', ProposalSubmitPreAssessment.as_view(),
-             name='submit_pre'),
-        path('pre_approved/', ProposalSubmitPreApproved.as_view(),
-             name='submit_pre_approved'),
-    ])),
-
-    path('submitted/<int:pk>/', include([
-        path('', ProposalSubmitted.as_view(), name='submitted'),
-        path('pre/', ProposalSubmittedPreAssessment.as_view(),
-             name='submitted_pre'),
-        path('pre_approved/', ProposalSubmittedPreApproved.as_view(),
-             name='submitted_pre_approved')
-    ])),
-
-    path('confirm/<int:pk>/', ProposalConfirmation.as_view(),
-         name='confirmation'),
-
-    path('study_start/<int:pk>/', StudyStart.as_view(),
-         name='study_start'),
-
-    path('consent/<int:pk>/', StudyConsent.as_view(), name='consent'),
-
-    path('translated/<int:pk>/', TranslatedConsentFormsView.as_view(), name='translated'),
-
-    path('copy/', include([
-        path('', ProposalCopy.as_view(), name='copy'),
-        path('revision/', ProposalCopyRevision.as_view(),
-             name='copy_revision'),
-        path('amendment/', ProposalCopyAmendment.as_view(),
-             name='copy_amendment'),
-    ])),
-    path('diff/<int:pk>/', ProposalDifference.as_view(), name='diff'),
-
-    path('pdf/<int:pk>/', ProposalAsPdf.as_view(), name='pdf'),
-
+    path(
+        "create/",
+        include(
+            [
+                path("", ProposalCreate.as_view(), name="create"),
+                path("pre/", ProposalCreatePreAssessment.as_view(), name="create_pre"),
+                path(
+                    "practice/<int:reason>/",
+                    ProposalCreatePractice.as_view(),
+                    name="create_practice",
+                ),
+                path(
+                    "pre_approved/",
+                    ProposalCreatePreApproved.as_view(),
+                    name="create_pre_approved",
+                ),
+            ]
+        ),
+    ),
+    path(
+        "update/<int:pk>/",
+        include(
+            [
+                path("", ProposalUpdate.as_view(), name="update"),
+                path("pre/", ProposalUpdatePreAssessment.as_view(), name="update_pre"),
+                path(
+                    "practice/",
+                    ProposalUpdatePractice.as_view(),
+                    name="update_practice",
+                ),
+                path(
+                    "pre_approved/",
+                    ProposalUpdatePreApproved.as_view(),
+                    name="update_pre_approved",
+                ),
+            ]
+        ),
+    ),
+    path("delete/<int:pk>/", ProposalDelete.as_view(), name="delete"),
+    path(
+        "start/",
+        include(
+            [
+                path("", ProposalStart.as_view(), name="start"),
+                path("pre/", ProposalStartPreAssessment.as_view(), name="start_pre"),
+                path(
+                    "practice/", ProposalStartPractice.as_view(), name="start_practice"
+                ),
+                path(
+                    "pre_approved/",
+                    ProposalStartPreApproved.as_view(),
+                    name="start_pre_approved",
+                ),
+            ]
+        ),
+    ),
+    path(
+        "data_management/<int:pk>/",
+        ProposalDataManagement.as_view(),
+        name="data_management",
+    ),
+    path(
+        "update_data_management/<int:pk>/",
+        ProposalUpdateDataManagement.as_view(),
+        name="update_data_management",
+    ),
+    path(
+        "update_date_start/<int:pk>/",
+        ProposalUpdateDateStart.as_view(),
+        name="update_date_start",
+    ),
+    path(
+        "submit/<int:pk>/",
+        include(
+            [
+                path("", ProposalSubmit.as_view(), name="submit"),
+                path("pre/", ProposalSubmitPreAssessment.as_view(), name="submit_pre"),
+                path(
+                    "pre_approved/",
+                    ProposalSubmitPreApproved.as_view(),
+                    name="submit_pre_approved",
+                ),
+            ]
+        ),
+    ),
+    path(
+        "submitted/<int:pk>/",
+        include(
+            [
+                path("", ProposalSubmitted.as_view(), name="submitted"),
+                path(
+                    "pre/",
+                    ProposalSubmittedPreAssessment.as_view(),
+                    name="submitted_pre",
+                ),
+                path(
+                    "pre_approved/",
+                    ProposalSubmittedPreApproved.as_view(),
+                    name="submitted_pre_approved",
+                ),
+            ]
+        ),
+    ),
+    path("confirm/<int:pk>/", ProposalConfirmation.as_view(), name="confirmation"),
+    path("study_start/<int:pk>/", StudyStart.as_view(), name="study_start"),
+    path("consent/<int:pk>/", StudyConsent.as_view(), name="consent"),
+    path(
+        "translated/<int:pk>/", TranslatedConsentFormsView.as_view(), name="translated"
+    ),
+    path(
+        "copy/",
+        include(
+            [
+                path("", ProposalCopy.as_view(), name="copy"),
+                path("revision/", ProposalCopyRevision.as_view(), name="copy_revision"),
+                path(
+                    "amendment/", ProposalCopyAmendment.as_view(), name="copy_amendment"
+                ),
+            ]
+        ),
+    ),
+    path("diff/<int:pk>/", ProposalDifference.as_view(), name="diff"),
+    path("pdf/<int:pk>/", ProposalAsPdf.as_view(), name="pdf"),
     # WMO
-    path('wmo/create/<int:pk>/', include([
-        path('', WmoCreate.as_view(), name='wmo_create'),
-        path('pre/', WmoCreatePreAssessment.as_view(), name='wmo_create_pre'),
-    ])),
-    path('wmo/update/<int:pk>/', include([
-        path('', WmoUpdate.as_view(), name='wmo_update'),
-        path('pre/', WmoUpdatePreAssessment.as_view(), name='wmo_update_pre'),
-    ])),
-    path('wmo/application/<int:pk>/', include([
-        path('', WmoApplication.as_view(), name='wmo_application'),
-        path('pre/', WmoApplicationPreAssessment.as_view(), name='wmo_application_pre'),
-    ])),
-    path('wmo/check/', WmoCheck.as_view(), name='wmo_check'),
-    path('wmo/check_js/', check_wmo, name='check_wmo'),
-
     path(
-        'compare/', include([
-            path(
-                'consent/<int:old>/<int:new>/<str:attribute>/',
-                CompareDocumentsView.as_view(),
-                {
-                    'type': 'documents'
-                },
-                name='compare_documents',
-            ),
-            path(
-                'observation/<int:old>/<int:new>/approval_document/',
-                CompareDocumentsView.as_view(),
-                {
-                    'type':      'observation',
-                    'attribute': 'approval_document',
-                },
-                name='compare_observation_approval',
-            ),
-            path(
-                'wmo/<int:old>/<int:new>/decision/',
-                CompareDocumentsView.as_view(),
-                {
-                    'type':      'wmo',
-                    'attribute': 'metc_decision_pdf',
-                },
-                name='compare_wmo_decision',
-            ),
-            path(
-                'study/<int:old>/<int:new>/<str:attribute>/',
-                CompareDocumentsView.as_view(),
-                {
-                    'type': 'proposal'
-                },
-                name='compare_proposal_docs',
-            ),
-        ])
+        "wmo/create/<int:pk>/",
+        include(
+            [
+                path("", WmoCreate.as_view(), name="wmo_create"),
+                path("pre/", WmoCreatePreAssessment.as_view(), name="wmo_create_pre"),
+            ]
+        ),
+    ),
+    path(
+        "wmo/update/<int:pk>/",
+        include(
+            [
+                path("", WmoUpdate.as_view(), name="wmo_update"),
+                path("pre/", WmoUpdatePreAssessment.as_view(), name="wmo_update_pre"),
+            ]
+        ),
+    ),
+    path(
+        "wmo/application/<int:pk>/",
+        include(
+            [
+                path("", WmoApplication.as_view(), name="wmo_application"),
+                path(
+                    "pre/",
+                    WmoApplicationPreAssessment.as_view(),
+                    name="wmo_application_pre",
+                ),
+            ]
+        ),
+    ),
+    path("wmo/check/", WmoCheck.as_view(), name="wmo_check"),
+    path("wmo/check_js/", check_wmo, name="check_wmo"),
+    path(
+        "compare/",
+        include(
+            [
+                path(
+                    "consent/<int:old>/<int:new>/<str:attribute>/",
+                    CompareDocumentsView.as_view(),
+                    {"type": "documents"},
+                    name="compare_documents",
+                ),
+                path(
+                    "observation/<int:old>/<int:new>/approval_document/",
+                    CompareDocumentsView.as_view(),
+                    {
+                        "type": "observation",
+                        "attribute": "approval_document",
+                    },
+                    name="compare_observation_approval",
+                ),
+                path(
+                    "wmo/<int:old>/<int:new>/decision/",
+                    CompareDocumentsView.as_view(),
+                    {
+                        "type": "wmo",
+                        "attribute": "metc_decision_pdf",
+                    },
+                    name="compare_wmo_decision",
+                ),
+                path(
+                    "study/<int:old>/<int:new>/<str:attribute>/",
+                    CompareDocumentsView.as_view(),
+                    {"type": "proposal"},
+                    name="compare_proposal_docs",
+                ),
+            ]
+        ),
     ),
 ]
diff --git a/proposals/utils/__init__.py b/proposals/utils/__init__.py
index 583297b59..be19d3292 100644
--- a/proposals/utils/__init__.py
+++ b/proposals/utils/__init__.py
@@ -1,2 +1,2 @@
 from .proposal_utils import *
-from .pdf_diff_logic import *
\ No newline at end of file
+from .pdf_diff_logic import *
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index 6956158c0..ff2489d23 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -42,7 +42,7 @@ def __init__(self, obj):
     def make_rows(self):
         rows = [self.make_row_for_field(field) for field in self.get_row_fields()]
         return rows
-    
+
     def make_row_for_field(self, field):
         if field in self.get_row_fields():
             return Row(self.obj, field)
@@ -132,23 +132,32 @@ def make_diff_rows(self):
             new_section_dict = {row.field: row for row in new_rows}
 
             for field in all_fields:
-                #If a field does not appear in either section, no row will be created.
+                # If a field does not appear in either section, no row will be created.
                 if field in old_section_dict and field in new_section_dict:
-                    rows.append({'verbose_name':old_section_dict[field].verbose_name,
-                                 'old_value': old_section_dict[field].value, 
-                                 'new_value': new_section_dict[field].value}
+                    rows.append(
+                        {
+                            "verbose_name": old_section_dict[field].verbose_name,
+                            "old_value": old_section_dict[field].value,
+                            "new_value": new_section_dict[field].value,
+                        }
                     )
                 elif field in old_section_dict and not field in new_section_dict:
-                    rows.append({'verbose_name':old_section_dict[field].verbose_name,
-                                 'old_value': old_section_dict[field].value, 
-                                 'new_value': ''}
-                    )  
+                    rows.append(
+                        {
+                            "verbose_name": old_section_dict[field].verbose_name,
+                            "old_value": old_section_dict[field].value,
+                            "new_value": "",
+                        }
+                    )
                 elif field in new_section_dict and not field in old_section_dict:
-                    rows.append({'verbose_name':new_section_dict[field].verbose_name,
-                                 'old_value': '', 
-                                 'new_value': new_section_dict[field].value}
+                    rows.append(
+                        {
+                            "verbose_name": new_section_dict[field].verbose_name,
+                            "old_value": "",
+                            "new_value": new_section_dict[field].value,
+                        }
                     )
-                                    
+
             return rows
 
     def render(self, context):
@@ -176,6 +185,7 @@ def render(self, context):
         )
         return template.render(context)
 
+
 class Row:
     """This class creates rows for one objects, and gets initated
     in the make_rows method of Section classes. The classmethods of Rowclass
@@ -193,7 +203,7 @@ def __init__(self, obj, field):
 
     def value(self):
         return RowValue(self.obj, self.field).get_field_value()
-    
+
     def verbose_name(self):
         if self.field in self.verbose_name_diff_field_dict:
             verbose_name_field = self.verbose_name_diff_field_dict[self.field]
@@ -207,9 +217,9 @@ def get_verbose_name(self, field):
             return mark_safe(self.obj._meta.get_field(field).verbose_name)
         else:
             return mark_safe(
-                self.obj._meta.get_field(field).verbose_name
-                % self.obj.net_duration()
-            )    
+                self.obj._meta.get_field(field).verbose_name % self.obj.net_duration()
+            )
+
 
 class RowValue:
     """The RowValue class manages the values of fields and correctly retrieves and/or formats
@@ -267,7 +277,7 @@ def create_unordered_html_list(self, lst):
         for index, item in enumerate(lst):
             html_output += format_html("- {}", item)
             if index != len(lst) - 1:
-                html_output += mark_safe('<br/>')
+                html_output += mark_safe("<br/>")
 
         html_output += mark_safe("</p>")
 
@@ -922,6 +932,7 @@ def get_row_fields(self):
 
         return rows
 
+
 class ExtraDocumentsSection(BaseSection):
     """This class receives an Documents object.
     Overrides the __init__ to create a formatted section title"""
@@ -983,8 +994,7 @@ def get_row_fields(self):
 
 
 class CommentsSection(BaseSection):
-    """Gets passed a proposal object. 
-    """
+    """Gets passed a proposal object."""
 
     section_title = _("Ruimte voor eventuele opmerkingen")
 
@@ -1010,7 +1020,7 @@ def create_context_pdf(context, model):
 
     sections.append(GeneralSection(model))
 
-    if hasattr(model, 'wmo'):
+    if hasattr(model, "wmo"):
         sections.append(WMOSection(model.wmo))
 
         if not model.is_pre_assessment:
@@ -1088,18 +1098,20 @@ def create_context_diff(context, old_proposal, new_proposal):
         DiffSection(GeneralSection(old_proposal), GeneralSection(new_proposal))
     )
 
-    if hasattr(new_proposal, 'wmo'):
+    if hasattr(new_proposal, "wmo"):
         sections.append(
             DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
         )
-        
+
         if new_proposal.is_pre_assessment:
             if (
                 new_proposal.wmo.status != new_proposal.wmo.WMOStatuses.NO_WMO
                 or old_proposal.wmo.status != old_proposal.wmo.WMOStatuses.NO_WMO
             ):
                 sections.append(
-                    DiffSection(METCSection(old_proposal.wmo), METCSection(new_proposal.wmo))
+                    DiffSection(
+                        METCSection(old_proposal.wmo), METCSection(new_proposal.wmo)
+                    )
                 )
 
             sections.append(
@@ -1117,7 +1129,9 @@ def create_context_diff(context, old_proposal, new_proposal):
                 ):
                     both_studies = [old_study, new_study]
 
-                    sections.append(DiffSection(*multi_sections(StudySection, both_studies)))
+                    sections.append(
+                        DiffSection(*multi_sections(StudySection, both_studies))
+                    )
 
                     if (
                         old_study is not None
@@ -1128,7 +1142,9 @@ def create_context_diff(context, old_proposal, new_proposal):
                         interventions = get_all_related(both_studies, "intervention")
 
                         sections.append(
-                            DiffSection(*multi_sections(InterventionSection, interventions))
+                            DiffSection(
+                                *multi_sections(InterventionSection, interventions)
+                            )
                         )
 
                     if (
@@ -1140,7 +1156,9 @@ def create_context_diff(context, old_proposal, new_proposal):
                         observations = get_all_related(both_studies, "observation")
 
                         sections.append(
-                            DiffSection(*multi_sections(ObservationSection, observations))
+                            DiffSection(
+                                *multi_sections(ObservationSection, observations)
+                            )
                         )
 
                     if (
@@ -1150,7 +1168,9 @@ def create_context_diff(context, old_proposal, new_proposal):
                         and new_study.has_sessions
                     ):
                         sections.append(
-                            DiffSection(*multi_sections(SessionsOverviewSection, both_studies))
+                            DiffSection(
+                                *multi_sections(SessionsOverviewSection, both_studies)
+                            )
                         )
 
                         old_sessions_set, new_sessions_set = get_all_related_set(
@@ -1161,20 +1181,28 @@ def create_context_diff(context, old_proposal, new_proposal):
                             old_sessions_set, new_sessions_set
                         ):
                             sections.append(
-                                DiffSection(*multi_sections(SessionSection, both_sessions))
+                                DiffSection(
+                                    *multi_sections(SessionSection, both_sessions)
+                                )
                             )
 
                             old_tasks_set, new_tasks_set = get_all_related_set(
                                 both_sessions, "task_set"
                             )
 
-                            for both_tasks in zip_equalize_lists(old_tasks_set, new_tasks_set):
+                            for both_tasks in zip_equalize_lists(
+                                old_tasks_set, new_tasks_set
+                            ):
                                 sections.append(
-                                    DiffSection(*multi_sections(TaskSection, both_tasks))
+                                    DiffSection(
+                                        *multi_sections(TaskSection, both_tasks)
+                                    )
                                 )
 
                         sections.append(
-                            DiffSection(*multi_sections(TasksOverviewSection, both_sessions))
+                            DiffSection(
+                                *multi_sections(TasksOverviewSection, both_sessions)
+                            )
                         )
 
                     sections.append(
@@ -1198,14 +1226,18 @@ def create_context_diff(context, old_proposal, new_proposal):
                     ):
                         sections.append(
                             DiffSection(
-                                *multi_sections(ExtraDocumentsSection, zipped_extra_docs, num)
+                                *multi_sections(
+                                    ExtraDocumentsSection, zipped_extra_docs, num
+                                )
                             )
                         )
 
                 if old_proposal.dmp_file or new_proposal.dmp_file:
                     sections.append(
                         DiffSection(
-                            *multi_sections(DMPFileSection, [old_proposal, new_proposal])
+                            *multi_sections(
+                                DMPFileSection, [old_proposal, new_proposal]
+                            )
                         )
                     )
 
diff --git a/proposals/utils/proposal_utils.py b/proposals/utils/proposal_utils.py
index 496675a8d..b0d1c08ed 100644
--- a/proposals/utils/proposal_utils.py
+++ b/proposals/utils/proposal_utils.py
@@ -20,11 +20,16 @@
 from studies.utils import study_urls
 
 
-__all__ = ['available_urls', 'generate_ref_number',
-           'generate_revision_ref_number', 'generate_pdf',
-           'check_local_facilities', 'notify_local_staff',
-           'FilenameFactory', 'OverwriteStorage',
-           ]
+__all__ = [
+    "available_urls",
+    "generate_ref_number",
+    "generate_revision_ref_number",
+    "generate_pdf",
+    "check_local_facilities",
+    "notify_local_staff",
+    "FilenameFactory",
+    "OverwriteStorage",
+]
 
 
 def available_urls(proposal):
@@ -36,60 +41,63 @@ def available_urls(proposal):
     urls = list()
 
     if proposal.is_pre_assessment:
-        urls.append(AvailableURL(url=reverse('proposals:update_pre', args=(proposal.pk,)),
-                                 title=_('Algemene informatie over de aanvraag')))
+        urls.append(
+            AvailableURL(
+                url=reverse("proposals:update_pre", args=(proposal.pk,)),
+                title=_("Algemene informatie over de aanvraag"),
+            )
+        )
 
-        wmo_url = AvailableURL(title=_('Ethische toetsing nodig door een METC?'))
-        if hasattr(proposal, 'wmo'):
-            wmo_url.url = reverse('proposals:wmo_update_pre', args=(proposal.wmo.pk,))
+        wmo_url = AvailableURL(title=_("Ethische toetsing nodig door een METC?"))
+        if hasattr(proposal, "wmo"):
+            wmo_url.url = reverse("proposals:wmo_update_pre", args=(proposal.wmo.pk,))
         else:
-            wmo_url.url = reverse('proposals:wmo_create_pre', args=(proposal.pk,))
+            wmo_url.url = reverse("proposals:wmo_create_pre", args=(proposal.pk,))
         urls.append(wmo_url)
 
-        submit_url = AvailableURL(title=_('Aanvraag voor voortoetsing klaar voor versturen'))
-        if hasattr(proposal, 'wmo'):
-            submit_url.url = reverse('proposals:submit_pre', args=(proposal.pk,))
+        submit_url = AvailableURL(
+            title=_("Aanvraag voor voortoetsing klaar voor versturen")
+        )
+        if hasattr(proposal, "wmo"):
+            submit_url.url = reverse("proposals:submit_pre", args=(proposal.pk,))
         urls.append(submit_url)
     elif proposal.is_pre_approved:
-        urls.append(AvailableURL(url=reverse('proposals:update_pre_approved', args=(proposal.pk,)),
-                                 title=_('Algemene informatie over de aanvraag')))
+        urls.append(
+            AvailableURL(
+                url=reverse("proposals:update_pre_approved", args=(proposal.pk,)),
+                title=_("Algemene informatie over de aanvraag"),
+            )
+        )
 
         submit_url = AvailableURL(
-            title=_('Aanvraag voor voortoetsing klaar voor versturen'),
+            title=_("Aanvraag voor voortoetsing klaar voor versturen"),
             margin=0,
-            url = reverse('proposals:submit_pre_approved', args=(proposal.pk,))
+            url=reverse("proposals:submit_pre_approved", args=(proposal.pk,)),
         )
         urls.append(submit_url)
     else:
-        update_url = 'proposals:update_practice' if proposal.is_practice() else 'proposals:update'
+        update_url = (
+            "proposals:update_practice"
+            if proposal.is_practice()
+            else "proposals:update"
+        )
         urls.append(
             AvailableURL(
                 url=reverse(update_url, args=(proposal.pk,)),
-                title=_('Algemeen'),
+                title=_("Algemeen"),
             )
         )
 
-        wmo_url = AvailableURL(
-            title=_('METC')
-        )
-        if hasattr(proposal, 'wmo'):
-            wmo_url.url = reverse(
-                'proposals:wmo_update',
-                args=(proposal.wmo.pk,)
-            )
+        wmo_url = AvailableURL(title=_("METC"))
+        if hasattr(proposal, "wmo"):
+            wmo_url.url = reverse("proposals:wmo_update", args=(proposal.wmo.pk,))
         else:
-            wmo_url.url = reverse(
-                'proposals:wmo_create',
-                args=(proposal.pk,)
-            )
+            wmo_url.url = reverse("proposals:wmo_create", args=(proposal.pk,))
         urls.append(wmo_url)
 
-        studies_url = AvailableURL(title=_('Trajecten'))
-        if hasattr(proposal, 'wmo'):
-            studies_url.url = reverse(
-                        'proposals:study_start',
-                        args=(proposal.pk,)
-                    )
+        studies_url = AvailableURL(title=_("Trajecten"))
+        if hasattr(proposal, "wmo"):
+            studies_url.url = reverse("proposals:study_start", args=(proposal.pk,))
 
             if proposal.study_set.count() > 0:
                 _add_study_urls(studies_url, proposal)
@@ -97,37 +105,28 @@ def available_urls(proposal):
         urls.append(studies_url)
 
         consent_docs_url = AvailableURL(
-            title=_('Uploaden'), 
-            url=reverse(
-                'proposals:consent', 
-                args=(proposal.pk, )
-                )
-            )
+            title=_("Uploaden"), url=reverse("proposals:consent", args=(proposal.pk,))
+        )
         translated_docs_url = AvailableURL(
-            title=_('Vertaling'), 
-            url=reverse(
-                'proposals:translated', 
-                args=(proposal.pk, )
-                )
-            )
+            title=_("Vertaling"),
+            url=reverse("proposals:translated", args=(proposal.pk,)),
+        )
         consent_url = AvailableURL(
-            title=_('Formulieren'), 
-            children=[
-                translated_docs_url, 
-                consent_docs_url
-                ]
-            )
+            title=_("Formulieren"), children=[translated_docs_url, consent_docs_url]
+        )
 
-        data_management_url = AvailableURL(title=_('Datamanagement'))
-        submit_url = AvailableURL(title=_('Versturen'))
+        data_management_url = AvailableURL(title=_("Datamanagement"))
+        submit_url = AvailableURL(title=_("Versturen"))
 
         if proposal.last_study() and proposal.last_study().is_completed():
-            consent_url.url = reverse('proposals:translated', args=(proposal.pk, ))
-            data_management_url.url = reverse('proposals:data_management', args=(proposal.pk, ))
-            submit_url.url = reverse('proposals:submit', args=(proposal.pk,))
+            consent_url.url = reverse("proposals:translated", args=(proposal.pk,))
+            data_management_url.url = reverse(
+                "proposals:data_management", args=(proposal.pk,)
+            )
+            submit_url.url = reverse("proposals:submit", args=(proposal.pk,))
 
         if proposal.translated_forms is not None:
-            consent_url.url = reverse('proposals:consent', args=(proposal.pk,))
+            consent_url.url = reverse("proposals:consent", args=(proposal.pk,))
 
         urls.append(consent_url)
         urls.append(data_management_url)
@@ -148,9 +147,7 @@ def _add_study_urls(main_element, proposal):
     # Otherwise, add them all with the parent node
     prev_study_completed = True
     for study in proposal.study_set.all():
-        main_element.children.append(
-            study_urls(study, prev_study_completed)
-        )
+        main_element.children.append(study_urls(study, prev_study_completed))
         prev_study_completed = study.is_completed()
 
 
@@ -169,7 +166,7 @@ def generate_ref_number():
     proposal_number = _get_next_proposal_number(current_year)
     version_number = 1
 
-    return '{}-{:03}-{:02}'.format(
+    return "{}-{:03}-{:02}".format(
         current_year_formatted,
         proposal_number,
         version_number,
@@ -192,7 +189,7 @@ def generate_revision_ref_number(parent):
     will use the next available version number (this might not be the same as
     parent.vr + 1, as that one might already exist).
     """
-    parent_parts = parent.reference_number.split('-')
+    parent_parts = parent.reference_number.split("-")
 
     # If we have 4 parts, the ref.number is in the user-nr-vr-year format
     if len(parent_parts) == 4:
@@ -211,7 +208,7 @@ def _generate_revision_ref_number_oldformat(parent, version):
     """
     from ..models import Proposal
 
-    parent_parts = parent.reference_number.split('-')
+    parent_parts = parent.reference_number.split("-")
 
     old_proposal_number = int(parent_parts[1])
     proposal_number = -1
@@ -233,18 +230,18 @@ def _generate_revision_ref_number_oldformat(parent, version):
     # part and the same year. (This way we find both old and new style ref.nums)
     num_versions = Proposal.objects.filter(
         Q(
-            reference_number__istartswith="{}-{:02}".format(username,
-                                                            old_proposal_number),
-            reference_number__endswith=str(year)
-        ) | Q(reference_number__istartswith="{}-{:03}".format(year,
-                                                              proposal_number))
-
+            reference_number__istartswith="{}-{:02}".format(
+                username, old_proposal_number
+            ),
+            reference_number__endswith=str(year),
+        )
+        | Q(reference_number__istartswith="{}-{:03}".format(year, proposal_number))
     ).count()
 
     # The new revision is number of current versions + 1
     version_number = num_versions + 1
 
-    return '{}-{:03}-{:02}'.format(
+    return "{}-{:03}-{:02}".format(
         year[2:],
         proposal_number,
         version_number,
@@ -257,7 +254,7 @@ def _generate_revision_ref_number_newformat(parent):
     """
     from ..models import Proposal
 
-    parent_parts = parent.reference_number.split('-')
+    parent_parts = parent.reference_number.split("-")
     year = int(parent_parts[0])
     proposal_number = int(parent_parts[1])
 
@@ -269,14 +266,14 @@ def _generate_revision_ref_number_newformat(parent):
     # Loop through all them, and note the newest version seen
     newest = None
     for parent_proposal in parent_proposals:
-        version = parent_proposal.reference_number.split('-')[2]
+        version = parent_proposal.reference_number.split("-")[2]
         version = int(version)
         if not newest or version > newest:
             newest = version
 
     version_number = newest + 1
 
-    return '{}-{:03}-{:02}'.format(
+    return "{}-{:03}-{:02}".format(
         year,
         proposal_number,
         version_number,
@@ -289,21 +286,27 @@ def _get_next_proposal_number(current_year) -> int:
     try:
         # We count all proposals for this year by selecting all proposals
         # with a reference number ending with the current year.
-        last_proposal = Proposal.objects.filter(
-            reference_number__startswith="{}-".format(str(current_year)[2:])
-        ).order_by('-reference_number').first()
+        last_proposal = (
+            Proposal.objects.filter(
+                reference_number__startswith="{}-".format(str(current_year)[2:])
+            )
+            .order_by("-reference_number")
+            .first()
+        )
 
         if not last_proposal:
             return 1
 
-        _, num, _ = last_proposal.reference_number.split('-', maxsplit=2)
+        _, num, _ = last_proposal.reference_number.split("-", maxsplit=2)
 
         return int(num) + 1
     except Proposal.DoesNotExist:
         return 1
 
 
-def generate_pdf(proposal,):
+def generate_pdf(
+    proposal,
+):
     """
     Returns a PDF of a proposal using the ProposalAsPdf view
     and the proposal's own recommended PDF template.
@@ -328,6 +331,7 @@ def generate_pdf(proposal,):
 
     return pdf
 
+
 def pdf_link_callback(uri, rel):
     """
     Convert HTML URIs to absolute system paths so xhtml2pdf can access those
@@ -340,12 +344,12 @@ def pdf_link_callback(uri, rel):
         if not isinstance(result, (list, tuple)):
             result = [result]
         result = list(os.path.realpath(path) for path in result)
-        path=result[0]
+        path = result[0]
     else:
-        sUrl = settings.STATIC_URL        # Typically /static/
-        sRoot = settings.STATIC_ROOT      # Typically /home/userX/project_static/
-        mUrl = settings.MEDIA_URL         # Typically /media/
-        mRoot = settings.MEDIA_ROOT       # Typically /home/userX/project_static/media/
+        sUrl = settings.STATIC_URL  # Typically /static/
+        sRoot = settings.STATIC_ROOT  # Typically /home/userX/project_static/
+        mUrl = settings.MEDIA_URL  # Typically /media/
+        mRoot = settings.MEDIA_ROOT  # Typically /home/userX/project_static/media/
 
         if uri.startswith(mUrl):
             path = os.path.join(mRoot, uri.replace(mUrl, ""))
@@ -356,9 +360,7 @@ def pdf_link_callback(uri, rel):
 
     # make sure that file exists
     if not os.path.isfile(path):
-        raise Exception(
-            'media URI must start with %s or %s' % (sUrl, mUrl)
-        )
+        raise Exception("media URI must start with %s or %s" % (sUrl, mUrl))
     return path
 
 
@@ -407,23 +409,25 @@ def notify_local_staff(proposal):
     """
     # Change language to Dutch for this e-mail, but save the current language to reset it later
     current_language = get_language()
-    activate('nl')
+    activate("nl")
 
     secretary = get_secretary()
 
     if proposal.is_revision:
-        subject = _('FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten')
+        subject = _("FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten")
     else:
-        subject = _('FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten')
+        subject = _("FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten")
 
     params = {
-        'secretary': secretary.get_full_name(),
-        'proposal': proposal,
-        'applicants': [applicant.get_full_name() for applicant in proposal.applicants.all()],
-        'facilities': sorted(check_local_facilities(proposal).items()),
-        'is_revision': proposal.is_revision,
+        "secretary": secretary.get_full_name(),
+        "proposal": proposal,
+        "applicants": [
+            applicant.get_full_name() for applicant in proposal.applicants.all()
+        ],
+        "facilities": sorted(check_local_facilities(proposal).items()),
+        "is_revision": proposal.is_revision,
     }
-    msg_plain = render_to_string('mail/local_staff_notify.txt', params)
+    msg_plain = render_to_string("mail/local_staff_notify.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [settings.EMAIL_LOCAL_STAFF])
 
     # Reset the current language
@@ -432,11 +436,10 @@ def notify_local_staff(proposal):
 
 @deconstructible
 class FilenameFactory:
-    '''A callable class which can be passed to upload_to() in FileFields
-    and can be deconstructed for migrations'''
+    """A callable class which can be passed to upload_to() in FileFields
+    and can be deconstructed for migrations"""
 
     def __init__(self, document_type):
-
         # document_type is a string describing the document kind,
         # such as "Informed_Consent"
         self.document_type = document_type
@@ -460,7 +463,7 @@ def __call__(self, instance, original_fn):
             # In case of Documents objects
             proposal = instance.proposal
             try:
-                trajectory = 'T' + str(instance.study.order)
+                trajectory = "T" + str(instance.study.order)
             except AttributeError:
                 # No associated study, so this is an extra Documents instance
                 # We need to give it an index so they don't overwrite each other
@@ -468,50 +471,51 @@ def __call__(self, instance, original_fn):
 
                 # Again, to prevent circular imports
                 from studies.models import Documents
-                qs = Documents.objects.filter(
-                    proposal=proposal).filter(
-                        study=None)
+
+                qs = Documents.objects.filter(proposal=proposal).filter(study=None)
 
                 for docs in qs:
                     # The current Documents instance might not yet be saved and
                     # therefore not exist in the QS. Hence the for loop instead of
                     # the more traditional while
                     if docs == instance:
-                        break # i.e. this may never happen
+                        break  # i.e. this may never happen
                     extra_index += 1
 
                 # Unknown
-                trajectory = 'Extra' + str(extra_index)
+                trajectory = "Extra" + str(extra_index)
 
         chamber = proposal.reviewing_committee.name
         lastname = proposal.created_by.last_name
         refnum = proposal.reference_number
 
-        extension = '.' + original_fn.split('.')[-1][-7:] # At most 7 chars seems reasonable
+        extension = (
+            "." + original_fn.split(".")[-1][-7:]
+        )  # At most 7 chars seems reasonable
 
-        fn_parts = ['FETC',
-                    chamber,
-                    refnum,
-                    lastname,
-                    trajectory,
-                    self.document_type,
-                    ]
+        fn_parts = [
+            "FETC",
+            chamber,
+            refnum,
+            lastname,
+            trajectory,
+            self.document_type,
+        ]
 
         def not_empty(item):
             if item == None:
                 return False
-            if str(item) == '':
+            if str(item) == "":
                 return False
             return True
 
         # Translations will trip up join(), so we convert them here
         fn_parts = [str(p) for p in filter(not_empty, fn_parts)]
 
-        return '-'.join(fn_parts) + extension
+        return "-".join(fn_parts) + extension
 
 
 class OverwriteStorage(FileSystemStorage):
-
     def get_available_name(self, name, **kwargs):
         """Returns a filename that's free on the target storage system, and
         available for new content to be written to.
diff --git a/proposals/utils/statistics_utils.py b/proposals/utils/statistics_utils.py
index bf630fd1a..e51085298 100644
--- a/proposals/utils/statistics_utils.py
+++ b/proposals/utils/statistics_utils.py
@@ -62,12 +62,9 @@ def get_review_qs_for_proposals(proposal_data: QuerySet) -> QuerySet:
     )
 
 
-def _get_review_qs_by_route(proposal_data: QuerySet, short_route: bool) -> \
-        QuerySet:
+def _get_review_qs_by_route(proposal_data: QuerySet, short_route: bool) -> QuerySet:
     """Returns all Reviews for the given proposals and taken route"""
-    return get_review_qs_for_proposals(proposal_data).filter(
-        short_route=short_route
-    )
+    return get_review_qs_for_proposals(proposal_data).filter(short_route=short_route)
 
 
 def get_qs_for_short_route_reviews(proposal_data: QuerySet) -> QuerySet:
@@ -162,9 +159,7 @@ def get_total_turnaround_time(review_data: QuerySet) -> Counter:
     :return: A Counter of (days, count) pairs
     :rtype: Counter
     """
-    return Counter(
-        [(x.date_end - x.date_start).days for x in review_data]
-    )
+    return Counter([(x.date_end - x.date_start).days for x in review_data])
 
 
 def get_average_turnaround_time(review_data: QuerySet) -> float:
@@ -177,9 +172,7 @@ def get_average_turnaround_time(review_data: QuerySet) -> float:
     using a float to represent partial days)
     :rtype: float
     """
-    return statistics.mean(
-        [(x.date_end - x.date_start).days for x in review_data]
-    )
+    return statistics.mean([(x.date_end - x.date_start).days for x in review_data])
 
 
 #
@@ -205,30 +198,33 @@ def get_registrations_for_proposal(proposal: Proposal) -> dict:
             for registration in study.observation.registrations.all():
                 if registration in ObsReg.objects.filter(needs_details=True):
                     registrations[study.order].append(
-                        'obs: {}: {}'.format(registration.description,
-                                             study.observation.registrations_details))
+                        "obs: {}: {}".format(
+                            registration.description,
+                            study.observation.registrations_details,
+                        )
+                    )
                 else:
                     registrations[study.order].append(
-                        'obs: {}'.format(registration.description))
+                        "obs: {}".format(registration.description)
+                    )
         if study.has_sessions:
             for session in study.session_set.all():
                 for task in session.task_set.all():
                     for registration in task.registrations.all():
-                        if registration in TasReg.objects.filter(
-                                needs_details=True):
+                        if registration in TasReg.objects.filter(needs_details=True):
                             registrations[study.order].append(
-                                's{}t{}: {}: {}'.format(
+                                "s{}t{}: {}: {}".format(
                                     session.order,
                                     task.order,
                                     registration.description,
-                                    task.registrations_details)
+                                    task.registrations_details,
+                                )
                             )
                         else:
                             registrations[study.order].append(
-                                's{}t{}: {}'.format(
-                                    session.order,
-                                    task.order,
-                                    registration.description)
+                                "s{}t{}: {}".format(
+                                    session.order, task.order, registration.description
+                                )
                             )
 
     return registrations
@@ -246,10 +242,10 @@ def get_studytypes_for_proposal(proposal: Proposal) -> dict:
 
     for study in proposal.study_set.all():
         if study.has_intervention:
-            study_types[study.order].append('intervention')
+            study_types[study.order].append("intervention")
         if study.has_observation:
-            study_types[study.order].append('observation')
+            study_types[study.order].append("observation")
         if study.has_sessions:
-            study_types[study.order].append('task')
+            study_types[study.order].append("task")
 
     return study_types
diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 427d9b870..59ea7a032 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -12,7 +12,14 @@
 from observations.forms import ObservationForm
 from studies.forms import StudyForm, StudyDesignForm, SessionStartForm
 from tasks.forms import TaskStartForm, TaskEndForm, TaskForm
-from ..forms import ProposalForm, WmoForm, StudyStartForm, WmoApplicationForm, TranslatedConsentForms, ProposalDataManagementForm
+from ..forms import (
+    ProposalForm,
+    WmoForm,
+    StudyStartForm,
+    WmoApplicationForm,
+    TranslatedConsentForms,
+    ProposalDataManagementForm,
+)
 from ..models import Proposal
 
 from django.utils.translation import ugettext_lazy as _
@@ -22,39 +29,39 @@
 def _build_forms(proposal: Proposal) -> OrderedDict:
     forms = OrderedDict()
 
-    wmo_update_url = 'proposals:wmo_update'
-    wmo_application_url = 'proposals:wmo_application'
+    wmo_update_url = "proposals:wmo_update"
+    wmo_application_url = "proposals:wmo_application"
 
     # Get the correct URL for the
     if proposal.is_pre_assessment:
-        forms['start'] = (
+        forms["start"] = (
             ProposalForm,
-            reverse('proposals:update_pre', args=[proposal.pk]),
-            _('Algemene informatie over de aanvraag'),
+            reverse("proposals:update_pre", args=[proposal.pk]),
+            _("Algemene informatie over de aanvraag"),
             proposal,
         )
 
-        wmo_create_url = 'proposals:wmo_create_pro'
-        wmo_update_url = 'proposals:wmo_update_pro'
+        wmo_create_url = "proposals:wmo_create_pro"
+        wmo_update_url = "proposals:wmo_update_pro"
     elif proposal.is_pre_approved:
-        forms['start'] = (
+        forms["start"] = (
             ProposalForm,
-            reverse('proposals:update_pre_approved', args=[proposal.pk]),
-            _('Algemene informatie over de aanvraag'),
+            reverse("proposals:update_pre_approved", args=[proposal.pk]),
+            _("Algemene informatie over de aanvraag"),
             proposal,
         )
     elif proposal.is_practice():
-        forms['start'] = (
+        forms["start"] = (
             ProposalForm,
-            reverse('proposals:update_practice', args=[proposal.pk]),
-            _('Algemene informatie over de aanvraag'),
+            reverse("proposals:update_practice", args=[proposal.pk]),
+            _("Algemene informatie over de aanvraag"),
             proposal,
         )
     else:
-        forms['start'] = (
+        forms["start"] = (
             ProposalForm,
-            reverse('proposals:update', args=[proposal.pk]),
-            _('Algemene informatie over de aanvraag'),
+            reverse("proposals:update", args=[proposal.pk]),
+            _("Algemene informatie over de aanvraag"),
             proposal,
         )
 
@@ -62,18 +69,18 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
     if proposal.is_pre_approved:
         return forms
 
-    if hasattr(proposal, 'wmo'):
-        forms['wmo_form'] = (
+    if hasattr(proposal, "wmo"):
+        forms["wmo_form"] = (
             WmoForm,
             reverse(wmo_update_url, args=[proposal.wmo.pk]),
-            _('Ethische toetsing nodig door een METC?'),
+            _("Ethische toetsing nodig door een METC?"),
             proposal.wmo,
         )
         if proposal.wmo.status != proposal.wmo.WMOStatuses.NO_WMO:
-            forms['wmo_application'] = (
+            forms["wmo_application"] = (
                 WmoApplicationForm,
                 reverse(wmo_application_url, args=[proposal.pk]),
-                _('Ethische toetsing nodig door een METC?'),
+                _("Ethische toetsing nodig door een METC?"),
                 proposal.wmo,
             )
 
@@ -81,42 +88,39 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
     if proposal.is_pre_assessment:
         return forms
 
-    forms['study_start'] = (
+    forms["study_start"] = (
         StudyStartForm,
-        reverse('proposals:study_start', args=[proposal.pk]),
-        _(u'Eén of meerdere trajecten?'),
+        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)
+        key_base = "study_{}".format(study.pk)
 
-        start_key = '{}_start'.format(key_base)
+        start_key = "{}_start".format(key_base)
         forms[start_key] = (
             StudyForm,
-            reverse('studies:update', args=[study.pk]),
-            _('De deelnemers (traject {})').format(study.order),
+            reverse("studies:update", args=[study.pk]),
+            _("De deelnemers (traject {})").format(study.order),
             study,
         )
 
-        design_key = '{}_design'.format(key_base)
+        design_key = "{}_design".format(key_base)
         forms[design_key] = (
             StudyDesignForm,
-            reverse('studies:design', args=[study.pk]),
-            _('De onderzoekstype(n) (traject {})').format(study.order),
+            reverse("studies:design", args=[study.pk]),
+            _("De onderzoekstype(n) (traject {})").format(study.order),
             study,
         )
 
         if study.has_intervention:
-            intervention_key = '{}_intervention'.format(key_base)
-            if hasattr(study, '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(
+                    reverse("interventions:update", args=[study.intervention.pk]),
+                    _("Het interventieonderzoek (traject {})").format(
                         study.order,
                     ),
                     study.intervention,
@@ -124,23 +128,20 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
             else:
                 forms[intervention_key] = (
                     InterventionForm,
-                    reverse('interventions:create', args=[study.pk]),
-                    _('Het interventieonderzoek (traject {})').format(
+                    reverse("interventions:create", args=[study.pk]),
+                    _("Het interventieonderzoek (traject {})").format(
                         study.order,
                     ),
                     None,
                 )
 
         if study.has_observation:
-            observation_key = '{}_observation'.format(key_base)
-            if hasattr(study, '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(
+                    reverse("observations:update", args=[study.observation.pk]),
+                    _("Het observatieonderzoek (traject {})").format(
                         study.order,
                     ),
                     study.observation,
@@ -148,34 +149,34 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
             else:
                 forms[observation_key] = (
                     ObservationForm,
-                    reverse('observations:create', args=[study.pk]),
-                    _('Het observatieonderzoek (traject {})').format(
+                    reverse("observations:create", args=[study.pk]),
+                    _("Het observatieonderzoek (traject {})").format(
                         study.order,
                     ),
                     None,
                 )
 
         if study.has_sessions:
-            taskbased_key = '{}_task_start'.format(key_base)
+            taskbased_key = "{}_task_start".format(key_base)
             forms[taskbased_key] = (
                 SessionStartForm,
-                reverse('studies:session_start', args=[study.pk]),
-                _('Het takenonderzoek (traject {})').format(
+                reverse("studies:session_start", args=[study.pk]),
+                _("Het takenonderzoek (traject {})").format(
                     study.order,
                 ),
                 study,
             )
 
             for session in study.session_set.all():
-                session_start_key = '{}_session_{}_start'.format(
+                session_start_key = "{}_session_{}_start".format(
                     key_base,
                     session.pk,
                 )
 
                 forms[session_start_key] = (
                     TaskStartForm,
-                    reverse('tasks:start', args=[session.pk]),
-                    _('Het takenonderzoek: sessie {} (traject {})').format(
+                    reverse("tasks:start", args=[session.pk]),
+                    _("Het takenonderzoek: sessie {} (traject {})").format(
                         session.order,
                         study.order,
                     ),
@@ -183,7 +184,7 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
                 )
 
                 for task in session.task_set.all():
-                    task_key = '{}_session_{}_task_{}'.format(
+                    task_key = "{}_session_{}_task_{}".format(
                         key_base,
                         session.pk,
                         task.pk,
@@ -191,8 +192,8 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
 
                     forms[task_key] = (
                         TaskForm,
-                        reverse('tasks:update', args=[task.pk]),
-                        _('Het takenonderzoek: sessie {} taak {} (traject {})').format(
+                        reverse("tasks:update", args=[task.pk]),
+                        _("Het takenonderzoek: sessie {} taak {} (traject {})").format(
                             session.order,
                             task.order,
                             study.order,
@@ -200,7 +201,7 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
                         task,
                     )
 
-                session_end_key = '{}_session_{}_end'.format(
+                session_end_key = "{}_session_{}_end".format(
                     key_base,
                     session.pk,
                     session,
@@ -208,26 +209,25 @@ def _build_forms(proposal: Proposal) -> OrderedDict:
 
                 forms[session_end_key] = (
                     TaskEndForm,
-                    reverse('tasks:end', args=[session.pk]),
-                    _('Overzicht van takenonderzoek: sessie {} (traject {})')
-                    .format(
+                    reverse("tasks:end", args=[session.pk]),
+                    _("Overzicht van takenonderzoek: sessie {} (traject {})").format(
                         session.order,
                         study.order,
                     ),
                     session,
                 )
 
-    forms['translated'] = (
+    forms["translated"] = (
         TranslatedConsentForms,
-        reverse('proposals:translated', args=[proposal.pk]),
-        _('Vertaling informed consent formulieren'),
+        reverse("proposals:translated", args=[proposal.pk]),
+        _("Vertaling informed consent formulieren"),
         proposal,
     )
 
-    forms['data_management'] = (
+    forms["data_management"] = (
         ProposalDataManagementForm,
-        reverse('proposals:data_management', args=[proposal.pk]),
-        _('AVG en Data Management'),
+        reverse("proposals:data_management", args=[proposal.pk]),
+        _("AVG en Data Management"),
         proposal,
     )
 
@@ -243,37 +243,42 @@ def get_form_errors(proposal: Proposal) -> list:
         form_class, url, page_name, obj = form
         try:
             kwargs = {
-                'instance': obj,
+                "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
+                kwargs["user"] = proposal.created_by
 
             if issubclass(form_class, (StudyStartForm, StudyForm)):
-                kwargs['proposal'] = proposal
+                kwargs["proposal"] = proposal
 
-            if issubclass(form_class, (InterventionForm, ObservationForm, TaskStartForm)):
-                kwargs['study'] = obj.study
+            if issubclass(
+                form_class, (InterventionForm, ObservationForm, TaskStartForm)
+            ):
+                kwargs["study"] = obj.study
 
             instance = form_class(**kwargs)
 
             for field, error in instance.errors.items():
-
                 if field in instance.fields:
-                    troublesome_pages.append({
-                        'url':  url,
-                        'page_name': page_name,
-                    })
+                    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.
-            troublesome_pages.append({
-                'url':       url,
-                'page_name': page_name,
-            })
+            troublesome_pages.append(
+                {
+                    "url": url,
+                    "page_name": page_name,
+                }
+            )
 
     return troublesome_pages
diff --git a/proposals/validators.py b/proposals/validators.py
index e5005c43c..cb3e1f1ed 100644
--- a/proposals/validators.py
+++ b/proposals/validators.py
@@ -2,17 +2,13 @@
 from django.utils.translation import gettext as _
 
 
-
 class UniqueTitleValidator:
-
-
     proposal = None
 
-    def __init__(self, proposal = None):
+    def __init__(self, proposal=None):
         self.proposal = proposal
 
     def __call__(self, value):
-
         # Importing here to prevent circular import
         from .models import Proposal
 
@@ -22,5 +18,6 @@ def __call__(self, value):
             qs = qs.exclude(pk=self.proposal.pk)
 
         if qs.exists():
-            raise forms.ValidationError(_('Er bestaat al een aanvraag met deze '
-                                          'titel.'), code='unique')
+            raise forms.ValidationError(
+                _("Er bestaat al een aanvraag met deze " "titel."), code="unique"
+            )
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 5ed234b35..503a39fd8 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -2,8 +2,7 @@
 
 import datetime
 
-from braces.views import GroupRequiredMixin, LoginRequiredMixin, \
-    UserFormKwargsMixin
+from braces.views import GroupRequiredMixin, LoginRequiredMixin, UserFormKwargsMixin
 
 from django.conf import settings
 from django.db.models import Q
@@ -12,12 +11,19 @@
 from django.utils.translation import ugettext_lazy as _
 from django.views import generic
 from django.http import FileResponse
-#from easy_pdf.views import PDFTemplateResponseMixin, PDFTemplateView
+
+# from easy_pdf.views import PDFTemplateResponseMixin, PDFTemplateView
 from typing import Tuple, Union
 
 from main.utils import get_document_contents, get_secretary, is_secretary
-from main.views import AllowErrorsOnBackbuttonMixin, CreateView, DeleteView, \
-    HumanitiesRequiredMixin, UpdateView, UserAllowedMixin
+from main.views import (
+    AllowErrorsOnBackbuttonMixin,
+    CreateView,
+    DeleteView,
+    HumanitiesRequiredMixin,
+    UpdateView,
+    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
@@ -25,15 +31,26 @@
 from reviews.utils.review_utils import start_review, start_review_pre_assessment
 from studies.models import Documents
 from ..copy import copy_proposal
-from ..forms import ProposalConfirmationForm, ProposalCopyForm, \
-    ProposalDataManagementForm, ProposalForm, ProposalStartPracticeForm, \
-    ProposalSubmitForm, RevisionProposalCopyForm, AmendmentProposalCopyForm, \
-    ProposalUpdateDataManagementForm, ProposalUpdateDateStartForm, \
-    TranslatedConsentForms
+from ..forms import (
+    ProposalConfirmationForm,
+    ProposalCopyForm,
+    ProposalDataManagementForm,
+    ProposalForm,
+    ProposalStartPracticeForm,
+    ProposalSubmitForm,
+    RevisionProposalCopyForm,
+    AmendmentProposalCopyForm,
+    ProposalUpdateDataManagementForm,
+    ProposalUpdateDateStartForm,
+    TranslatedConsentForms,
+)
 from ..models import Proposal, Wmo
 from ..utils import generate_pdf, generate_ref_number
-from proposals.mixins import ProposalMixin, ProposalContextMixin, \
-    PDFTemplateResponseMixin
+from proposals.mixins import (
+    ProposalMixin,
+    ProposalContextMixin,
+    PDFTemplateResponseMixin,
+)
 from proposals.utils.proposal_utils import FilenameFactory
 
 
@@ -41,120 +58,131 @@
 # List views
 ############
 
+
 class BaseProposalsView(LoginRequiredMixin, generic.TemplateView):
-    title = _('Publiek archief')
-    body = _('Dit overzicht toont alle goedgekeurde aanvragen.')
+    title = _("Publiek archief")
+    body = _("Dit overzicht toont alle goedgekeurde aanvragen.")
     is_modifiable = False
     is_submitted = True
     contains_supervised = False
-    template_name = 'proposals/proposal_list.html'
+    template_name = "proposals/proposal_list.html"
 
     def get_context_data(self, **kwargs):
         context = super(BaseProposalsView, self).get_context_data(**kwargs)
-        context['title'] = self.title
-        context['body'] = self.body
-        context['modifiable'] = self.is_modifiable
-        context['submitted'] = self.is_submitted
-        context['supervised'] = self.contains_supervised
-        context['data_url'] = None
+        context["title"] = self.title
+        context["body"] = self.body
+        context["modifiable"] = self.is_modifiable
+        context["submitted"] = self.is_submitted
+        context["supervised"] = self.contains_supervised
+        context["data_url"] = None
 
         return context
 
 
 class MyProposalsView(BaseProposalsView):
-    title = _('Mijn aanvraag')
-    body = _('Dit overzicht toont al je aanvragen.')
+    title = _("Mijn aanvraag")
+    body = _("Dit overzicht toont al je aanvragen.")
     is_modifiable = True
     is_submitted = True
     contains_supervised = True
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:my_archive',)
+        context["data_url"] = reverse(
+            "proposals:api:my_archive",
+        )
         return context
 
 
 class MyConceptsView(BaseProposalsView):
-    title = _('Mijn conceptaanvragen')
-    body = _('Dit overzicht toont al je nog niet ingediende aanvragen.')
+    title = _("Mijn conceptaanvragen")
+    body = _("Dit overzicht toont al je nog niet ingediende aanvragen.")
     is_modifiable = True
     is_submitted = False
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:my_concepts',)
+        context["data_url"] = reverse(
+            "proposals:api:my_concepts",
+        )
         return context
 
 
 class MySubmittedView(BaseProposalsView):
-    title = _('Mijn ingediende aanvragen')
-    body = _('Dit overzicht toont al je ingediende aanvragen.')
+    title = _("Mijn ingediende aanvragen")
+    body = _("Dit overzicht toont al je ingediende aanvragen.")
     is_modifiable = False
     is_submitted = True
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:my_submitted',)
+        context["data_url"] = reverse(
+            "proposals:api:my_submitted",
+        )
         return context
 
 
 class MyCompletedView(BaseProposalsView):
-    title = _('Mijn afgehandelde aanvragen')
-    body = _('Dit overzicht toont al je beoordeelde aanvragen.')
+    title = _("Mijn afgehandelde aanvragen")
+    body = _("Dit overzicht toont al je beoordeelde aanvragen.")
     is_modifiable = False
     is_submitted = True
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:my_completed',)
+        context["data_url"] = reverse(
+            "proposals:api:my_completed",
+        )
         return context
 
 
 class MySupervisedView(BaseProposalsView):
-    title = _('Mijn aanvragen als eindverantwoordelijke')
+    title = _("Mijn aanvragen als eindverantwoordelijke")
     body = _(
-        'Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke '
-        'bent.')
+        "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke " "bent."
+    )
     is_modifiable = True
     is_submitted = True
     contains_supervised = True
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:my_supervised',)
+        context["data_url"] = reverse(
+            "proposals:api:my_supervised",
+        )
         return context
 
+
 class MyPracticeView(BaseProposalsView):
-    title = _('Mijn oefenaanvragen')
-    body = _('Dit overzicht toont alle oefenaanvragen waar je als student, \
-onderzoeker of eindverantwoordelijke bij betrokken bent.')
+    title = _("Mijn oefenaanvragen")
+    body = _(
+        "Dit overzicht toont alle oefenaanvragen waar je als student, \
+onderzoeker of eindverantwoordelijke bij betrokken bent."
+    )
     is_modifiable = True
     is_submitted = False
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:my_practice',)
+        context["data_url"] = reverse(
+            "proposals:api:my_practice",
+        )
         return context
 
 
 class ProposalUsersOnlyArchiveView(
-    HumanitiesRequiredMixin,
-    CommitteeMixin,
-    BaseProposalsView
+    HumanitiesRequiredMixin, CommitteeMixin, BaseProposalsView
 ):
-    template_name = 'proposals/proposal_private_archive.html'
+    template_name = "proposals/proposal_private_archive.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['data_url'] = reverse('proposals:api:archive', args=[self.committee])
+        context["data_url"] = reverse("proposals:api:archive", args=[self.committee])
         return context
 
     @property
     def title(self):
-        return "{} - {}".format(
-            _('Archief'),
-            self.committee_display_name
-        )
+        return "{} - {}".format(_("Archief"), self.committee_display_name)
 
 
 class ProposalsPublicArchiveView(generic.ListView):
@@ -165,19 +193,20 @@ def get_queryset(self):
         """Returns all the Proposals that have been decided positively upon"""
         return Proposal.objects.public_archive()
 
+
 class ProposalsExportView(GroupRequiredMixin, generic.ListView):
-    context_object_name = 'proposals'
+    context_object_name = "proposals"
     group_required = [
         settings.GROUP_SECRETARY,
         settings.GROUP_GENERAL_CHAMBER,
-        settings.GROUP_LINGUISTICS_CHAMBER
+        settings.GROUP_LINGUISTICS_CHAMBER,
     ]
-    template_name_suffix = '_export_list'
+    template_name_suffix = "_export_list"
 
     def get_queryset(self):
         """Returns all the Proposals that have been decided positively upon,
         or a single one if specified in the URL"""
-        pk = self.kwargs.get('pk')
+        pk = self.kwargs.get("pk")
 
         if pk is not None:
             return Proposal.objects.filter(pk=pk)
@@ -190,26 +219,27 @@ class ChangeArchiveStatusView(GroupRequiredMixin, generic.RedirectView):
     permanent = False
 
     def get_redirect_url(self, *args, **kwargs):
-        pk = kwargs.get('pk')
+        pk = kwargs.get("pk")
 
         proposal = Proposal.objects.get(pk=pk)
         proposal.in_archive = not proposal.in_archive
         proposal.save()
         committee = proposal.reviewing_committee.name
-        return reverse('proposals:archive', args=[committee])
+        return reverse("proposals:archive", args=[committee])
+
 
 ##########################
 # CRUD actions on Proposal
 ##########################
 
-class ProposalCreate(ProposalMixin, AllowErrorsOnBackbuttonMixin, CreateView):
 
+class ProposalCreate(ProposalMixin, AllowErrorsOnBackbuttonMixin, CreateView):
     # Note: template_name is auto-generated to proposal_form.html
 
     def get_initial(self):
         """Sets initial applicant to current User"""
         initial = super(ProposalCreate, self).get_initial()
-        initial['applicants'] = [self.request.user]
+        initial["applicants"] = [self.request.user]
         return initial
 
     def form_valid(self, form):
@@ -222,13 +252,14 @@ def form_valid(self, form):
     def get_context_data(self, **kwargs):
         """Adds 'create'/'no_back' to template context"""
         context = super(ProposalCreate, self).get_context_data(**kwargs)
-        context['create'] = True
-        context['no_back'] = True
+        context["create"] = True
+        context["no_back"] = True
         return context
 
 
-class ProposalUpdate(ProposalMixin, ProposalContextMixin, AllowErrorsOnBackbuttonMixin, UpdateView):
-
+class ProposalUpdate(
+    ProposalMixin, ProposalContextMixin, AllowErrorsOnBackbuttonMixin, UpdateView
+):
     def form_valid(self, form):
         """Sets created_by to current user and generates a reference number"""
         form.instance.reviewing_committee = form.instance.institution.reviewing_chamber
@@ -237,23 +268,23 @@ def form_valid(self, form):
     def get_context_data(self, **kwargs):
         """Adds 'create'/'no_back' to template context"""
         context = super(ProposalUpdate, self).get_context_data(**kwargs)
-        context['create'] = False
-        context['no_back'] = True
+        context["create"] = False
+        context["no_back"] = True
 
         return context
 
 
 class ProposalDelete(DeleteView):
     model = Proposal
-    success_message = _('Aanvraag verwijderd')
+    success_message = _("Aanvraag verwijderd")
 
     def get_success_url(self):
         """After deletion, return to the concepts overview"""
-        return reverse('proposals:my_concepts')
+        return reverse("proposals:my_concepts")
 
 
 class CompareDocumentsView(UsersOrGroupsAllowedMixin, generic.TemplateView):
-    template_name = 'proposals/compare_documents.html'
+    template_name = "proposals/compare_documents.html"
     group_required = [
         settings.GROUP_SECRETARY,
         settings.GROUP_GENERAL_CHAMBER,
@@ -261,16 +292,15 @@ class CompareDocumentsView(UsersOrGroupsAllowedMixin, generic.TemplateView):
     ]
 
     def get_allowed_users(self):
-
-        compare_type = self.kwargs.get('type')
-        new_pk = self.kwargs.get('new')
-        attribute = self.kwargs.get('attribute')
+        compare_type = self.kwargs.get("type")
+        new_pk = self.kwargs.get("new")
+        attribute = self.kwargs.get("attribute")
 
         model = {
-            'documents': Documents,
-            'wmo': Wmo,
-            'observation': Observation,
-            'proposal': Proposal,
+            "documents": Documents,
+            "wmo": Wmo,
+            "observation": Observation,
+            "proposal": Proposal,
         }.get(compare_type, None)
 
         if model == Proposal:
@@ -284,36 +314,31 @@ def get_allowed_users(self):
 
         return allowed_users
 
-
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
         self.old_file, self.new_file = self._get_files()
 
-        context['old_name'] = self.old_file.name
-        context['old_file'] = self.old_file
-        context['old_text'] = get_document_contents(self.old_file)
-        context['new_name'] = self.new_file.name
-        context['new_file'] = self.new_file
-        context['new_text'] = get_document_contents(self.new_file)
+        context["old_name"] = self.old_file.name
+        context["old_file"] = self.old_file
+        context["old_text"] = get_document_contents(self.old_file)
+        context["new_name"] = self.new_file.name
+        context["new_file"] = self.new_file
+        context["new_text"] = get_document_contents(self.new_file)
 
         return context
 
-
-    def _get_files(self) -> Tuple[
-        Union[None, FieldFile],
-        Union[None, FieldFile]
-    ]:
-        compare_type = self.kwargs.get('type')
-        old_pk = self.kwargs.get('old')
-        new_pk = self.kwargs.get('new')
-        attribute = self.kwargs.get('attribute')
+    def _get_files(self) -> Tuple[Union[None, FieldFile], Union[None, FieldFile]]:
+        compare_type = self.kwargs.get("type")
+        old_pk = self.kwargs.get("old")
+        new_pk = self.kwargs.get("new")
+        attribute = self.kwargs.get("attribute")
 
         model = {
-            'documents': Documents,
-            'wmo': Wmo,
-            'observation': Observation,
-            'proposal': Proposal,
+            "documents": Documents,
+            "wmo": Wmo,
+            "observation": Observation,
+            "proposal": Proposal,
         }.get(compare_type, None)
 
         if model is None:
@@ -329,92 +354,101 @@ def _get_files(self) -> Tuple[
 # Other actions on Proposal
 ###########################
 class ProposalStart(generic.TemplateView):
-    template_name = 'proposals/proposal_start.html'
+    template_name = "proposals/proposal_start.html"
 
     def get_context_data(self, **kwargs):
         """Adds secretary and link to regulations to template context"""
         context = super(ProposalStart, self).get_context_data(**kwargs)
-        context['secretary'] = get_secretary()
+        context["secretary"] = get_secretary()
         return context
-    
+
+
 class TranslatedConsentFormsView(UpdateView):
     model = Proposal
     form_class = TranslatedConsentForms
-    template_name = 'proposals/translated_consent_forms.html'
+    template_name = "proposals/translated_consent_forms.html"
 
     def get_next_url(self):
-        '''Go to the consent form upload page'''
-        return reverse('proposals:consent', args=(self.object.pk,))
+        """Go to the consent form upload page"""
+        return reverse("proposals:consent", 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("studies:design_end", args=(self.object.last_study().pk,))
 
 
 class ProposalDataManagement(UpdateView):
     model = Proposal
     form_class = ProposalDataManagementForm
-    template_name = 'proposals/proposal_data_management.html'
+    template_name = "proposals/proposal_data_management.html"
 
     def get_next_url(self):
         """Continue to the submission view"""
-        return reverse('proposals:submit', args=(self.object.pk,))
+        return reverse("proposals:submit", args=(self.object.pk,))
 
     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:consent", args=(self.object.pk,))
 
 
 class ProposalUpdateDataManagement(GroupRequiredMixin, generic.UpdateView):
     """
     Allows the secretary to change the Data Management Plan on the Proposal level
     """
+
     model = Proposal
-    template_name = 'proposals/proposal_update_attachments.html'
+    template_name = "proposals/proposal_update_attachments.html"
     form_class = ProposalUpdateDataManagementForm
     group_required = settings.GROUP_SECRETARY
 
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
-        return reverse('reviews:detail', args=[self.object.latest_review().pk])
-    
+        return reverse("reviews:detail", args=[self.object.latest_review().pk])
+
+
 class ProposalUpdateDateStart(GroupRequiredMixin, generic.UpdateView):
     """
     Allows the secretary to change the date_start on the Proposal level
     """
+
     model = Proposal
-    template_name = 'proposals/proposal_update_date_start.html'
+    template_name = "proposals/proposal_update_date_start.html"
     form_class = ProposalUpdateDateStartForm
     group_required = settings.GROUP_SECRETARY
 
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
-        return reverse('reviews:detail', args=[self.object.latest_review().pk])
+        return reverse("reviews:detail", args=[self.object.latest_review().pk])
+
 
-class ProposalSubmit(ProposalContextMixin, AllowErrorsOnBackbuttonMixin, UpdateView, ):
+class ProposalSubmit(
+    ProposalContextMixin,
+    AllowErrorsOnBackbuttonMixin,
+    UpdateView,
+):
     model = Proposal
     form_class = ProposalSubmitForm
-    template_name = 'proposals/proposal_submit.html'
-    success_message = _('Wijzigingen opgeslagen')
+    template_name = "proposals/proposal_submit.html"
+    success_message = _("Wijzigingen opgeslagen")
 
     def get_form_kwargs(self):
         """Sets the Proposal as a form kwarg"""
         kwargs = super(ProposalSubmit, self).get_form_kwargs()
-        kwargs['proposal'] = self.get_object()
+        kwargs["proposal"] = self.get_object()
 
         # Required for examining POST data
         # to check for js-redirect-submit
-        kwargs['request'] = self.request
+        kwargs["request"] = self.request
 
         return kwargs
 
     def get_context_data(self, **kwargs):
         context = super(ProposalSubmit, self).get_context_data(**kwargs)
 
-        context['troublesome_pages'] = get_form_errors(self.get_object())
-        context['pagenr'] = self._get_page_number()
-        context['is_supervisor_edit_phase'] = self.is_supervisor_edit_phase()
-        context['start_date_warning'] = self.check_start_date()
+        context["troublesome_pages"] = get_form_errors(self.get_object())
+        context["pagenr"] = self._get_page_number()
+        context["is_supervisor_edit_phase"] = self.is_supervisor_edit_phase()
+        context["start_date_warning"] = self.check_start_date()
 
         return context
 
@@ -454,17 +488,16 @@ def get_next_url(self):
         """After submission, go to the thank-you view. Unless a supervisor is
         editing the proposal during their review, in that case: go to their
         decide page"""
-        if self.is_supervisor_edit_phase() and \
-                self.current_user_is_supervisor():
+        if self.is_supervisor_edit_phase() and self.current_user_is_supervisor():
             review = self.object.latest_review()
             decision = review.decision_set.get(reviewer=self.request.user)
-            return reverse('reviews:decide', args=(decision.pk,))
+            return reverse("reviews:decide", args=(decision.pk,))
 
-        return reverse('proposals:submitted', args=(self.object.pk,))
+        return reverse("proposals:submitted", args=(self.object.pk,))
 
     def get_back_url(self):
         """Return to the data management view"""
-        return reverse('proposals:data_management', args=(self.object.pk,))
+        return reverse("proposals:data_management", args=(self.object.pk,))
 
     def _get_page_number(self):
         if self.object.is_pre_assessment:
@@ -478,26 +511,26 @@ def _get_page_number(self):
 
 class ProposalSubmitted(generic.DetailView):
     model = Proposal
-    template_name = 'proposals/proposal_submitted.html'
+    template_name = "proposals/proposal_submitted.html"
 
 
 class ProposalConfirmation(GroupRequiredMixin, generic.UpdateView):
     model = Proposal
-    template_name = 'proposals/proposal_confirmation.html'
+    template_name = "proposals/proposal_confirmation.html"
     form_class = ProposalConfirmationForm
     group_required = settings.GROUP_SECRETARY
 
     def get_success_url(self):
         """On confirmation, return to the Review archive"""
         committee = self.object.reviewing_committee.name
-        return reverse('reviews:my_archive', args=[committee])
+        return reverse("reviews:my_archive", args=[committee])
 
 
 class ProposalCopy(UserFormKwargsMixin, CreateView):
     model = Proposal
     form_class = ProposalCopyForm
-    success_message = _('Aanvraag gekopieerd')
-    template_name = 'proposals/proposal_copy.html'
+    success_message = _("Aanvraag gekopieerd")
+    template_name = "proposals/proposal_copy.html"
 
     def get_initial(self):
         """Sets initial value of is_revision to False. It's a hidden field,
@@ -505,14 +538,14 @@ def get_initial(self):
         behaviour for this class' subclasses
         """
         initial = super(ProposalCopy, self).get_initial()
-        initial['is_revision'] = False
+        initial["is_revision"] = False
         return initial
 
     def form_valid(self, form):
         """Create a copy of the selected Proposal"""
         form.instance = copy_proposal(
-            form.cleaned_data['parent'],
-            form.cleaned_data['is_revision'],
+            form.cleaned_data["parent"],
+            form.cleaned_data["is_revision"],
             self.request.user,
         )
         return super(ProposalCopy, self).form_valid(form)
@@ -520,8 +553,8 @@ def form_valid(self, form):
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['is_revision'] = False
-        context['is_amendment'] = False
+        context["is_revision"] = False
+        context["is_amendment"] = False
 
         return context
 
@@ -532,13 +565,13 @@ class ProposalCopyRevision(ProposalCopy):
     def get_initial(self):
         """Sets initial value of is_revision to True"""
         initial = super(ProposalCopyRevision, self).get_initial()
-        initial['is_revision'] = True
+        initial["is_revision"] = True
         return initial
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['is_revision'] = True
+        context["is_revision"] = True
 
         return context
 
@@ -549,26 +582,26 @@ class ProposalCopyAmendment(ProposalCopy):
     def get_initial(self):
         """Sets initial value of is_revision to True"""
         initial = super(ProposalCopyAmendment, self).get_initial()
-        initial['is_revision'] = True
+        initial["is_revision"] = True
         return initial
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['is_amendment'] = True
+        context["is_amendment"] = True
 
         return context
 
 
 class ProposalAsPdf(
-        LoginRequiredMixin,
-        generic.DetailView,
-        PDFTemplateResponseMixin,
+    LoginRequiredMixin,
+    generic.DetailView,
+    PDFTemplateResponseMixin,
 ):
     model = Proposal
     # The PDF mixin generates a filename with this factory
-    filename_factory = FilenameFactory('Proposal')
-    template_name = 'proposals/proposal_pdf.html'
+    filename_factory = FilenameFactory("Proposal")
+    template_name = "proposals/proposal_pdf.html"
 
     def get(self, request, *args, **kwargs):
         # First, check if we should use a pregenerated pdf, if we have one
@@ -598,9 +631,10 @@ def get_context_data(self, **kwargs):
 
         return context
 
+
 class ProposalDifference(LoginRequiredMixin, generic.DetailView):
     model = Proposal
-    template_name = 'proposals/proposal_diff.html'
+    template_name = "proposals/proposal_diff.html"
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -609,27 +643,28 @@ def get_context_data(self, **kwargs):
 
         return context
 
+
 ########################
 # Preliminary assessment
 ########################
 class ProposalStartPreAssessment(ProposalStart):
-    template_name = 'proposals/proposal_start_pre_assessment.html'
+    template_name = "proposals/proposal_start_pre_assessment.html"
 
 
 class PreAssessmentMixin(ProposalMixin):
     def get_form_kwargs(self):
         """Sets is_pre_assessment as a form kwarg"""
         kwargs = super(PreAssessmentMixin, self).get_form_kwargs()
-        kwargs['is_pre_assessment'] = True
+        kwargs["is_pre_assessment"] = True
         return kwargs
 
     def get_next_url(self):
         """If the Proposal has a Wmo model attached, go to update, else, go to create"""
         proposal = self.object
-        if hasattr(proposal, 'wmo'):
-            return reverse('proposals:wmo_update_pre', args=(proposal.pk,))
+        if hasattr(proposal, "wmo"):
+            return reverse("proposals:wmo_update_pre", args=(proposal.pk,))
         else:
-            return reverse('proposals:wmo_create_pre', args=(proposal.pk,))
+            return reverse("proposals:wmo_create_pre", args=(proposal.pk,))
 
 
 class ProposalCreatePreAssessment(PreAssessmentMixin, ProposalCreate):
@@ -644,42 +679,42 @@ class ProposalUpdatePreAssessment(PreAssessmentMixin, ProposalUpdate):
 
 
 class ProposalSubmitPreAssessment(ProposalSubmit):
-
     def get_next_url(self):
         """After submission, go to the thank-you view"""
-        return reverse('proposals:submitted_pre', args=(self.object.pk,))
+        return reverse("proposals:submitted_pre", args=(self.object.pk,))
 
     def get_back_url(self):
         """Return to the Wmo overview"""
-        return reverse('proposals:wmo_update_pre', args=(self.object.pk,))
+        return reverse("proposals:wmo_update_pre", args=(self.object.pk,))
 
 
 class ProposalSubmittedPreAssessment(ProposalSubmitted):
-    template_name = 'proposals/proposal_submitted.html'
+    template_name = "proposals/proposal_submitted.html"
 
 
 #############
 # Pre-Aproved
 #############
 
+
 class ProposalStartPreApproved(ProposalStart):
-    template_name = 'proposals/proposal_start_pre_approved.html'
+    template_name = "proposals/proposal_start_pre_approved.html"
 
 
 class PreApprovedMixin(ProposalMixin):
     def get_form_kwargs(self):
         """Sets is_pre_approved as a form kwarg"""
         kwargs = super(PreApprovedMixin, self).get_form_kwargs()
-        kwargs['is_pre_approved'] = True
+        kwargs["is_pre_approved"] = True
         return kwargs
 
     def get_next_url(self):
         proposal = self.object
-        return reverse('proposals:submit_pre_approved', args=(proposal.pk,))
+        return reverse("proposals:submit_pre_approved", args=(proposal.pk,))
 
 
 class ProposalCreatePreApproved(PreApprovedMixin, ProposalCreate):
-    template_name = 'proposals/proposal_form_pre_approved.html'
+    template_name = "proposals/proposal_form_pre_approved.html"
 
     def form_valid(self, form):
         """Sets is_pre_approved to True"""
@@ -692,60 +727,62 @@ class ProposalUpdatePreApproved(PreApprovedMixin, ProposalUpdate):
 
 
 class ProposalSubmitPreApproved(ProposalSubmit):
-
     def get_next_url(self):
         """After submission, go to the thank-you view"""
-        return reverse('proposals:submitted_pre_approved',
-                       args=(self.object.pk,))
+        return reverse("proposals:submitted_pre_approved", args=(self.object.pk,))
 
     def get_back_url(self):
         """Return to the update page"""
-        return reverse('proposals:update_pre_approved', args=(self.object.pk,))
+        return reverse("proposals:update_pre_approved", args=(self.object.pk,))
 
 
 class ProposalSubmittedPreApproved(ProposalSubmitted):
-    template_name = 'proposals/proposal_submitted.html'
+    template_name = "proposals/proposal_submitted.html"
 
 
 ##########
 # Practice
 ##########
 class ProposalStartPractice(generic.FormView):
-    template_name = 'proposals/proposal_start_practice.html'
+    template_name = "proposals/proposal_start_practice.html"
     form_class = ProposalStartPracticeForm
 
     def get_context_data(self, **kwargs):
         """Adds 'secretary', 'is_practice' and 'no_back' to template context"""
         context = super(ProposalStartPractice, self).get_context_data(**kwargs)
-        context['secretary'] = get_secretary()
-        context['is_practice'] = True
-        context['no_back'] = True
+        context["secretary"] = get_secretary()
+        context["is_practice"] = True
+        context["no_back"] = True
         return context
 
     def get_success_url(self):
         """Go to the creation for a practice Proposal"""
-        return reverse('proposals:create_practice',
-                       args=(self.request.POST['practice_reason'],))
+        return reverse(
+            "proposals:create_practice", args=(self.request.POST["practice_reason"],)
+        )
 
 
 class ProposalCreatePractice(ProposalCreate):
     def get_context_data(self, **kwargs):
         """Adds 'is_practice' to template context"""
         context = super(ProposalCreatePractice, self).get_context_data(**kwargs)
-        context['is_practice'] = True
+        context["is_practice"] = True
         return context
 
     def get_form_kwargs(self):
         """Sets in_course as a form kwarg"""
         kwargs = super(ProposalCreatePractice, self).get_form_kwargs()
-        kwargs['in_course'] = self.kwargs['reason'] == Proposal.PracticeReasons.COURSE
+        kwargs["in_course"] = self.kwargs["reason"] == Proposal.PracticeReasons.COURSE
         return kwargs
 
     def form_valid(self, form):
         """Sets in_course and is_exploration"""
-        form.instance.in_course = self.kwargs['reason'] == Proposal.PracticeReasons.COURSE
-        form.instance.is_exploration = self.kwargs[
-                                           'reason'] == Proposal.PracticeReasons.EXPLORATION
+        form.instance.in_course = (
+            self.kwargs["reason"] == Proposal.PracticeReasons.COURSE
+        )
+        form.instance.is_exploration = (
+            self.kwargs["reason"] == Proposal.PracticeReasons.EXPLORATION
+        )
         return super(ProposalCreatePractice, self).form_valid(form)
 
 
@@ -753,5 +790,5 @@ class ProposalUpdatePractice(ProposalUpdate):
     def get_form_kwargs(self):
         """Sets in_course as a form kwarg"""
         kwargs = super(ProposalUpdatePractice, self).get_form_kwargs()
-        kwargs['in_course'] = self.object.in_course
+        kwargs["in_course"] = self.object.in_course
         return kwargs
diff --git a/proposals/views/study_views.py b/proposals/views/study_views.py
index df8eb017e..cb53258a0 100644
--- a/proposals/views/study_views.py
+++ b/proposals/views/study_views.py
@@ -14,12 +14,12 @@
 class StudyStart(AllowErrorsOnBackbuttonMixin, UpdateView):
     model = Proposal
     form_class = StudyStartForm
-    template_name = 'proposals/study_start.html'
+    template_name = "proposals/study_start.html"
 
     def get_form_kwargs(self):
         """Sets the Proposal as a form kwarg"""
         kwargs = super(StudyStart, self).get_form_kwargs()
-        kwargs['proposal'] = self.object
+        kwargs["proposal"] = self.object
         return kwargs
 
     def form_valid(self, form):
@@ -33,7 +33,7 @@ def form_valid(self, form):
         for n in range(proposal.studies_number):
             order = n + 1
             s, _ = Study.objects.get_or_create(proposal=proposal, order=order)
-            s.name = self.request.POST.get('study_name_' + str(order))
+            s.name = self.request.POST.get("study_name_" + str(order))
             s.save()
 
         # Delete Studies
@@ -47,30 +47,32 @@ def form_valid(self, form):
     def get_next_url(self):
         """Continue to the first Study"""
         proposal = self.object
-        return reverse('studies:update', args=(proposal.first_study().pk,))
+        return reverse("studies:update", args=(proposal.first_study().pk,))
 
     def get_back_url(self):
         """Return to the Wmo overview"""
-        return reverse('proposals:wmo_update', args=(self.object.wmo.pk,))
+        return reverse("proposals:wmo_update", args=(self.object.wmo.pk,))
 
 
 class StudyConsent(AllowErrorsOnBackbuttonMixin, FormSetUpdateView):
     """
     Allows the applicant to add informed consent to their Studies
     """
-    success_message = _('Consent opgeslagen')
-    template_name = 'proposals/study_consent.html'
+
+    success_message = _("Consent opgeslagen")
+    template_name = "proposals/study_consent.html"
     form = StudyConsentForm
     extra = 10
-    
+
     def get(self, request, *args, **kwargs):
         """A bit of a hacky override to ensure only 2 extra document forms
         apart from the study document forms are presented"""
 
-        proposal = Proposal.objects.get(pk=self.kwargs.get('pk'))
+        proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
 
-        self.extra = (len(proposal.study_set.all()) + self.extra) - \
-            len(self.get_queryset().all())
+        self.extra = (len(proposal.study_set.all()) + self.extra) - len(
+            self.get_queryset().all()
+        )
 
         return super(StudyConsent, self).get(request, *args, **kwargs)
 
@@ -78,13 +80,13 @@ def get_context_data(self, *args, **kwargs):
         """Setting the progress on the context"""  # (??)
         context = super().get_context_data(*args, **kwargs)
         # The following is used by the progress bar
-        proposal = Proposal.objects.get(pk=self.kwargs.get('pk'))
-        context['proposal'] = proposal
+        proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
+        context["proposal"] = proposal
 
         initial = []
         for i in range(self.extra):
-            initial.append({'proposal': proposal.pk})
-        context['formset'].initial_extra = initial
+            initial.append({"proposal": proposal.pk})
+        context["formset"].initial_extra = initial
 
         # Tell the template if any studies need external forms
         studies = Study.objects.filter(proposal=proposal)
@@ -94,7 +96,7 @@ def get_context_data(self, *args, **kwargs):
         return context
 
     def get_queryset(self):
-        proposal = Proposal.objects.get(pk=self.kwargs.get('pk'))
+        proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
         documents = Documents.objects.filter(proposal=proposal)
 
         if len(documents) == 0:
@@ -105,16 +107,15 @@ 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,))
+        proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
+        return reverse("proposals:data_management", 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,))
+        proposal = Proposal.objects.get(pk=self.kwargs.get("pk"))
+        return reverse("proposals:translated", args=(proposal.pk,))
diff --git a/proposals/views/wmo_views.py b/proposals/views/wmo_views.py
index 33eea8dd4..15a049437 100644
--- a/proposals/views/wmo_views.py
+++ b/proposals/views/wmo_views.py
@@ -24,7 +24,7 @@ class WmoMixin(AllowErrorsOnBackbuttonMixin, object):
     def get_context_data(self, **kwargs):
         """Setting the Proposal on the context"""
         context = super(WmoMixin, self).get_context_data(**kwargs)
-        context['proposal'] = self.get_proposal()
+        context["proposal"] = self.get_proposal()
         return context
 
     def get_next_url(self):
@@ -34,14 +34,18 @@ def get_next_url(self):
         """
         wmo = self.object
         if wmo.status == Wmo.WMOStatuses.NO_WMO:
-            return reverse('proposals:study_start', args=(wmo.proposal.pk,))
+            return reverse("proposals:study_start", args=(wmo.proposal.pk,))
         else:
-            return reverse('proposals:wmo_application', args=(wmo.pk,))
+            return reverse("proposals:wmo_application", args=(wmo.pk,))
 
     def get_back_url(self):
         """Return to the Proposal overview, or practice overview if we are in practice mode"""
         proposal = self.get_proposal()
-        url = 'proposals:update_practice' if proposal.is_practice() else 'proposals:update'
+        url = (
+            "proposals:update_practice"
+            if proposal.is_practice()
+            else "proposals:update"
+        )
         return reverse(url, args=(proposal.pk,))
 
     def get_proposal(self):
@@ -49,7 +53,7 @@ def get_proposal(self):
 
 
 class WmoCreate(WmoMixin, CreateView):
-    success_message = _('WMO-gegevens opgeslagen')
+    success_message = _("WMO-gegevens opgeslagen")
 
     def form_valid(self, form):
         """Saves the Proposal on the WMO instance"""
@@ -58,11 +62,11 @@ def form_valid(self, form):
 
     def get_proposal(self):
         """Retrieves the Proposal from the pk kwarg"""
-        return Proposal.objects.get(pk=self.kwargs['pk'])
+        return Proposal.objects.get(pk=self.kwargs["pk"])
 
 
 class WmoUpdate(WmoMixin, UpdateView):
-    success_message = _('WMO-gegevens bewerkt')
+    success_message = _("WMO-gegevens bewerkt")
 
     def get_proposal(self):
         """Retrieves the Proposal from the form object"""
@@ -75,30 +79,30 @@ def get_proposal(self):
 class WmoApplication(UpdateView):
     model = Wmo
     form_class = WmoApplicationForm
-    template_name = 'proposals/wmo_application.html'
+    template_name = "proposals/wmo_application.html"
 
     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.object.proposal
         return context
 
     def get_next_url(self):
         """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,))
+            return reverse("proposals:wmo_application", args=(wmo.pk,))
         else:
-            return reverse('proposals:study_start', args=(wmo.proposal.pk,))
+            return reverse("proposals:study_start", args=(wmo.proposal.pk,))
 
     def get_back_url(self):
         """Return to the Wmo overview"""
-        return reverse('proposals:wmo_update', args=(self.object.pk,))
+        return reverse("proposals:wmo_update", args=(self.object.pk,))
 
 
 class WmoCheck(generic.FormView):
     form_class = WmoCheckForm
-    template_name = 'proposals/wmo_check.html'
+    template_name = "proposals/wmo_check.html"
 
 
 ########################
@@ -109,26 +113,27 @@ def get_next_url(self):
         """Different continue URL for pre-assessment Proposals"""
         wmo = self.object
         if wmo.status == Wmo.WMOStatuses.NO_WMO:
-            return reverse('proposals:submit_pre', args=(self.object.proposal.pk,))
+            return reverse("proposals:submit_pre", args=(self.object.proposal.pk,))
         else:
-            return reverse('proposals:wmo_application_pre', args=(wmo.pk,))
+            return reverse("proposals:wmo_application_pre", args=(wmo.pk,))
 
     def get_back_url(self):
         """Different return URL for pre-assessment Proposals"""
-        return reverse('proposals:update_pre', args=(self.object.proposal.pk,))
+        return reverse("proposals:update_pre", args=(self.object.proposal.pk,))
 
 
 class WmoCreatePreAssessment(PreAssessmentMixin, WmoCreate):
     pass
 
+
 class WmoUpdatePreAssessment(PreAssessmentMixin, WmoUpdate):
     pass
 
-class WmoApplicationPreAssessment(PreAssessmentMixin, WmoApplication):
 
+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,))
+        return reverse("proposals:submit_pre", args=(self.object.proposal.pk,))
 
 
 ################
@@ -139,27 +144,34 @@ def check_wmo(request):
     """
     This call checks which WMO message should be generated.
     """
-    is_metc = request.POST.get('metc') == YesNoDoubt.YES
-    is_medical = request.POST.get('medical') == YesNoDoubt.YES
+    is_metc = request.POST.get("metc") == YesNoDoubt.YES
+    is_medical = request.POST.get("medical") == YesNoDoubt.YES
 
-    doubt = request.POST.get('metc') == YesNoDoubt.DOUBT or request.POST.get('medical') == YesNoDoubt.DOUBT
+    doubt = (
+        request.POST.get("metc") == YesNoDoubt.DOUBT
+        or request.POST.get("medical") == YesNoDoubt.DOUBT
+    )
 
     # Default message: OK.
-    message = _('Je onderzoek hoeft niet te worden beoordeeld door de METC.')
-    message_class = 'info'
+    message = _("Je onderzoek hoeft niet te worden beoordeeld door de METC.")
+    message_class = "info"
     needs_metc = False
 
     # On doubt, contact secretary.
     if doubt:
         secretary = get_secretary()
-        message = _('Neem contact op met <a href="{link}">{secretary}</a> om de twijfels weg te nemen.').format(link='mailto:'+ secretary.email , secretary=secretary.get_full_name())
-        message_class = 'warning'
+        message = _(
+            'Neem contact op met <a href="{link}">{secretary}</a> om de twijfels weg te nemen.'
+        ).format(link="mailto:" + secretary.email, secretary=secretary.get_full_name())
+        message_class = "warning"
         needs_metc = True
     # Otherwise, METC review is necessary for METC studies (obviously) and
     # studies that have medical research questions or define user behavior
     elif is_metc or is_medical:
-        message = _('Je onderzoek zal moeten worden beoordeeld door de METC.')
-        message_class = 'warning'
+        message = _("Je onderzoek zal moeten worden beoordeeld door de METC.")
+        message_class = "warning"
         needs_metc = True
 
-    return JsonResponse({'needs_metc': needs_metc, 'message': message, 'message_class': message_class})
+    return JsonResponse(
+        {"needs_metc": needs_metc, "message": message, "message_class": message_class}
+    )
diff --git a/proposals/widgets.py b/proposals/widgets.py
index 4660d4af4..3c755d8aa 100644
--- a/proposals/widgets.py
+++ b/proposals/widgets.py
@@ -6,7 +6,6 @@
 except ImportError:
     # Define a dummy class if we can't import LDAPBackend for some reason
     class LDAPBackend(object):
-
         def populate_user(self, uid):
             pass
 
@@ -16,14 +15,14 @@ class SelectUser(forms.Select):
     Custom widget to allow a LDAP user to be entered through Select2.
     Used in combination with an ajax call to main:user_search
     """
+
     allow_multiple_selected = False
     ldap = LDAPBackend()
 
     def value_from_datadict(self, data, files, name):
-
         value = data.get(name, None)
 
-        if value and value.startswith('ldap_'):
+        if value and value.startswith("ldap_"):
             # Strip the ldap_ from the string
             uid = value[5:]
 
@@ -31,9 +30,12 @@ def value_from_datadict(self, data, files, name):
             user_object = self.ldap.populate_user(uid)
 
             # Add the user as a valid option
-            self.choices.append((user_object.pk,
-                                 u'{}: {}'.format(user_object.username,
-                                                  user_object.get_full_name())))
+            self.choices.append(
+                (
+                    user_object.pk,
+                    "{}: {}".format(user_object.username, user_object.get_full_name()),
+                )
+            )
 
             # Redefine the chosen option to the pk of the new user object
             value = str(user_object.pk)
@@ -46,6 +48,7 @@ class SelectMultipleUser(forms.Select):
     Custom widget to allow multiple LDAP users to be entered through Select2.
     Used in combination with an ajax call to main:user_search
     """
+
     allow_multiple_selected = True
     ldap = LDAPBackend()
 
@@ -58,7 +61,7 @@ def value_from_datadict(self, data, files, name):
 
         for i, user in enumerate(values):
             # if the user id starts with ldap_, we need to add that user to our local cache
-            if user.startswith('ldap_'):
+            if user.startswith("ldap_"):
                 # Strip the ldap_ from the string
                 uid = user[5:]
 
@@ -66,7 +69,14 @@ def value_from_datadict(self, data, files, name):
                 user_object = self.ldap.populate_user(uid)
 
                 # Add the user as a valid option
-                self.choices.append((user_object.pk, u'{}: {}'.format(user_object.username, user_object.get_full_name())))
+                self.choices.append(
+                    (
+                        user_object.pk,
+                        "{}: {}".format(
+                            user_object.username, user_object.get_full_name()
+                        ),
+                    )
+                )
 
                 # Redefine the chosen option to the pk of the new user object
                 values[i] = str(user_object.pk)
diff --git a/reviews/admin.py b/reviews/admin.py
index 4d11b0940..ca07ffd2c 100644
--- a/reviews/admin.py
+++ b/reviews/admin.py
@@ -5,8 +5,8 @@
 
 class DecisionInline(admin.StackedInline):
     model = Decision
-    fields = ('reviewer', 'go')
-    readonly_fields = ('reviewer', 'go')
+    fields = ("reviewer", "go")
+    readonly_fields = ("reviewer", "go")
     can_delete = False
     show_change_link = True
 
@@ -16,18 +16,19 @@ def has_add_permission(self, request, obj):
 
 @admin.register(Review)
 class ReviewAdmin(admin.ModelAdmin):
-    list_display = ('proposal', 'date_start', 'date_end', 'go')
-    list_filter = ('stage', 'continuation')
-    search_fields = ('proposal__title',)
+    list_display = ("proposal", "date_start", "date_end", "go")
+    list_filter = ("stage", "continuation")
+    search_fields = ("proposal__title",)
     inlines = (DecisionInline,)
 
 
 @admin.register(Decision)
 class DecisionAdmin(admin.ModelAdmin):
-    list_display = ('review', 'reviewer', 'go')
-    list_filter = ('go', )
+    list_display = ("review", "reviewer", "go")
+    list_filter = ("go",)
     search_fields = (
-        'reviewer__first_name',
-        'reviewer__last_name',
-        'reviewer__username',
-        'review__proposal__title')
+        "reviewer__first_name",
+        "reviewer__last_name",
+        "reviewer__username",
+        "review__proposal__title",
+    )
diff --git a/reviews/api/serializers.py b/reviews/api/serializers.py
index 8dc371672..3a5e10ec8 100644
--- a/reviews/api/serializers.py
+++ b/reviews/api/serializers.py
@@ -8,9 +8,19 @@
 class InlineReviewProposalSerializer(serializers.ModelSerializer):
     class Meta:
         model = Proposal
-        fields = ['pk', 'reference_number', 'title', 'is_revision',
-                  'date_confirmed', 'date_submitted', 'latest_review',
-                  'applicants', 'pdf', 'date_submitted_supervisor', 'in_archive']
+        fields = [
+            "pk",
+            "reference_number",
+            "title",
+            "is_revision",
+            "date_confirmed",
+            "date_submitted",
+            "latest_review",
+            "applicants",
+            "pdf",
+            "date_submitted_supervisor",
+            "in_archive",
+        ]
         read_only_fields = fields
 
     latest_review = serializers.SerializerMethodField()
@@ -41,9 +51,20 @@ def get_pdf(self, proposal):
 class ReviewProposalSerializer(InlineReviewProposalSerializer):
     class Meta:
         model = Proposal
-        fields = ['pk', 'reference_number', 'title', 'is_revision',
-                  'date_confirmed', 'date_submitted', 'parent', 'latest_review',
-                  'applicants', 'pdf', 'date_submitted_supervisor', 'in_archive']
+        fields = [
+            "pk",
+            "reference_number",
+            "title",
+            "is_revision",
+            "date_confirmed",
+            "date_submitted",
+            "parent",
+            "latest_review",
+            "applicants",
+            "pdf",
+            "date_submitted_supervisor",
+            "in_archive",
+        ]
         read_only_fields = fields
 
     parent = serializers.SerializerMethodField()
@@ -78,7 +99,7 @@ def get_pdf(self, proposal):
 class InlineDecisionSerializer(ModelDisplaySerializer):
     class Meta:
         model = Decision
-        fields = ['pk', 'go', 'date_decision', 'comments', 'reviewer']
+        fields = ["pk", "go", "date_decision", "comments", "reviewer"]
         read_only_fields = fields
 
     reviewer = serializers.SerializerMethodField()
@@ -90,12 +111,21 @@ def get_reviewer(self, decision):
 class InlineReviewSerializer(ModelDisplaySerializer):
     class Meta:
         model = Review
-        fields = ['pk', 'stage', 'route', 'go', 'continuation', 'date_start',
-                  'date_end', 'date_should_end', 'accountable_user',
-                  'current_reviewers']
+        fields = [
+            "pk",
+            "stage",
+            "route",
+            "go",
+            "continuation",
+            "date_start",
+            "date_end",
+            "date_should_end",
+            "accountable_user",
+            "current_reviewers",
+        ]
         read_only_fields = fields
 
-    route = serializers.CharField(source='get_route_display')
+    route = serializers.CharField(source="get_route_display")
     accountable_user = serializers.SerializerMethodField()
     current_reviewers = serializers.SerializerMethodField()
 
@@ -109,19 +139,26 @@ def get_current_reviewers(self, review):
 class ReviewSerializer(InlineReviewSerializer):
     class Meta:
         model = Review
-        fields = ['pk', 'stage', 'route', 'go', 'continuation', 'date_start',
-                  'date_end', 'date_should_end', 'accountable_user', 'decision',
-                  'proposal']
+        fields = [
+            "pk",
+            "stage",
+            "route",
+            "go",
+            "continuation",
+            "date_start",
+            "date_end",
+            "date_should_end",
+            "accountable_user",
+            "decision",
+            "proposal",
+        ]
         read_only_fields = fields
 
     decision = serializers.SerializerMethodField()
     proposal = serializers.SerializerMethodField()
 
     def get_decision(self, review):
-        return InlineDecisionSerializer(
-            review.decision_set.all(),
-            many=True
-        ).data
+        return InlineDecisionSerializer(review.decision_set.all(), many=True).data
 
     def get_proposal(self, review):
         return ReviewProposalSerializer(review.proposal).data
@@ -130,8 +167,15 @@ def get_proposal(self, review):
 class DecisionSerializer(InlineDecisionSerializer):
     class Meta:
         model = Decision
-        fields = ['pk', 'go', 'date_decision', 'comments', 'review', 'reviewer',
-                  'proposal']
+        fields = [
+            "pk",
+            "go",
+            "date_decision",
+            "comments",
+            "review",
+            "reviewer",
+            "proposal",
+        ]
         read_only_fields = fields
 
     review = serializers.SerializerMethodField()
@@ -142,4 +186,3 @@ def get_review(self, decision):
 
     def get_proposal(self, decision):
         return ReviewProposalSerializer(decision.review.proposal).data
-
diff --git a/reviews/api/urls.py b/reviews/api/urls.py
index 5bad56022..074cf5222 100644
--- a/reviews/api/urls.py
+++ b/reviews/api/urls.py
@@ -1,35 +1,37 @@
 from django.urls import path
 
-from .views import AllOpenReviewsApiView, MyDecisionsApiView, \
-    MyOpenDecisionsApiView, OpenDecisionsApiView, \
-    OpenSupervisorDecisionApiView, ToConcludeReviewApiView, AllReviewsApiView, \
-    InRevisionApiView    
+from .views import (
+    AllOpenReviewsApiView,
+    MyDecisionsApiView,
+    MyOpenDecisionsApiView,
+    OpenDecisionsApiView,
+    OpenSupervisorDecisionApiView,
+    ToConcludeReviewApiView,
+    AllReviewsApiView,
+    InRevisionApiView,
+)
 
-app_name = 'api'
+app_name = "api"
 
 urlpatterns = [
-    path('<str:committee>/decisions/',
-         MyDecisionsApiView.as_view(),
-         name='my_archive'),
-    path('<str:committee>/my_open/',
-         MyOpenDecisionsApiView.as_view(),
-         name='my_open'),
-    path('<str:committee>/open_decisions/',
-         OpenDecisionsApiView.as_view(),
-         name='open'),
-    path('<str:committee>/open_supervisors/',
-         OpenSupervisorDecisionApiView.as_view(),
-         name='open_supervisors'),
-    path('<str:committee>/in_revision/',
-         InRevisionApiView.as_view(),
-         name='in_revision'),
-    path('<str:committee>/open/',
-         AllOpenReviewsApiView.as_view(),
-         name='all_open'),
-    path('<str:committee>/to_conclude/',
-         ToConcludeReviewApiView.as_view(),
-         name='to_conclude'),
-    path('<str:committee>/archive/',
-         AllReviewsApiView.as_view(),
-         name='archive'),
+    path("<str:committee>/decisions/", MyDecisionsApiView.as_view(), name="my_archive"),
+    path("<str:committee>/my_open/", MyOpenDecisionsApiView.as_view(), name="my_open"),
+    path(
+        "<str:committee>/open_decisions/", OpenDecisionsApiView.as_view(), name="open"
+    ),
+    path(
+        "<str:committee>/open_supervisors/",
+        OpenSupervisorDecisionApiView.as_view(),
+        name="open_supervisors",
+    ),
+    path(
+        "<str:committee>/in_revision/", InRevisionApiView.as_view(), name="in_revision"
+    ),
+    path("<str:committee>/open/", AllOpenReviewsApiView.as_view(), name="all_open"),
+    path(
+        "<str:committee>/to_conclude/",
+        ToConcludeReviewApiView.as_view(),
+        name="to_conclude",
+    ),
+    path("<str:committee>/archive/", AllReviewsApiView.as_view(), name="archive"),
 ]
diff --git a/reviews/api/views.py b/reviews/api/views.py
index 48c2b8cde..242d3a5cb 100644
--- a/reviews/api/views.py
+++ b/reviews/api/views.py
@@ -17,7 +17,7 @@
 
 
 class BaseDecisionApiView(GroupRequiredMixin, CommitteeMixin, FancyListApiView):
-    authentication_classes = (SessionAuthentication, )
+    authentication_classes = (SessionAuthentication,)
     serializer_class = DecisionSerializer
     group_required = [
         settings.GROUP_SECRETARY,
@@ -28,59 +28,58 @@ class BaseDecisionApiView(GroupRequiredMixin, CommitteeMixin, FancyListApiView):
 
     filter_definitions = [
         FancyListApiView.FilterDefinition(
-            'review.get_stage_display',
+            "review.get_stage_display",
             _("Stadium"),
         ),
         FancyListApiView.FilterDefinition(
-            'review.route',
+            "review.route",
             _("Route"),
         ),
         FancyListApiView.FilterDefinition(
-            'proposal.is_revision',
+            "proposal.is_revision",
             _("Revisie"),
         ),
     ]
 
     sort_definitions = [
         FancyListApiView.SortDefinition(
-            label=_('Referentienummer'),
-            field='proposal.reference_number',
+            label=_("Referentienummer"),
+            field="proposal.reference_number",
         ),
         FancyListApiView.SortDefinition(
-            label=_('Datum ingediend'),
-            field='proposal.date_submitted',
+            label=_("Datum ingediend"),
+            field="proposal.date_submitted",
         ),
         FancyListApiView.SortDefinition(
-            label=_('Start datum'),
-            field='review.date_start',
+            label=_("Start datum"),
+            field="review.date_start",
         ),
     ]
-    default_sort = ('proposal.date_submitted', 'desc')
+    default_sort = ("proposal.date_submitted", "desc")
 
     def get_context(self):
         context = super().get_context()
 
-        context['is_secretary'] = is_secretary(self.request.user)
-        context['review'] = {
-            'ASSIGNMENT': Review.Stages.ASSIGNMENT,
-            'COMMISSION': Review.Stages.COMMISSION,
-            'CLOSING': Review.Stages.CLOSING,
-            'CLOSED': Review.Stages.CLOSED,
-            'GO': Review.Continuations.GO,
-            'GO_POST_HOC': Review.Continuations.GO_POST_HOC,
+        context["is_secretary"] = is_secretary(self.request.user)
+        context["review"] = {
+            "ASSIGNMENT": Review.Stages.ASSIGNMENT,
+            "COMMISSION": Review.Stages.COMMISSION,
+            "CLOSING": Review.Stages.CLOSING,
+            "CLOSED": Review.Stages.CLOSED,
+            "GO": Review.Continuations.GO,
+            "GO_POST_HOC": Review.Continuations.GO_POST_HOC,
         }
-        context['current_user_pk'] = self.request.user.pk
+        context["current_user_pk"] = self.request.user.pk
 
         return context
 
 
 class MyDecisionsApiView(BaseDecisionApiView):
-
     def get_default_sort(self) -> Tuple[str, str]:
         if is_secretary(self.request.user):
-            return 'review.date_start', "desc"
+            return "review.date_start", "desc"
 
-        return 'proposal.date_submitted', "desc"
+        return "proposal.date_submitted", "desc"
 
     def get_queryset(self):
         """Returns all open Decisions of the current User"""
@@ -128,8 +127,7 @@ def get_queryset_for_secretary(self):
 
             if proposal.pk not in dfse_cache:
                 dfse_cache[proposal.pk] = Decision.objects.filter(
-                    review__proposal=proposal,
-                    reviewer=self.request.user
+                    review__proposal=proposal, reviewer=self.request.user
                 ).exists()
 
             # If there is a decision for this user, but this decision isn't
@@ -149,12 +147,11 @@ def get_queryset_for_secretary(self):
 
 
 class MyOpenDecisionsApiView(BaseDecisionApiView):
-
     def get_default_sort(self) -> Tuple[str, str]:
         if is_secretary(self.request.user):
-            return 'review.date_start', "desc"
+            return "review.date_start", "desc"
 
-        return 'proposal.date_submitted', "desc"
+        return "proposal.date_submitted", "desc"
 
     def get_queryset(self):
         """Returns all open Decisions of the current User"""
@@ -164,14 +161,13 @@ def get_queryset(self):
 
         return self.get_queryset_for_committee()
 
-
     def get_queryset_for_committee(self):
         """Returns all open Decisions of the current User"""
         decisions = OrderedDict()
 
         objects = Decision.objects.filter(
             reviewer=self.request.user,
-            go='',
+            go="",
             review__proposal__reviewing_committee=self.committee,
             review__continuation__lt=Review.Continuations.DISCONTINUED,
         )
@@ -195,7 +191,7 @@ def get_queryset_for_secretary(self):
 
         objects = Decision.objects.filter(
             reviewer__groups__name=settings.GROUP_SECRETARY,
-            go='',
+            go="",
             review__proposal__reviewing_committee=self.committee,
             review__continuation__lt=Review.Continuations.DISCONTINUED,
         )
@@ -205,8 +201,7 @@ def get_queryset_for_secretary(self):
 
             if proposal.pk not in dfse_cache:
                 dfse_cache[proposal.pk] = Decision.objects.filter(
-                    review__proposal=proposal,
-                    reviewer=self.request.user
+                    review__proposal=proposal, reviewer=self.request.user
                 ).exists()
 
             # If there is a decision for this user, but this decision isn't
@@ -238,7 +233,7 @@ def get_queryset(self):
         dfse_cache = {}
 
         objects = Decision.objects.filter(
-            go='',
+            go="",
             review__proposal__reviewing_committee=self.committee,
             review__continuation__lt=Review.Continuations.DISCONTINUED,
         ).exclude(review__stage=Review.Stages.SUPERVISOR)
@@ -248,8 +243,7 @@ def get_queryset(self):
 
             if proposal.pk not in dfse_cache:
                 dfse_cache[proposal.pk] = Decision.objects.filter(
-                    review__proposal=proposal,
-                    reviewer=self.request.user
+                    review__proposal=proposal, reviewer=self.request.user
                 ).exists()
 
             # If there is a decision for this user, but this decision *is*
@@ -276,28 +270,27 @@ class OpenSupervisorDecisionApiView(BaseDecisionApiView):
 
     sort_definitions = [
         FancyListApiView.SortDefinition(
-            label=_('Referentienummer'),
-            field='proposal.reference_number',
+            label=_("Referentienummer"),
+            field="proposal.reference_number",
         ),
         FancyListApiView.SortDefinition(
-            label=_('Datum ingediend'),
-            field='proposal.date_submitted_supervisor',
+            label=_("Datum ingediend"),
+            field="proposal.date_submitted_supervisor",
         ),
         FancyListApiView.SortDefinition(
-            label=_('Start datum'),
-            field='review.date_start',
+            label=_("Start datum"),
+            field="review.date_start",
         ),
     ]
-    default_sort = ('proposal.date_submitted_supervisor', 'desc')
+    default_sort = ("proposal.date_submitted_supervisor", "desc")
 
     def get_queryset(self):
-        """Returns all proposals that still need to be reviewed by the secretary
-        """
+        """Returns all proposals that still need to be reviewed by the secretary"""
         objects = Decision.objects.filter(
-            go='',
+            go="",
             review__stage=Review.Stages.SUPERVISOR,
             review__proposal__status=Proposal.Statuses.SUBMITTED_TO_SUPERVISOR,
-            review__proposal__reviewing_committee=self.committee
+            review__proposal__reviewing_committee=self.committee,
         )
 
         decisions = OrderedDict()
@@ -314,59 +307,58 @@ def get_queryset(self):
 
 
 class BaseReviewApiView(GroupRequiredMixin, CommitteeMixin, FancyListApiView):
-    authentication_classes = (SessionAuthentication, )
+    authentication_classes = (SessionAuthentication,)
     serializer_class = ReviewSerializer
 
     filter_definitions = [
         FancyListApiView.FilterDefinition(
-            'get_stage_display',
+            "get_stage_display",
             _("Stadium"),
         ),
         FancyListApiView.FilterDefinition(
-            'route',
+            "route",
             _("Route"),
         ),
         FancyListApiView.FilterDefinition(
-            'proposal.is_revision',
+            "proposal.is_revision",
             _("Revisie"),
         ),
         FancyListApiView.FilterDefinition(
-            'get_continuation_display',
-            _('Afhandeling'),
+            "get_continuation_display",
+            _("Afhandeling"),
         ),
     ]
 
     sort_definitions = [
         FancyListApiView.SortDefinition(
-            label=_('Referentienummer'),
-            field='proposal.reference_number',
+            label=_("Referentienummer"),
+            field="proposal.reference_number",
         ),
         FancyListApiView.SortDefinition(
-            label=_('Datum ingediend'),
-            field='proposal.date_submitted',
+            label=_("Datum ingediend"),
+            field="proposal.date_submitted",
         ),
         FancyListApiView.SortDefinition(
-            label=_('Start datum'),
-            field='date_start',
+            label=_("Start datum"),
+            field="date_start",
         ),
     ]
-    default_sort = ('proposal.date_submitted', 'desc')
+    default_sort = ("proposal.date_submitted", "desc")
 
     def get_context(self):
         context = super().get_context()
 
-        context['is_secretary'] = is_secretary(self.request.user)
-        context['review'] = {
-            'ASSIGNMENT': Review.Stages.ASSIGNMENT,
-            'COMMISSION': Review.Stages.COMMISSION,
-            'CLOSING': Review.Stages.CLOSING,
-            'CLOSED': Review.Stages.CLOSED,
-            'GO': Review.Continuations.GO,
-            'GO_POST_HOC': Review.Continuations.GO_POST_HOC,
-            'REVISION': Review.Continuations.REVISION,
-
+        context["is_secretary"] = is_secretary(self.request.user)
+        context["review"] = {
+            "ASSIGNMENT": Review.Stages.ASSIGNMENT,
+            "COMMISSION": Review.Stages.COMMISSION,
+            "CLOSING": Review.Stages.CLOSING,
+            "CLOSED": Review.Stages.CLOSED,
+            "GO": Review.Continuations.GO,
+            "GO_POST_HOC": Review.Continuations.GO_POST_HOC,
+            "REVISION": Review.Continuations.REVISION,
         }
-        context['current_user_pk'] = self.request.user.pk
+        context["current_user_pk"] = self.request.user.pk
 
         return context
 
@@ -380,26 +372,31 @@ class ToConcludeReviewApiView(BaseReviewApiView):
     def get_queryset(self):
         """Returns all open Committee Decisions of all Users"""
         reviews = {}
-        objects = Review.objects.filter(
-            stage__gte=Review.Stages.CLOSING,
-            proposal__status__gte=Proposal.Statuses.SUBMITTED,
-            proposal__date_confirmed=None,
-            proposal__reviewing_committee=self.committee,
-        ).filter(
-            Q(continuation=Review.Continuations.GO) |
-            Q(continuation=Review.Continuations.GO_POST_HOC) |
-            Q(continuation=None)
-        ).select_related(
-            'proposal',
-            "proposal__parent",
-            'proposal__created_by',
-            'proposal__supervisor',
-            'proposal__relation',
-        ).prefetch_related(
-            'proposal__review_set',
-            'proposal__applicants',
-            'decision_set',
-            'decision_set__reviewer'
+        objects = (
+            Review.objects.filter(
+                stage__gte=Review.Stages.CLOSING,
+                proposal__status__gte=Proposal.Statuses.SUBMITTED,
+                proposal__date_confirmed=None,
+                proposal__reviewing_committee=self.committee,
+            )
+            .filter(
+                Q(continuation=Review.Continuations.GO)
+                | Q(continuation=Review.Continuations.GO_POST_HOC)
+                | Q(continuation=None)
+            )
+            .select_related(
+                "proposal",
+                "proposal__parent",
+                "proposal__created_by",
+                "proposal__supervisor",
+                "proposal__relation",
+            )
+            .prefetch_related(
+                "proposal__review_set",
+                "proposal__applicants",
+                "decision_set",
+                "decision_set__reviewer",
+            )
         )
 
         for obj in objects:
@@ -417,7 +414,7 @@ class InRevisionApiView(BaseReviewApiView):
     """Return reviews for proposals which have been sent back for revision,
     but for which a revision has not yet been submitted"""
 
-    default_sort = ('date_start', 'desc')
+    default_sort = ("date_start", "desc")
     group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
     def get_queryset(self):
@@ -425,7 +422,7 @@ def get_queryset(self):
         # A revision not having a review means
         # that the review of its parent is "in revision"
         revision_reviews = Review.objects.filter(
-            proposal__is_revision=True,    # Not a copy
+            proposal__is_revision=True,  # Not a copy
             stage__gte=Review.Stages.ASSIGNMENT,  # Not a supervisor review
         )
         # 2. Get candidate reviews:
@@ -439,26 +436,27 @@ def get_queryset(self):
         # 3. Finally, exclude candidates whose proposal
         # has a child with a revision review
         in_revision = candidates.exclude(
-            Exists(revision_reviews.filter(
-                # OuterRef refers to the candidate being evaluated
-                proposal__parent__pk=OuterRef("proposal__pk")
+            Exists(
+                revision_reviews.filter(
+                    # OuterRef refers to the candidate being evaluated
+                    proposal__parent__pk=OuterRef("proposal__pk")
                 )
             )
         )
         return in_revision
-        
+
 
 class AllOpenReviewsApiView(BaseReviewApiView):
-    default_sort = ('date_start', 'desc')
+    default_sort = ("date_start", "desc")
 
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
         group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
-        if self.committee.name == 'AK':
+        if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
-        if self.committee.name == 'LK':
+        if self.committee.name == "LK":
             group_required += [settings.GROUP_LINGUISTICS_CHAMBER]
 
         return group_required
@@ -466,22 +464,26 @@ def get_group_required(self):
     def get_queryset(self):
         """Returns all open Reviews"""
         reviews = OrderedDict()
-        objects = Review.objects.filter(
-            stage__gte=Review.Stages.ASSIGNMENT,
-            stage__lte=Review.Stages.CLOSING,
-            proposal__status__gte=Proposal.Statuses.SUBMITTED,
-            proposal__reviewing_committee=self.committee,
-        ).select_related(
-            'proposal',
-            "proposal__parent",
-            'proposal__created_by',
-            'proposal__supervisor',
-            'proposal__relation',
-        ).prefetch_related(
-            'proposal__review_set',
-            'proposal__applicants',
-            'decision_set',
-            'decision_set__reviewer'
+        objects = (
+            Review.objects.filter(
+                stage__gte=Review.Stages.ASSIGNMENT,
+                stage__lte=Review.Stages.CLOSING,
+                proposal__status__gte=Proposal.Statuses.SUBMITTED,
+                proposal__reviewing_committee=self.committee,
+            )
+            .select_related(
+                "proposal",
+                "proposal__parent",
+                "proposal__created_by",
+                "proposal__supervisor",
+                "proposal__relation",
+            )
+            .prefetch_related(
+                "proposal__review_set",
+                "proposal__applicants",
+                "decision_set",
+                "decision_set__reviewer",
+            )
         )
 
         for obj in objects:
@@ -496,16 +498,16 @@ def get_queryset(self):
 
 
 class AllReviewsApiView(BaseReviewApiView):
-    default_sort = ('date_start', 'desc')
+    default_sort = ("date_start", "desc")
 
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
         group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
 
-        if self.committee.name == 'AK':
+        if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
-        if self.committee.name == 'LK':
+        if self.committee.name == "LK":
             group_required += [settings.GROUP_LINGUISTICS_CHAMBER]
 
         return group_required
@@ -513,21 +515,25 @@ def get_group_required(self):
     def get_queryset(self):
         """Returns all open Committee Decisions of all Users"""
         reviews = OrderedDict()
-        objects = Review.objects.filter(
-            stage__gte=Review.Stages.ASSIGNMENT,
-            proposal__status__gte=Proposal.Statuses.SUBMITTED,
-            proposal__reviewing_committee=self.committee,
-        ).select_related(
-            'proposal',
-            "proposal__parent",
-            'proposal__created_by',
-            'proposal__supervisor',
-            'proposal__relation',
-        ).prefetch_related(
-            'proposal__review_set',
-            'proposal__applicants',
-            'decision_set',
-            'decision_set__reviewer'
+        objects = (
+            Review.objects.filter(
+                stage__gte=Review.Stages.ASSIGNMENT,
+                proposal__status__gte=Proposal.Statuses.SUBMITTED,
+                proposal__reviewing_committee=self.committee,
+            )
+            .select_related(
+                "proposal",
+                "proposal__parent",
+                "proposal__created_by",
+                "proposal__supervisor",
+                "proposal__relation",
+            )
+            .prefetch_related(
+                "proposal__review_set",
+                "proposal__applicants",
+                "decision_set",
+                "decision_set__reviewer",
+            )
         )
 
         for obj in objects:
diff --git a/reviews/forms.py b/reviews/forms.py
index 923c31c47..50aad9951 100644
--- a/reviews/forms.py
+++ b/reviews/forms.py
@@ -18,10 +18,11 @@
     (None, _("Direct terug naar aanvrager (Nog niet in behandeling)")),
 ]
 
+
 class ChangeChamberForm(forms.ModelForm):
     class Meta:
         model = Proposal
-        fields = ['reviewing_committee']
+        fields = ["reviewing_committee"]
 
     def __init__(self, *args, **kwargs):
         super(ChangeChamberForm, self).__init__(*args, **kwargs)
@@ -29,18 +30,18 @@ def __init__(self, *args, **kwargs):
         general_chamber = Group.objects.get(name=settings.GROUP_GENERAL_CHAMBER)
         linguistics_chamber = Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
 
-        self.fields['reviewing_committee'].choices = (
-            (general_chamber.pk, _('Algemene Kamer')),
-            (linguistics_chamber.pk, _('Linguïstiek Kamer')),
+        self.fields["reviewing_committee"].choices = (
+            (general_chamber.pk, _("Algemene Kamer")),
+            (linguistics_chamber.pk, _("Linguïstiek Kamer")),
         )
 
 
 class ReviewAssignForm(ConditionalModelForm):
     class Meta:
         model = Review
-        fields = ['short_route']
+        fields = ["short_route"]
         widgets = {
-            'short_route': forms.RadioSelect(choices=SHORT_LONG_REVISE),
+            "short_route": forms.RadioSelect(choices=SHORT_LONG_REVISE),
         }
 
     def __init__(self, *args, **kwargs):
@@ -56,27 +57,30 @@ def __init__(self, *args, **kwargs):
             [
                 settings.GROUP_GENERAL_CHAMBER,
                 settings.GROUP_LINGUISTICS_CHAMBER,
-                settings.GROUP_SECRETARY
+                settings.GROUP_SECRETARY,
             ]
         )
 
-        self.fields['reviewers'] = forms.ModelMultipleChoiceField(
+        self.fields["reviewers"] = forms.ModelMultipleChoiceField(
             initial=self.instance.current_reviewers(),
             queryset=reviewers,
-            widget=forms.SelectMultiple(attrs={'data-placeholder': _('Selecteer de commissieleden')}),
-            required=False
+            widget=forms.SelectMultiple(
+                attrs={"data-placeholder": _("Selecteer de commissieleden")}
+            ),
+            required=False,
         )
 
     def clean_reviewers(self):
-        reviewers = self.cleaned_data['reviewers']
+        reviewers = self.cleaned_data["reviewers"]
 
         if len(reviewers) == 0:
             raise ValidationError(
-                _('Er moet tenminste één beoordelaar geselecteerd worden.'),
-                code='no_reviewer')
+                _("Er moet tenminste één beoordelaar geselecteerd worden."),
+                code="no_reviewer",
+            )
 
         # See PR #188 if a secretary should be added to every review
-        return self.cleaned_data['reviewers']
+        return self.cleaned_data["reviewers"]
 
 
 class ReviewCloseForm(forms.ModelForm):
@@ -87,13 +91,13 @@ class ReviewCloseForm(forms.ModelForm):
     class Meta:
         model = Review
         fields = [
-            'continuation',
-            'has_minor_revision',
-            'minor_revision_description',
-            'in_archive',
+            "continuation",
+            "has_minor_revision",
+            "minor_revision_description",
+            "in_archive",
         ]
         widgets = {
-            'continuation': forms.RadioSelect(),
+            "continuation": forms.RadioSelect(),
         }
 
     def __init__(self, *args, **kwargs):
@@ -101,31 +105,38 @@ def __init__(self, *args, **kwargs):
         - Remove long route option if this was already the long route.
         - Set the label for in_archive
         """
-        allow_long_route_continuation = kwargs.pop('allow_long_route_continuation', False)
+        allow_long_route_continuation = kwargs.pop(
+            "allow_long_route_continuation", False
+        )
         super(ReviewCloseForm, self).__init__(*args, **kwargs)
         if not allow_long_route_continuation:
-            self.fields['continuation'].choices = [x for x in Review.Continuations.choices 
-                                                   if x[0] != Review.Continuations.LONG_ROUTE]
+            self.fields["continuation"].choices = [
+                x
+                for x in Review.Continuations.choices
+                if x[0] != Review.Continuations.LONG_ROUTE
+            ]
 
-        self.fields['in_archive'].label = _('Voeg deze aanvraag toe aan het archief')
-        self.fields['in_archive'].widget = forms.RadioSelect(choices=YES_NO)
+        self.fields["in_archive"].label = _("Voeg deze aanvraag toe aan het archief")
+        self.fields["in_archive"].widget = forms.RadioSelect(choices=YES_NO)
 
-        self.fields['has_minor_revision'].label = _('Is er een revisie geweest na het indienen van deze aanvraag?')
-        self.fields['has_minor_revision'].widget = forms.RadioSelect(choices=YES_NO)
+        self.fields["has_minor_revision"].label = _(
+            "Is er een revisie geweest na het indienen van deze aanvraag?"
+        )
+        self.fields["has_minor_revision"].widget = forms.RadioSelect(choices=YES_NO)
 
-        self.fields['minor_revision_description'].label = _('Opmerkingen over revisie')
-        self.fields['minor_revision_description'].widget = forms.Textarea()
+        self.fields["minor_revision_description"].label = _("Opmerkingen over revisie")
+        self.fields["minor_revision_description"].widget = forms.Textarea()
 
 
 class ReviewDiscontinueForm(forms.ModelForm):
-
-    confirm_discontinue = forms.BooleanField(initial=False, required=True,
-                                          label=_('Bevestig beëindiging'))
+    confirm_discontinue = forms.BooleanField(
+        initial=False, required=True, label=_("Bevestig beëindiging")
+    )
 
     class Meta:
         model = Review
         fields = [
-            'confirm_discontinue',
+            "confirm_discontinue",
         ]
 
     def __init__(self, *args, **kwargs):
@@ -139,20 +150,19 @@ def __init__(self, *args, **kwargs):
 class DecisionForm(forms.ModelForm):
     class Meta:
         model = Decision
-        fields = ['go', 'comments']
+        fields = ["go", "comments"]
         widgets = {
-            'go': forms.RadioSelect(),
+            "go": forms.RadioSelect(),
         }
 
     def __init__(self, *args, **kwargs):
         """Removes the empty label for the go field, and sets it as required"""
         super(DecisionForm, self).__init__(*args, **kwargs)
-        self.fields['go'].empty_label = None
-        self.fields['go'].choices = Decision.Approval.choices
-        self.fields['go'].required = True
+        self.fields["go"].empty_label = None
+        self.fields["go"].choices = Decision.Approval.choices
+        self.fields["go"].required = True
 
-class StartEndDateForm(forms.Form):
-    
-    start_date = DateField(label=_('Start datum periode:'))
-    end_date = DateField(label=_('Eind datum periode:'))
 
+class StartEndDateForm(forms.Form):
+    start_date = DateField(label=_("Start datum periode:"))
+    end_date = DateField(label=_("Eind datum periode:"))
diff --git a/reviews/management/commands/send_reminders.py b/reviews/management/commands/send_reminders.py
index eafefa46d..3c24de4f3 100644
--- a/reviews/management/commands/send_reminders.py
+++ b/reviews/management/commands/send_reminders.py
@@ -4,7 +4,7 @@
 
 
 class Command(BaseCommand):
-    help = 'Sends reminders to reviewers for short route reviews that needs to be decided in the next 2 days'
+    help = "Sends reminders to reviewers for short route reviews that needs to be decided in the next 2 days"
 
     def handle(self, *args, **options):
         remind_reviewers()
diff --git a/reviews/menus.py b/reviews/menus.py
index c6d4983ff..5a224020d 100644
--- a/reviews/menus.py
+++ b/reviews/menus.py
@@ -4,8 +4,12 @@
 from django.utils.translation import gettext_lazy as _
 from menu import Menu, MenuItem
 
-from main.templatetags.fetc_filters import in_general_chamber, \
-    in_linguistics_chamber, is_secretary, is_chair_or_secretary
+from main.templatetags.fetc_filters import (
+    in_general_chamber,
+    in_linguistics_chamber,
+    is_secretary,
+    is_chair_or_secretary,
+)
 
 
 def create_committee_menu(commitee: str) -> List[MenuItem]:
@@ -56,16 +60,22 @@ def create_committee_menu(commitee: str) -> List[MenuItem]:
     ]
 
 
-Menu.add_item("main", MenuItem(
-    _("Algemene Kamer"),
-    "#",
-    children=create_committee_menu('AK'),
-    check=lambda x: in_general_chamber(x.user)
-))
+Menu.add_item(
+    "main",
+    MenuItem(
+        _("Algemene Kamer"),
+        "#",
+        children=create_committee_menu("AK"),
+        check=lambda x: in_general_chamber(x.user),
+    ),
+)
 
-Menu.add_item("main", MenuItem(
-    _("Linguïstiek Kamer"),
-    "#",
-    children=create_committee_menu('LK'),
-    check=lambda x: in_linguistics_chamber(x.user)
-))
+Menu.add_item(
+    "main",
+    MenuItem(
+        _("Linguïstiek Kamer"),
+        "#",
+        children=create_committee_menu("LK"),
+        check=lambda x: in_linguistics_chamber(x.user),
+    ),
+)
diff --git a/reviews/migrations/0001_initial.py b/reviews/migrations/0001_initial.py
index cd76d6973..db9b5e74e 100644
--- a/reviews/migrations/0001_initial.py
+++ b/reviews/migrations/0001_initial.py
@@ -6,47 +6,107 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0001_initial'),
+        ("proposals", "0001_initial"),
         migrations.swappable_dependency(settings.AUTH_USER_MODEL),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Decision',
+            name="Decision",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('go', models.NullBooleanField(default=None, verbose_name='Beslissing')),
-                ('date_decision', models.DateTimeField(null=True, blank=True)),
-                ('comments', models.TextField(verbose_name='Ruimte voor eventuele opmerkingen', blank=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                (
+                    "go",
+                    models.NullBooleanField(default=None, verbose_name="Beslissing"),
+                ),
+                ("date_decision", models.DateTimeField(null=True, blank=True)),
+                (
+                    "comments",
+                    models.TextField(
+                        verbose_name="Ruimte voor eventuele opmerkingen", blank=True
+                    ),
+                ),
             ],
         ),
         migrations.CreateModel(
-            name='Review',
+            name="Review",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('stage', models.PositiveIntegerField(default=0, choices=[(0, 'Beoordeling door eindverantwoordelijke'), (1, 'Aanstelling commissieleden'), (2, 'Beoordeling door commissie'), (3, 'Afsluiting door secretaris'), (4, 'Afgesloten')])),
-                ('short_route', models.BooleanField(default=True, verbose_name='Route')),
-                ('go', models.NullBooleanField(default=None, verbose_name='Beslissing')),
-                ('continuation', models.PositiveIntegerField(default=0, verbose_name='Afhandeling', choices=[(0, 'Goedkeuring door ETCL'), (1, 'Afwijzing door ETCL'), (2, 'Open review met lange (4-weken) route'), (3, 'Laat opnieuw beoordelen door METC')])),
-                ('date_start', models.DateTimeField()),
-                ('date_end', models.DateTimeField(null=True, blank=True)),
-                ('proposal', models.ForeignKey(to='proposals.Proposal', on_delete=models.CASCADE)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                (
+                    "stage",
+                    models.PositiveIntegerField(
+                        default=0,
+                        choices=[
+                            (0, "Beoordeling door eindverantwoordelijke"),
+                            (1, "Aanstelling commissieleden"),
+                            (2, "Beoordeling door commissie"),
+                            (3, "Afsluiting door secretaris"),
+                            (4, "Afgesloten"),
+                        ],
+                    ),
+                ),
+                (
+                    "short_route",
+                    models.BooleanField(default=True, verbose_name="Route"),
+                ),
+                (
+                    "go",
+                    models.NullBooleanField(default=None, verbose_name="Beslissing"),
+                ),
+                (
+                    "continuation",
+                    models.PositiveIntegerField(
+                        default=0,
+                        verbose_name="Afhandeling",
+                        choices=[
+                            (0, "Goedkeuring door ETCL"),
+                            (1, "Afwijzing door ETCL"),
+                            (2, "Open review met lange (4-weken) route"),
+                            (3, "Laat opnieuw beoordelen door METC"),
+                        ],
+                    ),
+                ),
+                ("date_start", models.DateTimeField()),
+                ("date_end", models.DateTimeField(null=True, blank=True)),
+                (
+                    "proposal",
+                    models.ForeignKey(
+                        to="proposals.Proposal", on_delete=models.CASCADE
+                    ),
+                ),
             ],
         ),
         migrations.AddField(
-            model_name='decision',
-            name='review',
-            field=models.ForeignKey(to='reviews.Review', on_delete=models.CASCADE),
+            model_name="decision",
+            name="review",
+            field=models.ForeignKey(to="reviews.Review", on_delete=models.CASCADE),
         ),
         migrations.AddField(
-            model_name='decision',
-            name='reviewer',
-            field=models.ForeignKey(to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
+            model_name="decision",
+            name="reviewer",
+            field=models.ForeignKey(
+                to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE
+            ),
         ),
         migrations.AlterUniqueTogether(
-            name='decision',
-            unique_together=set([('review', 'reviewer')]),
+            name="decision",
+            unique_together=set([("review", "reviewer")]),
         ),
     ]
diff --git a/reviews/migrations/0002_auto_20160927_2106.py b/reviews/migrations/0002_auto_20160927_2106.py
index 9f1dd083b..6e944927e 100644
--- a/reviews/migrations/0002_auto_20160927_2106.py
+++ b/reviews/migrations/0002_auto_20160927_2106.py
@@ -5,15 +5,24 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0001_initial'),
+        ("reviews", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='continuation',
-            field=models.PositiveIntegerField(default=0, verbose_name='Afhandeling', choices=[(0, 'Goedkeuring door ETCL'), (1, 'Revisie noodzakelijk'), (2, 'Afwijzing door ETCL'), (3, 'Open review met lange (4-weken) route'), (4, 'Laat opnieuw beoordelen door METC')]),
+            model_name="review",
+            name="continuation",
+            field=models.PositiveIntegerField(
+                default=0,
+                verbose_name="Afhandeling",
+                choices=[
+                    (0, "Goedkeuring door ETCL"),
+                    (1, "Revisie noodzakelijk"),
+                    (2, "Afwijzing door ETCL"),
+                    (3, "Open review met lange (4-weken) route"),
+                    (4, "Laat opnieuw beoordelen door METC"),
+                ],
+            ),
         ),
     ]
diff --git a/reviews/migrations/0003_decision_go_char.py b/reviews/migrations/0003_decision_go_char.py
index 7df471ad0..f2024fb83 100644
--- a/reviews/migrations/0003_decision_go_char.py
+++ b/reviews/migrations/0003_decision_go_char.py
@@ -7,12 +7,12 @@
 
 
 def forwards(apps, schema_editor):
-    if not schema_editor.connection.alias == 'default':
+    if not schema_editor.connection.alias == "default":
         return
 
-    for decision in apps.get_model('reviews', 'decision').objects.all():
+    for decision in apps.get_model("reviews", "decision").objects.all():
         if decision.go is None:
-            decision.go_char = ''
+            decision.go_char = ""
         elif decision.go:
             decision.go_char = Decision.Approval.APPROVED
         else:
@@ -22,10 +22,10 @@ def forwards(apps, schema_editor):
 
 
 def backwards(apps, schema_editor):
-    if not schema_editor.connection.alias == 'default':
+    if not schema_editor.connection.alias == "default":
         return
 
-    for decision in apps.get_model('reviews', 'decision').objects.all():
+    for decision in apps.get_model("reviews", "decision").objects.all():
         if decision.go_char == Decision.Approval.APPROVED:
             decision.go = True
         elif decision.go_char == Decision.Approval.NOT_APPROVED:
@@ -37,25 +37,33 @@ def backwards(apps, schema_editor):
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0002_auto_20160927_2106'),
+        ("reviews", "0002_auto_20160927_2106"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='decision',
-            name='go_char',
-            field=models.CharField(blank=True, max_length=1, verbose_name='Beslissing', choices=[(b'Y', 'goedgekeurd'), (b'N', 'niet goegekeurd'), (b'?', 'revisie noodzakelijk')]),
+            model_name="decision",
+            name="go_char",
+            field=models.CharField(
+                blank=True,
+                max_length=1,
+                verbose_name="Beslissing",
+                choices=[
+                    (b"Y", "goedgekeurd"),
+                    (b"N", "niet goegekeurd"),
+                    (b"?", "revisie noodzakelijk"),
+                ],
+            ),
         ),
         migrations.RunPython(forwards, backwards),
         migrations.RemoveField(
-            model_name='decision',
-            name='go',
+            model_name="decision",
+            name="go",
         ),
         migrations.RenameField(
-            model_name='decision',
-            old_name='go_char',
-            new_name='go',
+            model_name="decision",
+            old_name="go_char",
+            new_name="go",
         ),
     ]
diff --git a/reviews/migrations/0004_auto_20170117_1754.py b/reviews/migrations/0004_auto_20170117_1754.py
index 9255a9a82..ba8259cea 100644
--- a/reviews/migrations/0004_auto_20170117_1754.py
+++ b/reviews/migrations/0004_auto_20170117_1754.py
@@ -5,15 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0003_decision_go_char'),
+        ("reviews", "0003_decision_go_char"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='short_route',
-            field=models.NullBooleanField(default=None, verbose_name='Route'),
+            model_name="review",
+            name="short_route",
+            field=models.NullBooleanField(default=None, verbose_name="Route"),
         ),
     ]
diff --git a/reviews/migrations/0005_review_date_should_end.py b/reviews/migrations/0005_review_date_should_end.py
index d61032eef..933f2b573 100644
--- a/reviews/migrations/0005_review_date_should_end.py
+++ b/reviews/migrations/0005_review_date_should_end.py
@@ -5,15 +5,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0004_auto_20170117_1754'),
+        ("reviews", "0004_auto_20170117_1754"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='review',
-            name='date_should_end',
+            model_name="review",
+            name="date_should_end",
             field=models.DateField(null=True, blank=True),
         ),
     ]
diff --git a/reviews/migrations/0006_auto_20180808_1129.py b/reviews/migrations/0006_auto_20180808_1129.py
index a85ab4843..570d6e0ef 100644
--- a/reviews/migrations/0006_auto_20180808_1129.py
+++ b/reviews/migrations/0006_auto_20180808_1129.py
@@ -6,15 +6,23 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0005_review_date_should_end'),
+        ("reviews", "0005_review_date_should_end"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='decision',
-            name='go',
-            field=models.CharField(blank=True, choices=[('Y', 'goedgekeurd'), ('N', 'niet goegekeurd'), ('?', 'revisie noodzakelijk')], max_length=1, verbose_name='Beslissing'),
+            model_name="decision",
+            name="go",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("Y", "goedgekeurd"),
+                    ("N", "niet goegekeurd"),
+                    ("?", "revisie noodzakelijk"),
+                ],
+                max_length=1,
+                verbose_name="Beslissing",
+            ),
         ),
     ]
diff --git a/reviews/migrations/0007_auto_20190401_1343.py b/reviews/migrations/0007_auto_20190401_1343.py
index 9a3412e8b..433d78868 100644
--- a/reviews/migrations/0007_auto_20190401_1343.py
+++ b/reviews/migrations/0007_auto_20190401_1343.py
@@ -6,15 +6,24 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0006_auto_20180808_1129'),
+        ("reviews", "0006_auto_20180808_1129"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='continuation',
-            field=models.PositiveIntegerField(choices=[(0, 'Goedkeuring door FETC-GW'), (1, 'Revisie noodzakelijk'), (2, 'Afwijzing door FETC-GW'), (3, 'Open review met lange (4-weken) route'), (4, 'Laat opnieuw beoordelen door METC')], default=0, verbose_name='Afhandeling'),
+            model_name="review",
+            name="continuation",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (0, "Goedkeuring door FETC-GW"),
+                    (1, "Revisie noodzakelijk"),
+                    (2, "Afwijzing door FETC-GW"),
+                    (3, "Open review met lange (4-weken) route"),
+                    (4, "Laat opnieuw beoordelen door METC"),
+                ],
+                default=0,
+                verbose_name="Afhandeling",
+            ),
         ),
     ]
diff --git a/reviews/migrations/0008_auto_20200428_1337.py b/reviews/migrations/0008_auto_20200428_1337.py
index 30995d388..fc4505b90 100644
--- a/reviews/migrations/0008_auto_20200428_1337.py
+++ b/reviews/migrations/0008_auto_20200428_1337.py
@@ -4,25 +4,40 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0007_auto_20190401_1343'),
+        ("reviews", "0007_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='continuation',
-            field=models.PositiveIntegerField(choices=[(0, 'Goedkeuring door FETC-GW'), (1, 'Revisie noodzakelijk'), (2, 'Afwijzing door FETC-GW'), (3, 'Open review met lange (4-weken) route'), (4, 'Laat opnieuw beoordelen door METC'), (5, 'Positief advies van FETC-GW, post-hoc'), (6, 'Negatief advies van FETC-GW, post-hoc')], default=0, verbose_name='Afhandeling'),
+            model_name="review",
+            name="continuation",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (0, "Goedkeuring door FETC-GW"),
+                    (1, "Revisie noodzakelijk"),
+                    (2, "Afwijzing door FETC-GW"),
+                    (3, "Open review met lange (4-weken) route"),
+                    (4, "Laat opnieuw beoordelen door METC"),
+                    (5, "Positief advies van FETC-GW, post-hoc"),
+                    (6, "Negatief advies van FETC-GW, post-hoc"),
+                ],
+                default=0,
+                verbose_name="Afhandeling",
+            ),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='go',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Beslissing'),
+            model_name="review",
+            name="go",
+            field=models.BooleanField(
+                blank=True, default=None, null=True, verbose_name="Beslissing"
+            ),
         ),
         migrations.AlterField(
-            model_name='review',
-            name='short_route',
-            field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Route'),
+            model_name="review",
+            name="short_route",
+            field=models.BooleanField(
+                blank=True, default=None, null=True, verbose_name="Route"
+            ),
         ),
     ]
diff --git a/reviews/migrations/0008_auto_20201203_0906.py b/reviews/migrations/0008_auto_20201203_0906.py
index 72e6c9cb1..d7fb4fa5f 100644
--- a/reviews/migrations/0008_auto_20201203_0906.py
+++ b/reviews/migrations/0008_auto_20201203_0906.py
@@ -6,15 +6,26 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0007_auto_20190401_1343'),
+        ("reviews", "0007_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='continuation',
-            field=models.PositiveIntegerField(choices=[(0, 'Goedkeuring door FETC-GW'), (1, 'Revisie noodzakelijk'), (2, 'Afwijzing door FETC-GW'), (3, 'Open review met lange (4-weken) route'), (4, 'Laat opnieuw beoordelen door METC'), (5, 'Positief advies van FETC-GW, post-hoc'), (6, 'Negatief advies van FETC-GW, post-hoc')], default=0, verbose_name='Afhandeling'),
+            model_name="review",
+            name="continuation",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (0, "Goedkeuring door FETC-GW"),
+                    (1, "Revisie noodzakelijk"),
+                    (2, "Afwijzing door FETC-GW"),
+                    (3, "Open review met lange (4-weken) route"),
+                    (4, "Laat opnieuw beoordelen door METC"),
+                    (5, "Positief advies van FETC-GW, post-hoc"),
+                    (6, "Negatief advies van FETC-GW, post-hoc"),
+                ],
+                default=0,
+                verbose_name="Afhandeling",
+            ),
         ),
     ]
diff --git a/reviews/migrations/0009_merge_20201222_1654.py b/reviews/migrations/0009_merge_20201222_1654.py
index f44450831..6e09cefc9 100644
--- a/reviews/migrations/0009_merge_20201222_1654.py
+++ b/reviews/migrations/0009_merge_20201222_1654.py
@@ -4,11 +4,9 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0008_auto_20200428_1337'),
-        ('reviews', '0008_auto_20201203_0906'),
+        ("reviews", "0008_auto_20200428_1337"),
+        ("reviews", "0008_auto_20201203_0906"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/reviews/migrations/0010_auto_20210809_1653.py b/reviews/migrations/0010_auto_20210809_1653.py
index 6cf3f7e7c..a9c471c84 100644
--- a/reviews/migrations/0010_auto_20210809_1653.py
+++ b/reviews/migrations/0010_auto_20210809_1653.py
@@ -4,15 +4,27 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0009_merge_20201222_1654'),
+        ("reviews", "0009_merge_20201222_1654"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='continuation',
-            field=models.PositiveIntegerField(choices=[(0, 'Goedkeuring door FETC-GW'), (1, 'Revisie noodzakelijk'), (2, 'Afwijzing door FETC-GW'), (3, 'Open review met lange (4-weken) route'), (4, 'Laat opnieuw beoordelen door METC'), (5, 'Positief advies van FETC-GW, post-hoc'), (6, 'Negatief advies van FETC-GW, post-hoc'), (7, 'Niet verder in behandeling genomen door de FETC-GW')], default=0, verbose_name='Afhandeling'),
+            model_name="review",
+            name="continuation",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (0, "Goedkeuring door FETC-GW"),
+                    (1, "Revisie noodzakelijk"),
+                    (2, "Afwijzing door FETC-GW"),
+                    (3, "Open review met lange (4-weken) route"),
+                    (4, "Laat opnieuw beoordelen door METC"),
+                    (5, "Positief advies van FETC-GW, post-hoc"),
+                    (6, "Negatief advies van FETC-GW, post-hoc"),
+                    (7, "Niet verder in behandeling genomen door de FETC-GW"),
+                ],
+                default=0,
+                verbose_name="Afhandeling",
+            ),
         ),
     ]
diff --git a/reviews/migrations/0011_auto_20210920_1650.py b/reviews/migrations/0011_auto_20210920_1650.py
index 1d5741fac..4d20a57e5 100644
--- a/reviews/migrations/0011_auto_20210920_1650.py
+++ b/reviews/migrations/0011_auto_20210920_1650.py
@@ -4,15 +4,27 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0010_auto_20210809_1653'),
+        ("reviews", "0010_auto_20210809_1653"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='review',
-            name='continuation',
-            field=models.PositiveIntegerField(choices=[(0, 'Goedkeuring door FETC-GW'), (1, 'Revisie noodzakelijk'), (2, 'Afwijzing door FETC-GW'), (3, 'Open review met lange (4-weken) route'), (4, 'Laat opnieuw beoordelen door METC'), (5, 'Positief advies van FETC-GW, post-hoc'), (6, 'Negatief advies van FETC-GW, post-hoc'), (7, 'Niet verder in behandeling genomen')], default=0, verbose_name='Afhandeling'),
+            model_name="review",
+            name="continuation",
+            field=models.PositiveIntegerField(
+                choices=[
+                    (0, "Goedkeuring door FETC-GW"),
+                    (1, "Revisie noodzakelijk"),
+                    (2, "Afwijzing door FETC-GW"),
+                    (3, "Open review met lange (4-weken) route"),
+                    (4, "Laat opnieuw beoordelen door METC"),
+                    (5, "Positief advies van FETC-GW, post-hoc"),
+                    (6, "Negatief advies van FETC-GW, post-hoc"),
+                    (7, "Niet verder in behandeling genomen"),
+                ],
+                default=0,
+                verbose_name="Afhandeling",
+            ),
         ),
     ]
diff --git a/reviews/migrations/0012_auto_20211213_1503.py b/reviews/migrations/0012_auto_20211213_1503.py
index e8c79698b..21de01636 100644
--- a/reviews/migrations/0012_auto_20211213_1503.py
+++ b/reviews/migrations/0012_auto_20211213_1503.py
@@ -4,15 +4,23 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('reviews', '0011_auto_20210920_1650'),
+        ("reviews", "0011_auto_20210920_1650"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='decision',
-            name='go',
-            field=models.CharField(blank=True, choices=[('Y', 'goedgekeurd'), ('N', 'niet goedgekeurd'), ('?', 'revisie noodzakelijk')], max_length=1, verbose_name='Beslissing'),
+            model_name="decision",
+            name="go",
+            field=models.CharField(
+                blank=True,
+                choices=[
+                    ("Y", "goedgekeurd"),
+                    ("N", "niet goedgekeurd"),
+                    ("?", "revisie noodzakelijk"),
+                ],
+                max_length=1,
+                verbose_name="Beslissing",
+            ),
         ),
     ]
diff --git a/reviews/migrations/0013_add_is_committee_review.py b/reviews/migrations/0013_add_is_committee_review.py
index 0ff5fedc6..2dc8e0056 100644
--- a/reviews/migrations/0013_add_is_committee_review.py
+++ b/reviews/migrations/0013_add_is_committee_review.py
@@ -2,12 +2,12 @@
 
 from django.db import migrations, models
 
-def update_is_committee_review(apps, schema_editor):
 
-    Review = apps.get_model('reviews', 'Review')
+def update_is_committee_review(apps, schema_editor):
+    Review = apps.get_model("reviews", "Review")
 
     for review in Review.objects.all():
-        #Hardcoded these to account for possible future changes to stages
+        # Hardcoded these to account for possible future changes to stages
         SUPERVISOR_STAGE = 0
         CLOSED_STAGE = 4
         if review.stage == SUPERVISOR_STAGE:
@@ -16,16 +16,16 @@ def update_is_committee_review(apps, schema_editor):
                 review.stage = CLOSED_STAGE
             review.save()
 
-class Migration(migrations.Migration):
 
+class Migration(migrations.Migration):
     dependencies = [
-        ('reviews', '0012_auto_20211213_1503'),
+        ("reviews", "0012_auto_20211213_1503"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='review',
-            name='is_committee_review',
+            model_name="review",
+            name="is_committee_review",
             field=models.BooleanField(default=True),
         ),
         migrations.RunPython(update_is_committee_review),
diff --git a/reviews/mixins.py b/reviews/mixins.py
index 51c58924c..209331413 100644
--- a/reviews/mixins.py
+++ b/reviews/mixins.py
@@ -65,7 +65,7 @@ def dispatch(self, request, *args, **kwargs):
                     raise self.ReviewClosed
             else:
                 raise ImproperlyConfigured(
-                    'UserAllowedToDecisionMixin used for a non-decision object!'
+                    "UserAllowedToDecisionMixin used for a non-decision object!"
                 )
         except self.ReviewClosed as e:
             ret = self.handle_review_closed(request, e)
@@ -88,7 +88,9 @@ def get_object(self, queryset=None):
         current_user = self.request.user
 
         if isinstance(obj, Review):
-            secretary_reviewers = obj.decision_set.filter(reviewer__groups__name=settings.GROUP_SECRETARY)
+            secretary_reviewers = obj.decision_set.filter(
+                reviewer__groups__name=settings.GROUP_SECRETARY
+            )
             if secretary_reviewers and is_secretary(current_user):
                 return obj
             if not obj.decision_set.filter(reviewer=current_user):
@@ -100,15 +102,15 @@ def get_object(self, queryset=None):
 
             if date_end:
                 raise PermissionDenied
-            if (self.request.user != reviewer) and \
-                    not (is_secretary(reviewer) and is_secretary(current_user)):
+            if (self.request.user != reviewer) and not (
+                is_secretary(reviewer) and is_secretary(current_user)
+            ):
                 raise PermissionDenied
 
         return obj
 
 
-class UsersOrGroupsAllowedMixin():
-
+class UsersOrGroupsAllowedMixin:
     def get_group_required(self):
         """Is overwritten to provide a dynamic list of
         groups which have access"""
@@ -124,7 +126,7 @@ def get_allowed_users(self):
         return self.allowed_users
 
     def check_membership(self, groups):
-        """ Check required group(s) """
+        """Check required group(s)"""
         if self.current_user.is_superuser:
             return True
         return set(groups).intersection(set(self.current_user_groups))
@@ -132,14 +134,18 @@ def check_membership(self, groups):
     def dispatch(self, request, *args, **kwargs):
         authorized = False
         self.current_user = request.user
-        self.current_user_groups = set(self.current_user.groups.values_list("name", flat=True))
+        self.current_user_groups = set(
+            self.current_user.groups.values_list("name", flat=True)
+        )
 
         # Default allowed groups and users
-        try: group_required = self.group_required
+        try:
+            group_required = self.group_required
         except AttributeError:
             self.group_required = None
 
-        try: allowed_users = self.allowed_users
+        try:
+            allowed_users = self.allowed_users
         except AttributeError:
             self.allowed_users = None
 
@@ -152,32 +158,30 @@ def dispatch(self, request, *args, **kwargs):
         if not authorized:
             raise PermissionDenied
 
-        return super(UsersOrGroupsAllowedMixin, self).dispatch(
-            request, *args, **kwargs)
+        return super(UsersOrGroupsAllowedMixin, self).dispatch(request, *args, **kwargs)
 
 
 class CommitteeMixin(ContextMixin):
-
     @cached_property
     def committee(self):
-        group = self.kwargs.get('committee')
+        group = self.kwargs.get("committee")
 
         return Group.objects.get(name=group)
 
     @cached_property
     def committee_display_name(self):
-        committee = _('Algemene Kamer')
+        committee = _("Algemene Kamer")
 
-        if self.committee.name == 'LK':
-            committee = _('Linguïstiek Kamer')
+        if self.committee.name == "LK":
+            committee = _("Linguïstiek Kamer")
 
         return committee
 
     def get_context_data(self, **kwargs):
         context = super(CommitteeMixin, self).get_context_data(**kwargs)
 
-        context['committee'] = self.committee
-        context['committee_name'] = self.committee_display_name
+        context["committee"] = self.committee
+        context["committee_name"] = self.committee_display_name
 
         return context
 
@@ -187,6 +191,6 @@ def get_context_data(self, **kwargs):
         """Adds the results of the machine-wise review to the context."""
         context = super(AutoReviewMixin, self).get_context_data(**kwargs)
         reasons = auto_review(self.get_object().proposal)
-        context['auto_review_go'] = len(reasons) == 0
-        context['auto_review_reasons'] = reasons
+        context["auto_review_go"] = len(reasons) == 0
+        context["auto_review_reasons"] = reasons
         return context
diff --git a/reviews/models.py b/reviews/models.py
index 49c35a38c..24f5d8334 100644
--- a/reviews/models.py
+++ b/reviews/models.py
@@ -8,39 +8,30 @@
 
 
 class Review(models.Model):
-
     class Stages(models.IntegerChoices):
-        SUPERVISOR = 0, _('Beoordeling door eindverantwoordelijke')
-        ASSIGNMENT = 1, _('Aanstelling commissieleden')
-        COMMISSION = 2, _('Beoordeling door commissie')
-        CLOSING = 3, _('Afsluiting door secretaris')
-        CLOSED = 4, _('Afgesloten')
+        SUPERVISOR = 0, _("Beoordeling door eindverantwoordelijke")
+        ASSIGNMENT = 1, _("Aanstelling commissieleden")
+        COMMISSION = 2, _("Beoordeling door commissie")
+        CLOSING = 3, _("Afsluiting door secretaris")
+        CLOSED = 4, _("Afgesloten")
 
     class Continuations(models.IntegerChoices):
-        GO = 0, _('Goedkeuring door FETC-GW')
-        REVISION = 1, _('Revisie noodzakelijk')
-        NO_GO = 2, _('Afwijzing door FETC-GW')
-        LONG_ROUTE = 3, _('Open review met lange (4-weken) route')
-        METC = 4, _('Laat opnieuw beoordelen door METC')
-        GO_POST_HOC = 5, _('Positief advies van FETC-GW, post-hoc')
-        NO_GO_POST_HOC = 6, _('Negatief advies van FETC-GW, post-hoc')
-        DISCONTINUED = 7, _('Niet verder in behandeling genomen')
-
-    stage = models.PositiveIntegerField(choices=Stages.choices, default=Stages.SUPERVISOR)
-    short_route = models.BooleanField(
-        _('Route'),
-        default=None,
-        null=True,
-        blank=True
-    )
-    go = models.BooleanField(
-        _('Beslissing'),
-        default=None,
-        null=True,
-        blank=True
+        GO = 0, _("Goedkeuring door FETC-GW")
+        REVISION = 1, _("Revisie noodzakelijk")
+        NO_GO = 2, _("Afwijzing door FETC-GW")
+        LONG_ROUTE = 3, _("Open review met lange (4-weken) route")
+        METC = 4, _("Laat opnieuw beoordelen door METC")
+        GO_POST_HOC = 5, _("Positief advies van FETC-GW, post-hoc")
+        NO_GO_POST_HOC = 6, _("Negatief advies van FETC-GW, post-hoc")
+        DISCONTINUED = 7, _("Niet verder in behandeling genomen")
+
+    stage = models.PositiveIntegerField(
+        choices=Stages.choices, default=Stages.SUPERVISOR
     )
+    short_route = models.BooleanField(_("Route"), default=None, null=True, blank=True)
+    go = models.BooleanField(_("Beslissing"), default=None, null=True, blank=True)
     continuation = models.PositiveIntegerField(
-        _('Afhandeling'),
+        _("Afhandeling"),
         choices=Continuations.choices,
         default=Continuations.GO,
     )
@@ -49,9 +40,7 @@ class Continuations(models.IntegerChoices):
     date_end = models.DateTimeField(blank=True, null=True)
     date_should_end = models.DateField(blank=True, null=True)
 
-    is_committee_review = models.BooleanField(
-        default=True
-    )
+    is_committee_review = models.BooleanField(default=True)
 
     proposal = models.ForeignKey(Proposal, on_delete=models.CASCADE)
 
@@ -69,7 +58,7 @@ def update_go(self, last_decision=None):
         closed_decisions = 0
         final_go = True
         for decision in self.decision_set.all():
-            if decision.go != '':
+            if decision.go != "":
                 closed_decisions += 1
                 final_go &= decision.go == Decision.Approval.APPROVED
 
@@ -88,12 +77,14 @@ def update_go(self, last_decision=None):
                     # Use absolute import. Relative works fine everywhere except
                     # in an uWSGI environment, in which it errors.
                     from reviews.utils import start_assignment_phase
+
                     start_assignment_phase(self.proposal)
                     self.stage = self.Stages.CLOSED
                 # On NO-GO, reset the Proposal status
                 else:
                     # See comment above
                     from reviews.utils import notify_supervisor_nogo
+
                     notify_supervisor_nogo(last_decision)
                     self.proposal.status = Proposal.Statuses.DRAFT
                     self.proposal.save()
@@ -101,6 +92,7 @@ def update_go(self, last_decision=None):
             else:
                 # Set the stage to CLOSING
                 from reviews.utils import notify_secretary_all_decisions
+
                 notify_secretary_all_decisions(self)
                 self.stage = self.Stages.CLOSING
                 self.save()
@@ -122,27 +114,28 @@ def get_continuation_display(self):
         continuation = self.Continuations(self.continuation).label
 
         if self.proposal.has_minor_revision:
-            continuation += str(_(', met revisie'))
+            continuation += str(_(", met revisie"))
 
         return continuation
 
     def get_route_display(self):
         route_options = {
-            False: _('lange (4-weken) route'),
-            True:  _('korte (2-weken) route'),
-            None:  _('nog geen route')
+            False: _("lange (4-weken) route"),
+            True: _("korte (2-weken) route"),
+            None: _("nog geen route"),
         }
 
         return route_options[self.short_route]
 
     def accountable_user(self):
         return self.proposal.accountable_user()
-    
+
     def get_applicant_names_emails(self):
         names_and_emails = [
-            (user.get_full_name(), user.email) for user in self.proposal.applicants.all()
+            (user.get_full_name(), user.email)
+            for user in self.proposal.applicants.all()
         ]
-        name_email_strings = [] 
+        name_email_strings = []
         for pair in names_and_emails:
             name_email_strings.append(",\n".join(pair))
         return name_email_strings
@@ -151,32 +144,31 @@ def current_reviewers(self):
         return get_user_model().objects.filter(decision__review=self)
 
     def __str__(self):
-        return 'Review of %s' % self.proposal
+        return "Review of %s" % self.proposal
 
 
 class Decision(models.Model):
     class Approval(models.TextChoices):
-        APPROVED = 'Y', _('goedgekeurd')
-        NOT_APPROVED = 'N', _('niet goedgekeurd')
-        NEEDS_REVISION = '?', _('revisie noodzakelijk')
+        APPROVED = "Y", _("goedgekeurd")
+        NOT_APPROVED = "N", _("niet goedgekeurd")
+        NEEDS_REVISION = "?", _("revisie noodzakelijk")
 
     go = models.CharField(
-        _('Beslissing'),
-        max_length=1,
-        choices=Approval.choices,
-        blank=True)
-    
+        _("Beslissing"), max_length=1, choices=Approval.choices, blank=True
+    )
+
     date_decision = models.DateTimeField(blank=True, null=True)
 
-    comments = models.TextField(
-        _('Ruimte voor eventuele opmerkingen'),
-        blank=True)
+    comments = models.TextField(_("Ruimte voor eventuele opmerkingen"), blank=True)
 
     review = models.ForeignKey(Review, on_delete=models.CASCADE)
     reviewer = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE)
 
     class Meta:
-        unique_together = ('review', 'reviewer',)
+        unique_together = (
+            "review",
+            "reviewer",
+        )
 
     def save(self, *args, **kwargs):
         """
@@ -186,4 +178,9 @@ def save(self, *args, **kwargs):
         self.review.update_go(last_decision=self)
 
     def __str__(self):
-        return 'Decision #%d by %s on %s: %s' % (self.pk, self.reviewer.username, self.review.proposal, self.go)
+        return "Decision #%d by %s on %s: %s" % (
+            self.pk,
+            self.reviewer.username,
+            self.review.proposal,
+            self.go,
+        )
diff --git a/reviews/templatetags/documents_list.py b/reviews/templatetags/documents_list.py
index 7533a0347..612096a7a 100644
--- a/reviews/templatetags/documents_list.py
+++ b/reviews/templatetags/documents_list.py
@@ -16,24 +16,24 @@
 register = template.Library()
 
 
-@register.inclusion_tag('reviews/simple_compare_link.html')
+@register.inclusion_tag("reviews/simple_compare_link.html")
 def simple_compare_link(obj, file):
     """Generates a compare icon"""
 
     if type(obj) == Proposal:
         proposal = obj
-        obj_type = 'proposal'
+        obj_type = "proposal"
 
     elif type(obj) == Wmo:
-        obj_type = 'wmo'
+        obj_type = "wmo"
         proposal = obj.proposal
 
     elif type(obj) == Documents:
-        obj_type = 'documents'
+        obj_type = "documents"
         proposal = obj.proposal
 
     elif type(obj) == Observation:
-        obj_type = 'observation'
+        obj_type = "observation"
         proposal = obj.study.proposal
 
     else:
@@ -54,16 +54,12 @@ def simple_compare_link(obj, file):
     # incorrect documents with each other.
     # Same if the order of trajectories changes.
 
-    if obj_type in ['documents', 'observation']:
-
+    if obj_type in ["documents", "observation"]:
         if obj.study:
-
             try:
-                parent_study = parent_proposal.study_set.get(
-                    order=obj.study.order
-                )
+                parent_study = parent_proposal.study_set.get(order=obj.study.order)
 
-                if obj_type == 'observation':
+                if obj_type == "observation":
                     parent_obj = parent_study.observation
                     parent_pk = parent_obj.pk
                 else:
@@ -75,14 +71,11 @@ def simple_compare_link(obj, file):
 
         # "Extra" documents
         else:
-            for n, d in enumerate(
-                proposal.documents_set.filter(study=None)
-            ):
+            for n, d in enumerate(proposal.documents_set.filter(study=None)):
                 if obj == d:
                     extra_index = n
             try:
-                old_set = parent_proposal.documents_set.filter(
-                    study=None)
+                old_set = parent_proposal.documents_set.filter(study=None)
                 # Same index, different proposal
                 parent_obj = old_set[extra_index]
                 parent_pk = parent_obj.pk
@@ -90,12 +83,12 @@ def simple_compare_link(obj, file):
                 return {}
 
     # Get parent wmo pk:
-    if obj_type == 'wmo':
+    if obj_type == "wmo":
         parent_obj = parent_proposal.wmo
         parent_pk = parent_obj.pk
 
     # Set parent object in case of Proposal PDF or DMP
-    if obj_type == 'proposal':
+    if obj_type == "proposal":
         parent_obj = parent_proposal
 
     # Check that the parent has a comparable object
@@ -103,10 +96,11 @@ def simple_compare_link(obj, file):
         return {}
 
     # We now have pk's for the old and new object
-    compare_kwargs = {'old': parent_pk,
-                      'new': pk,
-                      'attribute': file.field.name,
-                      }
+    compare_kwargs = {
+        "old": parent_pk,
+        "new": pk,
+        "attribute": file.field.name,
+    }
 
     # CompareDocumentsView expects the following args:
     # - old pk
@@ -115,20 +109,19 @@ def simple_compare_link(obj, file):
     #   > This is hard-coded into the URL, so we handle it here
     # - attribute (none for Proposal PDF)
 
-    if obj_type == 'proposal':
-        url = reverse('proposals:compare_proposal_docs', kwargs=compare_kwargs)
+    if obj_type == "proposal":
+        url = reverse("proposals:compare_proposal_docs", kwargs=compare_kwargs)
 
-    if obj_type == 'wmo':
-        url = reverse('proposals:compare_wmo_decision', kwargs=compare_kwargs)
+    if obj_type == "wmo":
+        url = reverse("proposals:compare_wmo_decision", kwargs=compare_kwargs)
 
-    if obj_type == 'documents':
-        url = reverse('proposals:compare_documents', kwargs=compare_kwargs)
+    if obj_type == "documents":
+        url = reverse("proposals:compare_documents", kwargs=compare_kwargs)
 
-    if obj_type == 'observation':
-        url = reverse('proposals:compare_observation_approval', kwargs=compare_kwargs)
-
-    return {'compare_url': url}
+    if obj_type == "observation":
+        url = reverse("proposals:compare_observation_approval", kwargs=compare_kwargs)
 
+    return {"compare_url": url}
 
 
 def give_name(doc):
@@ -147,22 +140,18 @@ def give_name(doc):
             _("Traject {}: <i>{}</i>").format(
                 doc.study.order,
                 escape(doc.study.name),
-                )
             )
+        )
 
-    for n, d in enumerate(Documents.objects.filter(
-        proposal=proposal).filter(
-            study=None)):
-
-            if doc == d:
-                return _("Extra documenten {}").format(n+1)
-
+    for n, d in enumerate(
+        Documents.objects.filter(proposal=proposal).filter(study=None)
+    ):
+        if doc == d:
+            return _("Extra documenten {}").format(n + 1)
 
 
 class Container:
-
     def __init__(self, header, **kwargs):
-
         self.edit_link = False
         self.dmp_edit_link = False
         self.header = header
@@ -171,11 +160,8 @@ def __init__(self, header, **kwargs):
         self.__dict__.update(kwargs)
 
 
-
 class DocItem:
-
     def __init__(self, name, **kwargs):
-
         self.name = name
         self.comparable = False
         self.filename = None
@@ -185,22 +171,19 @@ def __init__(self, name, **kwargs):
         self.__dict__.update(kwargs)
 
     def get_filename(self):
-
         if self.filename:
             return self.filename
 
         return self.field.name
 
     def get_link_url(self):
-
         if self.link_url:
             return self.link_url
 
         return self.field.url
 
 
-
-@register.inclusion_tag('reviews/documents_list.html')
+@register.inclusion_tag("reviews/documents_list.html")
 def documents_list(review, user):
     """This retrieves all files associated with
     a certain review and its proposal and returns them as a
@@ -210,10 +193,10 @@ def documents_list(review, user):
     containers = []
 
     # Get the proposal PDF
-    pdf_container = Container(_('Aanmelding'))
+    pdf_container = Container(_("Aanmelding"))
 
-    proposal_pdf = DocItem(_('Aanvraag in PDF-vorm'))
-    proposal_pdf.link_url = reverse('proposals:pdf', args=(proposal.pk,))
+    proposal_pdf = DocItem(_("Aanvraag in PDF-vorm"))
+    proposal_pdf.link_url = reverse("proposals:pdf", args=(proposal.pk,))
 
     # The proposals:pdf view sets an attachment and filename
     # HTTP header (Content-disposition:) which does not interact well with
@@ -224,37 +207,37 @@ def documents_list(review, user):
 
     # Pre-approval
     if proposal.pre_approval_pdf:
-
-        pre_approval = DocItem(_('Eerdere goedkeuring'))
+        pre_approval = DocItem(_("Eerdere goedkeuring"))
         pre_approval.field = proposal.pre_approval_pdf
 
         pdf_container.items.append(pre_approval)
 
     # Pre-assessment
     if proposal.pre_assessment_pdf:
-
-        pre_assessment = DocItem(_('Aanvraag bij voortoetsing'))
+        pre_assessment = DocItem(_("Aanvraag bij voortoetsing"))
         pre_assessment.field = proposal.pre_assessment_pdf
 
         pdf_container.items.append(pre_assessment)
 
-
     # Data management plan
     if proposal.dmp_file:
-
-        dmp_file = DocItem(_('Data Management Plan'))
+        dmp_file = DocItem(_("Data Management Plan"))
         dmp_file.field = proposal.dmp_file
         dmp_file.comparable = True
         dmp_file.object = proposal
         if is_secretary(user):
-            pdf_container.dmp_edit_link = reverse('proposals:update_data_management', args=[proposal.pk])
+            pdf_container.dmp_edit_link = reverse(
+                "proposals:update_data_management", args=[proposal.pk]
+            )
 
         pdf_container.items.append(dmp_file)
 
     # WMO
-    if hasattr(proposal, 'wmo') and proposal.wmo.status == proposal.wmo.WMOStatuses.JUDGED:
-
-        metc_decision = DocItem(_('Beslissing METC'))
+    if (
+        hasattr(proposal, "wmo")
+        and proposal.wmo.status == proposal.wmo.WMOStatuses.JUDGED
+    ):
+        metc_decision = DocItem(_("Beslissing METC"))
         metc_decision.field = proposal.wmo.metc_decision_pdf
 
         pdf_container.items.append(metc_decision)
@@ -265,27 +248,30 @@ def documents_list(review, user):
     # Now get all trajectories / extra documents
     # First we get all objects attached to a study, then we append those
     # without. This way we get the ordering we want.
-    qs = Documents.objects.filter(
-        proposal=proposal
-    ).exclude(study=None) | Documents.objects.filter(
-        proposal=proposal, study=None
-    )
+    qs = Documents.objects.filter(proposal=proposal).exclude(
+        study=None
+    ) | Documents.objects.filter(proposal=proposal, study=None)
 
     for d in qs:
-
         # Get a humanized name and create container item
         documents_container = Container(give_name(d))
 
         # We create a list of possible files
         # with the format [(Name, FileField, Containing object)...]
         potential_files = [
-            (_('Informed consent'), d.informed_consent, d),
-            (_('Informatiebrief'), d.briefing, d),
-            (_('Consent declaratie directeur/departementshoofd'),
-                d.director_consent_declaration, d),
-            (_('Informatiebrief directeur/departementshoofd'),
-                d.director_consent_information, d),
-            (_('Informatiebrief ouders'), d.parents_information, d),
+            (_("Informed consent"), d.informed_consent, d),
+            (_("Informatiebrief"), d.briefing, d),
+            (
+                _("Consent declaratie directeur/departementshoofd"),
+                d.director_consent_declaration,
+                d,
+            ),
+            (
+                _("Informatiebrief directeur/departementshoofd"),
+                d.director_consent_information,
+                d,
+            ),
+            (_("Informatiebrief ouders"), d.parents_information, d),
         ]
 
         # Search for old-style observations (deprecated)
@@ -293,14 +279,14 @@ def documents_list(review, user):
             if d.study.observation.needs_approval:
                 potential_files.append(
                     (
-                    _('Toestemmingsdocument observatie'),
-                    d.study.observation.approval_document,
-                    d.study.observation
+                        _("Toestemmingsdocument observatie"),
+                        d.study.observation.approval_document,
+                        d.study.observation,
                     )
                 )
 
         # We then iterate over potential files for every Documents object in the QS
-        for (name, field, obj) in potential_files:
+        for name, field, obj in potential_files:
             # If it's got a file in it, add an item to this container
             if field:
                 item = DocItem(name)
@@ -311,11 +297,9 @@ def documents_list(review, user):
 
         # Only the secretary gets an edit link
         if is_secretary(user):
-            documents_container.edit_link = reverse('studies:attachments', args=[d.pk])
+            documents_container.edit_link = reverse("studies:attachments", args=[d.pk])
 
         containers.append(documents_container)
 
     # Finally, return template context
-    return {'review': review,
-            'containers': containers,
-            'proposal': proposal}
+    return {"review": review, "containers": containers, "proposal": proposal}
diff --git a/reviews/tests.py b/reviews/tests.py
index 35c219715..e4b685cfc 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -7,7 +7,13 @@
 from django.test import TestCase, Client, RequestFactory
 
 from .models import Review, Decision
-from .utils import start_review, auto_review, auto_review_observation, auto_review_task, notify_secretary
+from .utils import (
+    start_review,
+    auto_review,
+    auto_review_observation,
+    auto_review_task,
+    notify_secretary,
+)
 from main.tests import BaseViewTestCase
 from main.models import YesNoDoubt
 from proposals.models import Proposal, Relation, Wmo
@@ -21,9 +27,15 @@
 
 
 class BaseReviewTestCase(TestCase):
-
-    fixtures = ['relations', 'compensations', 'registrations',
-                'registrationkinds', 'agegroups', 'groups', 'institutions']
+    fixtures = [
+        "relations",
+        "compensations",
+        "registrations",
+        "registrationkinds",
+        "agegroups",
+        "groups",
+        "institutions",
+    ]
     relation_pk = 1
 
     def setUp(self):
@@ -35,9 +47,9 @@ def setUp(self):
         super().setUp()
 
     def setup_proposal(self):
-
         self.proposal = Proposal.objects.create(
-            title='p1', reference_number=generate_ref_number(),
+            title="p1",
+            reference_number=generate_ref_number(),
             date_start=date.today(),
             created_by=self.user,
             supervisor=self.supervisor,
@@ -56,19 +68,30 @@ def setup_proposal(self):
             order=1,
             compensation=Compensation.objects.get(
                 pk=2,
-            )
+            ),
         )
         self.proposal.generate_pdf()
 
     def setup_users(self):
+        self.secretary = User.objects.create_user(
+            "secretary",
+            "test@test.com",
+            "secret",
+            first_name="The",
+            last_name="Secretary",
+        )
+        self.c1 = User.objects.create_user("c1", "test@test.com", "secret")
+        self.c2 = User.objects.create_user("c2", "test@test.com", "secret")
+        self.user = User.objects.create_user(
+            "user", "test@test.com", "secret", first_name="John", last_name="Doe"
+        )
+        self.supervisor = User.objects.create_user(
+            "supervisor", "test@test.com", "secret", first_name="Jane", last_name="Roe"
+        )
 
-        self.secretary = User.objects.create_user('secretary', 'test@test.com', 'secret', first_name='The', last_name='Secretary')
-        self.c1 = User.objects.create_user('c1', 'test@test.com', 'secret')
-        self.c2 = User.objects.create_user('c2', 'test@test.com', 'secret')
-        self.user = User.objects.create_user('user', 'test@test.com', 'secret', first_name='John', last_name='Doe')
-        self.supervisor = User.objects.create_user('supervisor', 'test@test.com', 'secret', first_name='Jane', last_name='Roe')
-
-        self.secretary.groups.add(Group.objects.get(name=settings.GROUP_PRIMARY_SECRETARY))
+        self.secretary.groups.add(
+            Group.objects.get(name=settings.GROUP_PRIMARY_SECRETARY)
+        )
         self.secretary.groups.add(Group.objects.get(name=settings.GROUP_SECRETARY))
         self.c1.groups.add(Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER))
         self.c2.groups.add(Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER))
@@ -87,7 +110,7 @@ def check_subject_lines(self, outbox):
         """
         for message in outbox:
             subject = message.subject
-            self.assertTrue('FETC-GW' in subject)
+            self.assertTrue("FETC-GW" in subject)
             self.assertTrue(self.proposal.reference_number in subject)
 
 
@@ -104,11 +127,10 @@ def test_start_supervisor_review(self):
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
 
-        self.assertEqual(len(mail.outbox), 2) # check we sent 2 emails
+        self.assertEqual(len(mail.outbox), 2)  # check we sent 2 emails
         self.check_subject_lines(mail.outbox)
         mail.outbox = []
 
-
     def test_start_review(self):
         # If the Relation on a Proposal does not require a supervisor, a assignment review should be started.
         self.proposal.relation = Relation.objects.get(pk=5)
@@ -120,7 +142,7 @@ def test_start_review(self):
         self.assertEqual(Decision.objects.filter(reviewer=self.secretary).count(), 1)
         self.assertEqual(Decision.objects.filter(review=review).count(), 1)
         self.assertEqual(review.decision_set.count(), 1)
-        
+
         self.assertEqual(len(mail.outbox), 2)
         self.check_subject_lines(mail.outbox)
         mail.outbox = []
@@ -302,17 +324,18 @@ def test_auto_review_task(self):
 
         s1 = Session.objects.create(study=self.study, order=1, tasks_number=1)
         s1_t1 = Task.objects.create(session=s1, order=1)
-        s1_t1.registrations.set(Registration.objects.filter(pk=6))  # psychofysiological measurements
+        s1_t1.registrations.set(
+            Registration.objects.filter(pk=6)
+        )  # psychofysiological measurements
 
         reasons = auto_review_task(self.study, s1_t1)
         self.assertEqual(len(reasons), 1)
 
 
 class ReviewCloseTestCase(
-        BaseViewTestCase,
-        BaseReviewTestCase,
+    BaseViewTestCase,
+    BaseReviewTestCase,
 ):
-
     view_class = ReviewCloseView
 
     def setUp(self):
diff --git a/reviews/urls.py b/reviews/urls.py
index 334cb8845..3f43e2610 100644
--- a/reviews/urls.py
+++ b/reviews/urls.py
@@ -1,47 +1,72 @@
 from django.urls import path, include
 
-from .views import \
-    AllOpenProposalReviewsView, AllProposalReviewsView, DecisionListView, \
-    InRevisionReviewsView, \
-    DecisionMyOpenView, \
-    ReviewClosedDecisionView, SupervisorDecisionOpenView, \
-    DecisionOpenView, \
-    ReviewDetailView, \
-    ReviewAssignView, ReviewCloseView, ReviewDiscontinueView, \
-    DecisionUpdateView, ToConcludeProposalView, ChangeChamberView, \
-    CreateDecisionRedirectView, CommitteeMembersWorkloadView
+from .views import (
+    AllOpenProposalReviewsView,
+    AllProposalReviewsView,
+    DecisionListView,
+    InRevisionReviewsView,
+    DecisionMyOpenView,
+    ReviewClosedDecisionView,
+    SupervisorDecisionOpenView,
+    DecisionOpenView,
+    ReviewDetailView,
+    ReviewAssignView,
+    ReviewCloseView,
+    ReviewDiscontinueView,
+    DecisionUpdateView,
+    ToConcludeProposalView,
+    ChangeChamberView,
+    CreateDecisionRedirectView,
+    CommitteeMembersWorkloadView,
+)
 
-app_name = 'reviews'
+app_name = "reviews"
 
 urlpatterns = [
-    path('api/', include('reviews.api.urls', namespace='api')),
-    path('<str:committee>/', DecisionListView.as_view(),
-         name='my_archive'),
-    path('<str:committee>/all/', AllProposalReviewsView.as_view(),
-         name='archive'),
-    path('<str:committee>/my_open/', DecisionMyOpenView.as_view(), name='my_open'),
-    path('<str:committee>/open_decisions/', DecisionOpenView.as_view(),
-         name='open'),
-    path('<str:committee>/in_revision/',
-         InRevisionReviewsView.as_view(),
-         name='in_revision',
-         ),
-    path('<str:committee>/open/', AllOpenProposalReviewsView.as_view(), name='all_open'),
-    path('<str:committee>/open_supervisors/', SupervisorDecisionOpenView.as_view(), name='open_supervisors'),
-    path('<str:committee>/to_conclude/', ToConcludeProposalView.as_view(),
-         name='to_conclude'),
-
-    path('show/<int:pk>/', ReviewDetailView.as_view(), name='detail'),
-
-    path('assign/<int:pk>/', ReviewAssignView.as_view(), name='assign'),
-    path('<str:committee>/workload/', CommitteeMembersWorkloadView.as_view(), name='workload'),
-    path('change_chamber/<int:pk>/', ChangeChamberView.as_view(),
-         name='change_chamber'),
-    path('close/<int:pk>/', ReviewCloseView.as_view(), name='close'),
-    path('discontinue/<int:pk>/', ReviewDiscontinueView.as_view(), name='discontinue'),
-
-    path('decide/<int:pk>/', DecisionUpdateView.as_view(), name='decide'),
-    path('decide/closed/<int:pk>/', ReviewClosedDecisionView.as_view(), name='review-closed-decision'),
-    path('decide/new/<int:review>/', CreateDecisionRedirectView.as_view(),
-      name='decide_new'),
+    path("api/", include("reviews.api.urls", namespace="api")),
+    path("<str:committee>/", DecisionListView.as_view(), name="my_archive"),
+    path("<str:committee>/all/", AllProposalReviewsView.as_view(), name="archive"),
+    path("<str:committee>/my_open/", DecisionMyOpenView.as_view(), name="my_open"),
+    path("<str:committee>/open_decisions/", DecisionOpenView.as_view(), name="open"),
+    path(
+        "<str:committee>/in_revision/",
+        InRevisionReviewsView.as_view(),
+        name="in_revision",
+    ),
+    path(
+        "<str:committee>/open/", AllOpenProposalReviewsView.as_view(), name="all_open"
+    ),
+    path(
+        "<str:committee>/open_supervisors/",
+        SupervisorDecisionOpenView.as_view(),
+        name="open_supervisors",
+    ),
+    path(
+        "<str:committee>/to_conclude/",
+        ToConcludeProposalView.as_view(),
+        name="to_conclude",
+    ),
+    path("show/<int:pk>/", ReviewDetailView.as_view(), name="detail"),
+    path("assign/<int:pk>/", ReviewAssignView.as_view(), name="assign"),
+    path(
+        "<str:committee>/workload/",
+        CommitteeMembersWorkloadView.as_view(),
+        name="workload",
+    ),
+    path(
+        "change_chamber/<int:pk>/", ChangeChamberView.as_view(), name="change_chamber"
+    ),
+    path("close/<int:pk>/", ReviewCloseView.as_view(), name="close"),
+    path("discontinue/<int:pk>/", ReviewDiscontinueView.as_view(), name="discontinue"),
+    path("decide/<int:pk>/", DecisionUpdateView.as_view(), name="decide"),
+    path(
+        "decide/closed/<int:pk>/",
+        ReviewClosedDecisionView.as_view(),
+        name="review-closed-decision",
+    ),
+    path(
+        "decide/new/<int:review>/",
+        CreateDecisionRedirectView.as_view(),
+        name="decide_new",
+    ),
 ]
diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py
index c5366b761..540f9a72c 100644
--- a/reviews/utils/review_actions.py
+++ b/reviews/utils/review_actions.py
@@ -7,22 +7,22 @@
 from reviews.models import Review, Decision
 
 import datetime
-class ReviewActions:
 
 
+class ReviewActions:
     def __init__(self, review, user):
-
         self.review = review
         self.user = user
 
         # Create and initialize actions
-        self.detail_actions = [CloseReview(review, user),
-                               DecideAction(review, user),
-                               ChangeAssignment(review, user),
-                               DiscontinueReview(review, user),
-                               SendConfirmation(review, user),
-                               ChangeArchiveStatus(review, user),
-                               ChangeDateStart(review, user),
+        self.detail_actions = [
+            CloseReview(review, user),
+            DecideAction(review, user),
+            ChangeAssignment(review, user),
+            DiscontinueReview(review, user),
+            SendConfirmation(review, user),
+            ChangeArchiveStatus(review, user),
+            ChangeDateStart(review, user),
         ]
         self.ufl_actions = []
 
@@ -30,32 +30,26 @@ def __init__(self, review, user):
         self.all_actions = self.ufl_actions + self.detail_actions
 
     def __call__(self):
-
         return self.get_all_actions()
 
     def get_all_actions(self):
-
         return [a for a in self.all_actions if a.is_available()]
 
     def get_ufl_actions(self):
-
         return [a for a in self.ufl_actions if a.is_available()]
 
     def get_detail_actions(self):
-
         return [a for a in self.detail_actions if a.is_available()]
 
 
 class ReviewAction:
-
     def __init__(self, review, user):
-
         self.review = review
-        self. user = user
+        self.user = user
 
     def is_available(self, user=None):
-        '''Returns true if this action is available to the specified
-        user given the current review.'''
+        """Returns true if this action is available to the specified
+        user given the current review."""
 
         if not user:
             user = self.user
@@ -64,32 +58,29 @@ def is_available(self, user=None):
         return True
 
     def action_url(self, user=None):
-        '''Returns a URL for the action'''
+        """Returns a URL for the action"""
 
         if not user:
             user = self.user
 
-        return '#'
+        return "#"
 
     def text_with_link(self, user=None):
-
-        return '<a href="{}">{}</a>'.format(self.action_url(),
-                                            self.description(),
+        return '<a href="{}">{}</a>'.format(
+            self.action_url(),
+            self.description(),
         )
 
     def description(self):
-
-        return 'description or name for {} not defined'.format(self.__name__)
+        return "description or name for {} not defined".format(self.__name__)
 
     def __str__(self):
-
         return mark_safe(self.text_with_link())
 
 
 class DecideAction(ReviewAction):
-
     def get_available_decision(self):
-        '''Return an available decision for the current user, or None'''
+        """Return an available decision for the current user, or None"""
 
         user = self.user
         review = self.review
@@ -98,18 +89,17 @@ def get_available_decision(self):
             return False
 
         try:
-            decision = Decision.objects.get(review=review,
-                                            reviewer=user,
-                                            go='',
+            decision = Decision.objects.get(
+                review=review,
+                reviewer=user,
+                go="",
             )
         except Decision.DoesNotExist:
             return None
 
         return decision
 
-
     def is_available(self):
-
         review = self.review
 
         if not self.get_available_decision():
@@ -118,23 +108,20 @@ def is_available(self):
         return True
 
     def action_url(self):
-
         decision_pk = self.get_available_decision().pk
 
-        return reverse('reviews:decide', args=(decision_pk,))
+        return reverse("reviews:decide", args=(decision_pk,))
 
     def description(self):
-
         decision = self.get_available_decision()
 
-        return _('Geef jouw beslissing en/of commentaar door')
+        return _("Geef jouw beslissing en/of commentaar door")
 
 
 class CloseReview(ReviewAction):
-
     def is_available(self):
-        '''Only secretaries may close reviews, which must be in the
-        closing stage '''
+        """Only secretaries may close reviews, which must be in the
+        closing stage"""
 
         review = self.review
 
@@ -148,19 +135,16 @@ def is_available(self):
         return True
 
     def action_url(self):
-
-        return reverse('reviews:close', args=(self.review.pk,))
+        return reverse("reviews:close", args=(self.review.pk,))
 
     def description(self):
-
-        return _('Deze versie afhandelen')
+        return _("Deze versie afhandelen")
 
 
 class DiscontinueReview(ReviewAction):
-
     def is_available(self):
-        '''Only allow secretaries to discontinue reviews which have
-        not yet been discontinued or have been confirmed'''
+        """Only allow secretaries to discontinue reviews which have
+        not yet been discontinued or have been confirmed"""
 
         review = self.review
         user = self.user
@@ -169,29 +153,27 @@ def is_available(self):
         if not settings.GROUP_SECRETARY in user_groups:
             return False
 
-        if review.continuation in [review.Continuations.DISCONTINUED,
-                                   review.Continuations.GO,
-                                   review.Continuations.GO_POST_HOC,
-                                   ]:
+        if review.continuation in [
+            review.Continuations.DISCONTINUED,
+            review.Continuations.GO,
+            review.Continuations.GO_POST_HOC,
+        ]:
             return False
 
         return True
 
     def action_url(self, user=None):
-
-        return reverse('reviews:discontinue', args=(self.review.pk,))
+        return reverse("reviews:discontinue", args=(self.review.pk,))
 
     def description(self):
-
-        return _('Beëindig definitief de afhandeling van deze aanvraag')
+        return _("Beëindig definitief de afhandeling van deze aanvraag")
 
 
 class ChangeAssignment(ReviewAction):
-
     def is_available(self):
-        '''Only the secretary should be able to assign reviewers,
+        """Only the secretary should be able to assign reviewers,
         supervisor reviews should be excluded, and no final decision
-        should yet have been made.'''
+        should yet have been made."""
 
         user = self.user
 
@@ -199,27 +181,26 @@ def is_available(self):
         if not settings.GROUP_SECRETARY in user_groups:
             return False
 
-        if self.review.stage not in [Review.Continuations.REVISION,
-                                     Review.Continuations.NO_GO,
-                                     Review.Stages.CLOSING,
-                                     ]:
+        if self.review.stage not in [
+            Review.Continuations.REVISION,
+            Review.Continuations.NO_GO,
+            Review.Stages.CLOSING,
+        ]:
             return False
 
         return True
 
     def action_url(self):
-
-        return reverse('reviews:assign', args=(self.review.pk,))
+        return reverse("reviews:assign", args=(self.review.pk,))
 
     def description(self):
+        return _("Verander aangestelde commissieleden")
 
-        return _('Verander aangestelde commissieleden')
-    
-class SendConfirmation(ReviewAction):
 
+class SendConfirmation(ReviewAction):
     def is_available(self):
-        '''Only the secretary is able to send the confirmation letter and/or change the date.
-        The review needs to be closed and have an approved status.'''
+        """Only the secretary is able to send the confirmation letter and/or change the date.
+        The review needs to be closed and have an approved status."""
 
         user = self.user
         review = self.review
@@ -227,79 +208,76 @@ def is_available(self):
         user_groups = user.groups.values_list("name", flat=True)
         if not settings.GROUP_SECRETARY in user_groups:
             return False
-        
+
         if review.stage < review.Stages.CLOSED:
             return False
-        
-        if not review.continuation in [review.Continuations.GO, review.Continuations.GO_POST_HOC]:
+
+        if not review.continuation in [
+            review.Continuations.GO,
+            review.Continuations.GO_POST_HOC,
+        ]:
             return False
-        
+
         return True
-    
+
     def action_url(self):
+        return reverse("proposals:confirmation", args=(self.review.proposal.pk,))
 
-        return reverse('proposals:confirmation', args=(self.review.proposal.pk,))
-    
     def description(self):
         proposal = self.review.proposal
-        send_letter = _('Bevestigingsbrief versturen')
-        change_date = _('Datum van bevestigingsbrief aanpassen')
+        send_letter = _("Bevestigingsbrief versturen")
+        change_date = _("Datum van bevestigingsbrief aanpassen")
 
         if proposal.date_confirmed is None:
             return send_letter
         else:
             return change_date
 
-class ChangeArchiveStatus(ReviewAction):
 
+class ChangeArchiveStatus(ReviewAction):
     def is_available(self):
-
         user = self.user
         review = self.review
 
         user_groups = user.groups.values_list("name", flat=True)
         if not settings.GROUP_SECRETARY in user_groups:
             return False
-        
-        if review.proposal.embargo == True and \
-           review.proposal.embargo_end_date > datetime.date.today():
+
+        if (
+            review.proposal.embargo == True
+            and review.proposal.embargo_end_date > datetime.date.today()
+        ):
             return False
-        
+
         if review.proposal.status < Proposal.Statuses.DECISION_MADE:
             return False
 
         return True
-    
-    def action_url(self):
 
-        return reverse('proposals:archive_status', args=(self.review.proposal.pk,))
+    def action_url(self):
+        return reverse("proposals:archive_status", args=(self.review.proposal.pk,))
 
     def description(self):
-        
         proposal = self.review.proposal
 
         if proposal.in_archive == True:
-            return _('Verberg aanvraag uit het archief')
+            return _("Verberg aanvraag uit het archief")
         else:
-            return _('Plaats aanvraag in het archief.')
-        
-class ChangeDateStart(ReviewAction):
+            return _("Plaats aanvraag in het archief.")
 
-    def is_available(self):
 
+class ChangeDateStart(ReviewAction):
+    def is_available(self):
         user = self.user
 
         user_groups = user.groups.values_list("name", flat=True)
         if not settings.GROUP_SECRETARY in user_groups:
             return False
-        
+
         return True
-    
-    def action_url(self):
 
-        return reverse('proposals:update_date_start', args=(self.review.proposal.pk,))
+    def action_url(self):
+        return reverse("proposals:update_date_start", args=(self.review.proposal.pk,))
 
     def description(self):
-
-        return _('Startdatum wijzigen')
-
+        return _("Startdatum wijzigen")
diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py
index 166642d67..9342178a7 100644
--- a/reviews/utils/review_utils.py
+++ b/reviews/utils/review_utils.py
@@ -62,22 +62,28 @@ def start_supervisor_phase(proposal):
     decision = Decision.objects.create(review=review, reviewer=proposal.supervisor)
     reference = proposal.committee_prefixed_refnum()
 
-    subject = _('FETC-GW {}: bevestiging indienen concept-aanmelding'.format(reference))
+    subject = _("FETC-GW {}: bevestiging indienen concept-aanmelding".format(reference))
     params = {
-        'proposal': proposal,
-        'title': proposal.title,
-        'supervisor': proposal.supervisor.get_full_name(),
-        'secretary': get_secretary().get_full_name(),
-        'pdf_url': settings.BASE_URL + proposal.pdf.url,
+        "proposal": proposal,
+        "title": proposal.title,
+        "supervisor": proposal.supervisor.get_full_name(),
+        "secretary": get_secretary().get_full_name(),
+        "pdf_url": settings.BASE_URL + proposal.pdf.url,
     }
-    msg_plain = render_to_string('mail/concept_creator.txt', params)
-    msg_html = render_to_string('mail/concept_creator.html', params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email], html_message=msg_html)
+    msg_plain = render_to_string("mail/concept_creator.txt", params)
+    msg_html = render_to_string("mail/concept_creator.html", params)
+    send_mail(
+        subject,
+        msg_plain,
+        settings.EMAIL_FROM,
+        [proposal.created_by.email],
+        html_message=msg_html,
+    )
 
     if proposal.other_applicants:
-        params['creator'] = proposal.created_by.get_full_name()
-        msg_plain = render_to_string('mail/concept_other_applicants.txt', params)
-        msg_html = render_to_string('mail/concept_other_applicants.html', params)
+        params["creator"] = proposal.created_by.get_full_name()
+        msg_plain = render_to_string("mail/concept_other_applicants.txt", params)
+        msg_html = render_to_string("mail/concept_other_applicants.html", params)
 
         # Note: the original applicant gets the email as well as primary
         # recipient
@@ -85,23 +91,40 @@ def start_supervisor_phase(proposal):
         # doesn't support that. When moving to cdh.core mailing this should
         # be corrected
         applicants_to_remove = [proposal.supervisor]
-        other_applicants_emails = [applicant.email for applicant in proposal.applicants.all() if applicant not in applicants_to_remove]
-
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, other_applicants_emails, html_message=msg_html)
+        other_applicants_emails = [
+            applicant.email
+            for applicant in proposal.applicants.all()
+            if applicant not in applicants_to_remove
+        ]
+
+        send_mail(
+            subject,
+            msg_plain,
+            settings.EMAIL_FROM,
+            other_applicants_emails,
+            html_message=msg_html,
+        )
 
-    subject = _('FETC-GW {}: beoordelen als eindverantwoordelijke'.format(reference))
+    subject = _("FETC-GW {}: beoordelen als eindverantwoordelijke".format(reference))
     params = {
-        'proposal': proposal,
-        'creator': proposal.created_by.get_full_name(),
-        'proposal_url': settings.BASE_URL + reverse('reviews:decide', args=(decision.pk,)),
-        'secretary': get_secretary().get_full_name(),
-        'revision': proposal.is_revision,
-        'revision_type': proposal.type(),
-        'my_supervised': settings.BASE_URL + reverse('proposals:my_supervised'),
+        "proposal": proposal,
+        "creator": proposal.created_by.get_full_name(),
+        "proposal_url": settings.BASE_URL
+        + reverse("reviews:decide", args=(decision.pk,)),
+        "secretary": get_secretary().get_full_name(),
+        "revision": proposal.is_revision,
+        "revision_type": proposal.type(),
+        "my_supervised": settings.BASE_URL + reverse("proposals:my_supervised"),
     }
-    msg_plain = render_to_string('mail/concept_supervisor.txt', params)
-    msg_html = render_to_string('mail/concept_supervisor.html', params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.supervisor.email], html_message=msg_html)
+    msg_plain = render_to_string("mail/concept_supervisor.txt", params)
+    msg_html = render_to_string("mail/concept_supervisor.html", params)
+    send_mail(
+        subject,
+        msg_plain,
+        settings.EMAIL_FROM,
+        [proposal.supervisor.email],
+        html_message=msg_html,
+    )
 
     return review
 
@@ -127,7 +150,9 @@ def start_assignment_phase(proposal):
     review.short_route = short_route
 
     if short_route:
-        review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.SHORT_ROUTE_WEEKS)
+        review.date_should_end = timezone.now() + timezone.timedelta(
+            weeks=settings.SHORT_ROUTE_WEEKS
+        )
     review.save()
 
     proposal.date_submitted = timezone.now()
@@ -139,41 +164,58 @@ def start_assignment_phase(proposal):
 
     notify_secretary_assignment(review)
 
-    subject = _('FETC-GW {}: aanmelding ontvangen'.format(proposal.committee_prefixed_refnum()))
+    subject = _(
+        "FETC-GW {}: aanmelding ontvangen".format(proposal.committee_prefixed_refnum())
+    )
     params = {
-        'secretary': secretary.get_full_name(),
-        'review_date': review.date_should_end,
-        'pdf_url': settings.BASE_URL + proposal.pdf.url,
-        'title': proposal.title,
+        "secretary": secretary.get_full_name(),
+        "review_date": review.date_should_end,
+        "pdf_url": settings.BASE_URL + proposal.pdf.url,
+        "title": proposal.title,
     }
     if review.short_route:
-        msg_plain = render_to_string('mail/submitted_shortroute.txt', params)
-        msg_html = render_to_string('mail/submitted_shortroute.html', params)
+        msg_plain = render_to_string("mail/submitted_shortroute.txt", params)
+        msg_html = render_to_string("mail/submitted_shortroute.html", params)
     else:
-        msg_plain = render_to_string('mail/submitted_longroute.txt', params)
-        msg_html = render_to_string('mail/submitted_longroute.html', params)
+        msg_plain = render_to_string("mail/submitted_longroute.txt", params)
+        msg_html = render_to_string("mail/submitted_longroute.html", params)
     recipients = [proposal.created_by.email]
     if proposal.relation.needs_supervisor:
         recipients.append(proposal.supervisor.email)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, recipients, html_message=msg_html)
+    send_mail(
+        subject, msg_plain, settings.EMAIL_FROM, recipients, html_message=msg_html
+    )
 
     if proposal.supervisor is None and proposal.other_applicants:
-        params['creator'] = proposal.created_by.get_full_name()
+        params["creator"] = proposal.created_by.get_full_name()
         if review.short_route:
-            msg_plain = render_to_string('mail/submitted_shortroute_other_applicants.txt', params)
-            msg_html = render_to_string('mail/submitted_shortroute_other_applicants.html', params)
+            msg_plain = render_to_string(
+                "mail/submitted_shortroute_other_applicants.txt", params
+            )
+            msg_html = render_to_string(
+                "mail/submitted_shortroute_other_applicants.html", params
+            )
         else:
-            msg_plain = render_to_string('mail/submitted_longroute_other_applicants.txt', params)
-            msg_html = render_to_string('mail/submitted_longroute_other_applicants.html', params)
+            msg_plain = render_to_string(
+                "mail/submitted_longroute_other_applicants.txt", params
+            )
+            msg_html = render_to_string(
+                "mail/submitted_longroute_other_applicants.html", params
+            )
 
         # Note: the original applicant gets the email as well as primary
         # recipient
         # They should be regarded as CC'd, but the currently used mail API
         # doesn't support that. When moving to cdh.core mailing this should
         # be corrected
-        applicants_emails = [applicant.email for applicant in
-                             proposal.applicants.all()]
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, applicants_emails, html_message=msg_html)
+        applicants_emails = [applicant.email for applicant in proposal.applicants.all()]
+        send_mail(
+            subject,
+            msg_plain,
+            settings.EMAIL_FROM,
+            applicants_emails,
+            html_message=msg_html,
+        )
 
     if proposal.inform_local_staff:
         notify_local_staff(proposal)
@@ -195,7 +237,7 @@ def remind_reviewers():
         review__short_route=True,
         review__date_should_end__gte=today,
         review__date_should_end__lte=next_two_days,
-        go='',  # Checks if the decision has already been done; we don't
+        go="",  # Checks if the decision has already been done; we don't
         # check for None as the field cannot be None according to the field
         # definition
     )
@@ -206,13 +248,20 @@ def remind_reviewers():
             proposal.committee_prefixed_refnum(),
         )
         params = {
-            'creator': proposal.created_by.get_full_name(),
-            'proposal_url': settings.BASE_URL + reverse('reviews:decide', args=(decision.pk,)),
-            'secretary': get_secretary().get_full_name(),
+            "creator": proposal.created_by.get_full_name(),
+            "proposal_url": settings.BASE_URL
+            + reverse("reviews:decide", args=(decision.pk,)),
+            "secretary": get_secretary().get_full_name(),
         }
-        msg_plain = render_to_string('mail/reminder.txt', params)
-        msg_html = render_to_string('mail/reminder.html', params)
-        send_mail(subject, msg_plain, settings.EMAIL_FROM, [decision.reviewer.email], html_message=msg_html)
+        msg_plain = render_to_string("mail/reminder.txt", params)
+        msg_html = render_to_string("mail/reminder.html", params)
+        send_mail(
+            subject,
+            msg_plain,
+            settings.EMAIL_FROM,
+            [decision.reviewer.email],
+            html_message=msg_html,
+        )
 
 
 def start_review_pre_assessment(proposal):
@@ -228,7 +277,9 @@ def start_review_pre_assessment(proposal):
     review = Review.objects.create(proposal=proposal, date_start=timezone.now())
     review.stage = Review.Stages.ASSIGNMENT
     review.short_route = True
-    review.date_should_end = timezone.now() + timezone.timedelta(weeks=settings.PREASSESSMENT_ROUTE_WEEKS)
+    review.date_should_end = timezone.now() + timezone.timedelta(
+        weeks=settings.PREASSESSMENT_ROUTE_WEEKS
+    )
     review.save()
 
     proposal.date_submitted = timezone.now()
@@ -238,27 +289,36 @@ def start_review_pre_assessment(proposal):
     secretary = get_secretary()
     Decision.objects.create(review=review, reviewer=secretary)
 
-    subject = _('FETC-GW {}: nieuwe aanvraag voor voortoetsing'.format(
-        proposal.committee_prefixed_refnum(),
+    subject = _(
+        "FETC-GW {}: nieuwe aanvraag voor voortoetsing".format(
+            proposal.committee_prefixed_refnum(),
         )
-                )
-                
+    )
+
     params = {
-        'secretary': secretary.get_full_name(),
-        'proposal': proposal,
-        'proposal_pdf': settings.BASE_URL + proposal.pdf.url,
+        "secretary": secretary.get_full_name(),
+        "proposal": proposal,
+        "proposal_pdf": settings.BASE_URL + proposal.pdf.url,
     }
-    msg_plain = render_to_string('mail/pre_assessment_secretary.txt', params)
-    msg_html = render_to_string('mail/pre_assessment_secretary.html', params)
-    send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email], html_message=msg_html)
+    msg_plain = render_to_string("mail/pre_assessment_secretary.txt", params)
+    msg_html = render_to_string("mail/pre_assessment_secretary.html", params)
+    send_mail(
+        subject,
+        msg_plain,
+        settings.EMAIL_FROM,
+        [secretary.email],
+        html_message=msg_html,
+    )
 
-    subject = _('FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing'.format(
-        proposal.committee_prefixed_refnum(),)
-                )
+    subject = _(
+        "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing".format(
+            proposal.committee_prefixed_refnum(),
+        )
+    )
     params = {
-        'secretary': secretary.get_full_name(),
+        "secretary": secretary.get_full_name(),
     }
-    msg_plain = render_to_string('mail/pre_assessment_creator.txt', params)
+    msg_plain = render_to_string("mail/pre_assessment_creator.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [proposal.created_by.email])
 
     return review
@@ -269,28 +329,32 @@ def start_review_route(review, commission_users, use_short_route):
     Creates Decisions and sends notification e-mail to the selected Reviewers
     """
 
-    template = 'mail/assignment_shortroute.txt' if use_short_route else 'mail/assignment_longroute.txt'
+    template = (
+        "mail/assignment_shortroute.txt"
+        if use_short_route
+        else "mail/assignment_longroute.txt"
+    )
 
     was_revised = review.proposal.is_revision
 
     if was_revised:
-        subject = 'FETC-GW {}: gereviseerde aanvraag ter beoordeling'
+        subject = "FETC-GW {}: gereviseerde aanvraag ter beoordeling"
     else:
-        subject = 'FETC-GW {}: nieuwe aanvraag ter beoordeling'
+        subject = "FETC-GW {}: nieuwe aanvraag ter beoordeling"
         # These emails are Dutch-only, therefore intentionally untranslated
 
-    subject = subject.format(review.proposal.committee_prefixed_refnum(),
-                             )
+    subject = subject.format(
+        review.proposal.committee_prefixed_refnum(),
+    )
 
     for user in commission_users:
-
         Decision.objects.create(review=review, reviewer=user)
         params = {
-            'secretary': get_secretary().get_full_name(),
-            'reviewer': user.get_full_name(),
-            'review_date': review.date_should_end,
-            'is_pre_assessment': review.proposal.is_pre_assessment,
-            'was_revised': was_revised,
+            "secretary": get_secretary().get_full_name(),
+            "reviewer": user.get_full_name(),
+            "review_date": review.date_should_end,
+            "is_pre_assessment": review.proposal.is_pre_assessment,
+            "was_revised": was_revised,
         }
         msg_plain = render_to_string(template, params)
         send_mail(subject, msg_plain, settings.EMAIL_FROM, [user.email])
@@ -303,12 +367,14 @@ def notify_secretary_assignment(review):
     secretary = get_secretary()
     proposal = review.proposal
     committee = review.proposal.reviewing_committee
-    subject = _('FETC-GW {}: nieuwe aanvraag ingediend').format(proposal.committee_prefixed_refnum())
+    subject = _("FETC-GW {}: nieuwe aanvraag ingediend").format(
+        proposal.committee_prefixed_refnum()
+    )
     params = {
-        'secretary': secretary.get_full_name(),
-        'review': review,
+        "secretary": secretary.get_full_name(),
+        "review": review,
     }
-    msg_plain = render_to_string('mail/submitted.txt', params)
+    msg_plain = render_to_string("mail/submitted.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
 
@@ -318,16 +384,17 @@ def notify_secretary(decision):
     """
     secretary = get_secretary()
     proposal = decision.review.proposal
-    subject = _('FETC-GW {}: nieuwe beoordeling toegevoegd').format(
+    subject = _("FETC-GW {}: nieuwe beoordeling toegevoegd").format(
         proposal.committee_prefixed_refnum(),
     )
     params = {
-        'secretary': secretary.get_full_name(),
-        'decision': decision,
+        "secretary": secretary.get_full_name(),
+        "decision": decision,
     }
-    msg_plain = render_to_string('mail/decision_notify.txt', params)
+    msg_plain = render_to_string("mail/decision_notify.txt", params)
     send_mail(subject, msg_plain, settings.EMAIL_FROM, [secretary.email])
 
+
 def notify_secretary_all_decisions(review):
     """
     Notifies a secretary all Decisions have been made for a certain review
@@ -361,18 +428,20 @@ def notify_supervisor_nogo(decision):
     proposal = decision.review.proposal
     supervisor = proposal.supervisor
     receivers = set(applicant for applicant in proposal.applicants.all())
-    subject = _('FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld'.format(
-        proposal.committee_prefixed_refnum(),)
+    subject = _(
+        "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld".format(
+            proposal.committee_prefixed_refnum(),
+        )
     )
     params = {
-        'secretary': secretary.get_full_name(),
-        'decision': decision,
-        'supervisor': supervisor,
+        "secretary": secretary.get_full_name(),
+        "decision": decision,
+        "supervisor": supervisor,
     }
 
     for applicant in receivers:
-        params['applicant'] = applicant
-        msg_plain = render_to_string('mail/supervisor_decision.txt', params)
+        params["applicant"] = applicant
+        msg_plain = render_to_string("mail/supervisor_decision.txt", params)
         send_mail(subject, msg_plain, settings.EMAIL_FROM, [applicant.email])
 
 
@@ -385,40 +454,66 @@ def auto_review(proposal: Proposal):
     reasons = []
 
     for study in proposal.study_set.all():
-
         if study.legally_incapable:
-            reasons.append(_('De aanvraag bevat het gebruik van wilsonbekwame volwassenen.'))
+            reasons.append(
+                _("De aanvraag bevat het gebruik van wilsonbekwame volwassenen.")
+            )
 
         if study.deception in [YesNoDoubt.YES, YesNoDoubt.DOUBT]:
-            reasons.append(_('De aanvraag bevat het gebruik van misleiding.'))
+            reasons.append(_("De aanvraag bevat het gebruik van misleiding."))
 
         if study.hierarchy:
-            reasons.append(_('Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)'))
+            reasons.append(
+                _(
+                    "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
+                )
+            )
 
         if study.has_special_details:
-            reasons.append(_('Het onderzoek verzamelt bijzondere persoonsgegevens.'))
+            reasons.append(_("Het onderzoek verzamelt bijzondere persoonsgegevens."))
 
         if study.has_traits:
-            reasons.append(_('Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht verhoogde kwetsbaarheid met zich meebrengen.'))
+            reasons.append(
+                _(
+                    "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht verhoogde kwetsbaarheid met zich meebrengen."
+                )
+            )
 
         for task in Task.objects.filter(session__study=study):
             reasons.extend(auto_review_task(study, task))
 
         if study.stressful in [YesNoDoubt.YES, YesNoDoubt.DOUBT]:
-            reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
-als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen.'))
+            reasons.append(
+                _(
+                    "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op onderdelen of \
+als geheel zodanig belastend is dat deze ondanks de verkregen informed consent vragen zou kunnen oproepen."
+                )
+            )
 
         if study.risk in [YesNoDoubt.YES, YesNoDoubt.DOUBT]:
-            reasons.append(_('De onderzoeker geeft aan dat (of twijfelt erover of) de risico\'s op psychische of \
-fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn.'))
+            reasons.append(
+                _(
+                    "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op psychische of \
+fysieke schade bij deelname aan het onderzoek meer dan minimaal zijn."
+                )
+            )
 
         if study.has_sessions:
             for session in study.session_set.all():
                 for age_group in study.age_groups.all():
                     if session.net_duration() > age_group.max_net_duration:
-                        reasons.append(_('De totale duur van de taken in sessie {s}, exclusief pauzes \
+                        reasons.append(
+                            _(
+                                "De totale duur van de taken in sessie {s}, exclusief pauzes \
 en andere niet-taak elementen ({d} minuten), is groter dan het streefmaximum ({max_d} minuten) \
-voor de leeftijdsgroep {ag}.').format(s=session.order, ag=age_group, d=session.net_duration(), max_d=age_group.max_net_duration))
+voor de leeftijdsgroep {ag}."
+                            ).format(
+                                s=session.order,
+                                ag=age_group,
+                                d=session.net_duration(),
+                                max_d=age_group.max_net_duration,
+                            )
+                        )
 
     return reasons
 
@@ -433,18 +528,30 @@ def auto_review_observation(observation):
 
     if observation.settings_requires_review():
         for setting in observation.settings_requires_review():
-            reasons.append(_('Het onderzoek observeert deelnemers in de volgende setting: {s}').format(s=setting))
+            reasons.append(
+                _(
+                    "Het onderzoek observeert deelnemers in de volgende setting: {s}"
+                ).format(s=setting)
+            )
 
     if observation.is_nonpublic_space:
         if not observation.has_advanced_consent:
-            reasons.append(_('Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met informed consent achteraf.'))
+            reasons.append(
+                _(
+                    "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met informed consent achteraf."
+                )
+            )
         if observation.is_anonymous:
-            reasons.append(_('De onderzoeker begeeft zich "under cover" in een beheerde niet-publieke ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie deel en/of verzamelt data die te herleiden zijn tot individuele personen.'))
+            reasons.append(
+                _(
+                    'De onderzoeker begeeft zich "under cover" in een beheerde niet-publieke ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie deel en/of verzamelt data die te herleiden zijn tot individuele personen.'
+                )
+            )
 
     for registration in observation.registrations.all():
         if registration.requires_review:
             reasons.append(
-                _('De aanvraag bevat het gebruik van {}').format(
+                _("De aanvraag bevat het gebruik van {}").format(
                     registration.description
                 )
             )
@@ -464,8 +571,15 @@ def auto_review_task(study, task):
         if registration.requires_review:
             if registration.age_min:
                 for age_group in study.age_groups.all():
-                    if age_group.age_max is not None and age_group.age_max < registration.age_min:
-                        reasons.append(_('De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar.').format(registration.age_min))
+                    if (
+                        age_group.age_max is not None
+                        and age_group.age_max < registration.age_min
+                    ):
+                        reasons.append(
+                            _(
+                                "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
+                            ).format(registration.age_min)
+                        )
                         break
 
     return reasons
@@ -474,7 +588,7 @@ def auto_review_task(study, task):
 def discontinue_review(review):
     """
     Set continuation to discontinued on the given review,
-    and set DECISION_MADE on its proposal. """
+    and set DECISION_MADE on its proposal."""
 
     # Set review continuation
     review.continuation = review.Continuations.DISCONTINUED
@@ -499,21 +613,17 @@ def assign_reviewers(review, list_of_users, route):
     obsolete_reviewers = current_reviewers - list_of_users
 
     if review.proposal.is_revision:
-        #Revisions should end in one week.
-        review.date_should_end = timezone.now() + \
-            timezone.timedelta(
-                weeks=1
-            )
+        # Revisions should end in one week.
+        review.date_should_end = timezone.now() + timezone.timedelta(weeks=1)
     elif review.date_should_end is not None:
-        #if the date_end_variable gets assigned through auto review
-        #the review keeps this date
+        # if the date_end_variable gets assigned through auto review
+        # the review keeps this date
         pass
     elif route == True:
-        #The short route reviews should take two weeks.
-        review.date_should_end = timezone.now() + \
-            timezone.timedelta(
-                weeks=settings.SHORT_ROUTE_WEEKS
-            )
+        # The short route reviews should take two weeks.
+        review.date_should_end = timezone.now() + timezone.timedelta(
+            weeks=settings.SHORT_ROUTE_WEEKS
+        )
     elif route == False:
         # We have no desired end date for long track reviews
         review.date_should_end = None
@@ -522,8 +632,7 @@ def assign_reviewers(review, list_of_users, route):
     start_review_route(review, new_reviewers, route)
 
     # Remove the Decision for obsolete reviewers
-    Decision.objects.filter(review=review,
-                            reviewer__in=obsolete_reviewers).delete()
+    Decision.objects.filter(review=review, reviewer__in=obsolete_reviewers).delete()
 
     review.save()
 
@@ -531,6 +640,7 @@ def assign_reviewers(review, list_of_users, route):
     # This prevents it waiting for removed reviewers
     review.update_go()
 
+
 def straight_to_revision(review):
     """This action by the secretary in ReviewAssignForm bypasses
     the usual review process and sends a review straight to revision"""
diff --git a/reviews/views.py b/reviews/views.py
index 8b0f8f53a..0430a062f 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -104,8 +104,8 @@ def __init__(self, **kwargs):
     def post(self, request, *args, **kwargs):
         form = self.get_form()
         if form.is_valid():
-            self.start_date = form.cleaned_data['start_date']
-            self.end_date = form.cleaned_data['end_date']
+            self.start_date = form.cleaned_data["start_date"]
+            self.end_date = form.cleaned_data["end_date"]
         else:
             return self.form_invalid(form)
 
@@ -435,7 +435,9 @@ def get_initial(self):
         review = self.get_object()
 
         initial = super(ReviewCloseView, self).get_initial()
-        initial["continuation"] = Review.Continuations.GO if review.go else Review.Continuations.NO_GO
+        initial["continuation"] = (
+            Review.Continuations.GO if review.go else Review.Continuations.NO_GO
+        )
 
         if review.proposal.date_start and review.proposal.date_start < date.today():
             initial["continuation"] = (
@@ -525,7 +527,9 @@ def get_redirect_url(self, *args, **kwargs):
         return reverse("reviews:decide", args=[decision_pk])
 
 
-class DecisionUpdateView(LoginRequiredMixin, UserAllowedToDecisionMixin, generic.UpdateView):
+class DecisionUpdateView(
+    LoginRequiredMixin, UserAllowedToDecisionMixin, generic.UpdateView
+):
     """
     Allows a User to make a Decision on a Review.
     """
@@ -555,8 +559,7 @@ def form_valid(self, form):
     def handle_review_closed(self, request, exception):
         # Redirect to our 'this review is closed' page for supervisor reviews
         redirect_url = reverse(
-            "reviews:review-closed-decision",
-            args=[self.get_object().pk]
+            "reviews:review-closed-decision", args=[self.get_object().pk]
         )
         # And go to the details page for committee reviews
         if self.get_object().review.is_committee_review:
@@ -564,31 +567,33 @@ def handle_review_closed(self, request, exception):
             messages.warning(
                 request,
                 _(
-                    'Deze aanvraag is al beoordeeld, dus je kan je beoordeling '
-                    'niet meer toevoegen/aanpassen'
-                )
+                    "Deze aanvraag is al beoordeeld, dus je kan je beoordeling "
+                    "niet meer toevoegen/aanpassen"
+                ),
             )
             redirect_url = self.get_success_url()
 
         return HttpResponseRedirect(redirect_url)
 
 
-class ReviewClosedDecisionView(LoginRequiredMixin, UserAllowedToDecisionMixin,
-                       generic.DetailView):
+class ReviewClosedDecisionView(
+    LoginRequiredMixin, UserAllowedToDecisionMixin, generic.DetailView
+):
     """Custom page for supervisors visiting links to already concluded
     supervisor reviews
     """
+
     template_name = "reviews/review_closed.html"
     model = Decision
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
 
-        context['review'] = self.object.review
+        context["review"] = self.object.review
 
         return context
 
     def handle_review_closed(self, request, exception):
         # Do nothing; we only use the permission check, this page is only for
         # cases where the review is closed.
-        return None
\ No newline at end of file
+        return None
diff --git a/studies/__init__.py b/studies/__init__.py
index 3ef413dfb..942fa199c 100644
--- a/studies/__init__.py
+++ b/studies/__init__.py
@@ -1 +1 @@
-default_app_config = 'studies.app.StudiesConfig'
\ No newline at end of file
+default_app_config = "studies.app.StudiesConfig"
diff --git a/studies/admin.py b/studies/admin.py
index 85a23ac2c..3dc5744ab 100644
--- a/studies/admin.py
+++ b/studies/admin.py
@@ -5,32 +5,56 @@
 
 @admin.register(AgeGroup)
 class AgeGroupAdmin(admin.ModelAdmin):
-    list_display = ('description', 'age_min', 'is_active', 'age_max', 'is_adult', 'needs_details', 'max_net_duration', )
-    list_display_links = ('description', )
-    ordering = ['age_min']
+    list_display = (
+        "description",
+        "age_min",
+        "is_active",
+        "age_max",
+        "is_adult",
+        "needs_details",
+        "max_net_duration",
+    )
+    list_display_links = ("description",)
+    ordering = ["age_min"]
 
 
 @admin.register(Trait)
 class TraitAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'needs_details', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "needs_details",
+    )
+    ordering = ["order"]
 
 
 @admin.register(Compensation)
 class CompensationAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'needs_details', 'requires_review', )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "needs_details",
+        "requires_review",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
 
 
 @admin.register(Recruitment)
 class RecruitmentAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'is_local', 'needs_details', 'requires_review', )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "is_local",
+        "needs_details",
+        "requires_review",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
+
 
 @admin.register(SpecialDetail)
 class SpecialDetailAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'medical_traits')
-    list_display_links = ('description', )
-    ordering = ['order']
\ No newline at end of file
+    list_display = ("order", "description", "medical_traits")
+    list_display_links = ("description",)
+    ordering = ["order"]
diff --git a/studies/app.py b/studies/app.py
index a62b8d6d1..12b40970d 100644
--- a/studies/app.py
+++ b/studies/app.py
@@ -1,8 +1,9 @@
 from django.apps import AppConfig
 
+
 class StudiesConfig(AppConfig):
-    name = 'studies'
-    verbose_name = 'studies'
+    name = "studies"
+    verbose_name = "studies"
 
     def ready(self):
-        import studies.signals.handlers
\ No newline at end of file
+        import studies.signals.handlers
diff --git a/studies/forms.py b/studies/forms.py
index b71d4a61c..10a07fe4c 100644
--- a/studies/forms.py
+++ b/studies/forms.py
@@ -16,31 +16,42 @@ class StudyForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Study
         fields = [
-            'age_groups',
-            'legally_incapable', 'legally_incapable_details',
-            'has_special_details', 'special_details',
-            'traits', 'traits_details',
-            'necessity', 'necessity_reason',
-            'recruitment', 'recruitment_details',
-            'compensation', 'compensation_details',
-            'hierarchy', 'hierarchy_details'
+            "age_groups",
+            "legally_incapable",
+            "legally_incapable_details",
+            "has_special_details",
+            "special_details",
+            "traits",
+            "traits_details",
+            "necessity",
+            "necessity_reason",
+            "recruitment",
+            "recruitment_details",
+            "compensation",
+            "compensation_details",
+            "hierarchy",
+            "hierarchy_details",
         ]
         widgets = {
-            'age_groups':        forms.CheckboxSelectMultiple(),
-            'legally_incapable': forms.RadioSelect(choices=YES_NO),
-            'has_special_details': forms.RadioSelect(choices=YES_NO),
-            'hierarchy':         forms.RadioSelect(choices=YES_NO),
-            'special_details':   forms.CheckboxSelectMultiple(),
-            'traits':            forms.CheckboxSelectMultiple(),
-            'necessity':         forms.RadioSelect(),
-            'recruitment':       forms.CheckboxSelectMultiple(),
-            'compensation':      forms.RadioSelect(),
+            "age_groups": forms.CheckboxSelectMultiple(),
+            "legally_incapable": forms.RadioSelect(choices=YES_NO),
+            "has_special_details": forms.RadioSelect(choices=YES_NO),
+            "hierarchy": forms.RadioSelect(choices=YES_NO),
+            "special_details": forms.CheckboxSelectMultiple(),
+            "traits": forms.CheckboxSelectMultiple(),
+            "necessity": forms.RadioSelect(),
+            "recruitment": forms.CheckboxSelectMultiple(),
+            "compensation": forms.RadioSelect(),
         }
         mark_safe_lazy = lazy(mark_safe, str)
         labels = {
-            'legally_incapable': mark_safe_lazy(_('Maakt jouw onderzoek gebruik van '
-                                             'wils<u>on</u>bekwame ('
-                                             'volwassen) deelnemers?'))
+            "legally_incapable": mark_safe_lazy(
+                _(
+                    "Maakt jouw onderzoek gebruik van "
+                    "wils<u>on</u>bekwame ("
+                    "volwassen) deelnemers?"
+                )
+            )
         }
 
     def __init__(self, *args, **kwargs):
@@ -51,15 +62,14 @@ def __init__(self, *args, **kwargs):
         - Reset the choices for necessity
         """
         self._soft_validation_fields = self._meta.fields
-        self.proposal = kwargs.pop('proposal', None)
+        self.proposal = kwargs.pop("proposal", None)
 
         super(StudyForm, self).__init__(*args, **kwargs)
-        self.fields['compensation'].empty_label = None
-        self.fields['necessity'].empty_label = None
-        self.fields['necessity'].choices = YesNoDoubt.choices
+        self.fields["compensation"].empty_label = None
+        self.fields["necessity"].empty_label = None
+        self.fields["necessity"].choices = YesNoDoubt.choices
 
-        self.fields['age_groups'].queryset = AgeGroup.objects.filter(
-            is_active=True)
+        self.fields["age_groups"].queryset = AgeGroup.objects.filter(is_active=True)
 
     def clean(self):
         """
@@ -74,42 +84,65 @@ def clean(self):
         """
         cleaned_data = super(StudyForm, self).clean()
 
-        self.mark_soft_required(cleaned_data, 'compensation', 'recruitment')
+        self.mark_soft_required(cleaned_data, "compensation", "recruitment")
 
         self.necessity_required(cleaned_data)
-        self.check_dependency(cleaned_data, 'legally_incapable',
-                              'legally_incapable_details')
-        self.check_dependency_multiple(cleaned_data, 'special_details',
-            'medical_traits', 'traits', _('Je dient minimaal een bijzonder kenmerk te selecteren.'))
-        self.check_dependency(cleaned_data, 'has_special_details', 'special_details', True, _(
-            'Je dient minimaal één type gegevens te selecteren.'))
-        self.check_dependency_multiple(cleaned_data, 'traits', 'needs_details',
-                                       'traits_details')
-        self.check_dependency_singular(cleaned_data, 'compensation',
-                                       'needs_details', 'compensation_details')
-        self.check_dependency_multiple(cleaned_data, 'recruitment',
-                                       'needs_details', 'recruitment_details')
-        self.check_dependency(cleaned_data, 'hierarchy', 'hierarchy_details', True, _('Leg uit wat de hiërarchische relatie is.'))
-        
+        self.check_dependency(
+            cleaned_data, "legally_incapable", "legally_incapable_details"
+        )
+        self.check_dependency_multiple(
+            cleaned_data,
+            "special_details",
+            "medical_traits",
+            "traits",
+            _("Je dient minimaal een bijzonder kenmerk te selecteren."),
+        )
+        self.check_dependency(
+            cleaned_data,
+            "has_special_details",
+            "special_details",
+            True,
+            _("Je dient minimaal één type gegevens te selecteren."),
+        )
+        self.check_dependency_multiple(
+            cleaned_data, "traits", "needs_details", "traits_details"
+        )
+        self.check_dependency_singular(
+            cleaned_data, "compensation", "needs_details", "compensation_details"
+        )
+        self.check_dependency_multiple(
+            cleaned_data, "recruitment", "needs_details", "recruitment_details"
+        )
+        self.check_dependency(
+            cleaned_data,
+            "hierarchy",
+            "hierarchy_details",
+            True,
+            _("Leg uit wat de hiërarchische relatie is."),
+        )
+
     def necessity_required(self, cleaned_data):
         """
         Check whether necessity_reason was required and if so, if it has been filled out.
         """
-        age_groups = cleaned_data['age_groups'].values_list('id',
-                                                            flat=True) if 'age_groups' in cleaned_data else []
-        legally_incapable = bool(cleaned_data['legally_incapable'])
-        if check_necessity_required(self.proposal, age_groups,
-                                    legally_incapable):
-            if not cleaned_data['necessity_reason']:
-                error = forms.ValidationError(_('Dit veld is verplicht.'),
-                                              code='required')
-                self.add_error('necessity_reason', error)
+        age_groups = (
+            cleaned_data["age_groups"].values_list("id", flat=True)
+            if "age_groups" in cleaned_data
+            else []
+        )
+        legally_incapable = bool(cleaned_data["legally_incapable"])
+        if check_necessity_required(self.proposal, age_groups, legally_incapable):
+            if not cleaned_data["necessity_reason"]:
+                error = forms.ValidationError(
+                    _("Dit veld is verplicht."), code="required"
+                )
+                self.add_error("necessity_reason", error)
 
 
 class StudyDesignForm(forms.ModelForm):
     class Meta:
         model = Study
-        fields = ['has_intervention', 'has_observation', 'has_sessions']
+        fields = ["has_intervention", "has_observation", "has_sessions"]
 
     def clean(self):
         """
@@ -117,29 +150,28 @@ def clean(self):
         - at least one of the fields has to be checked
         """
         cleaned_data = super(StudyDesignForm, self).clean()
-        if not (cleaned_data.get('has_intervention') or cleaned_data.get(
-                'has_observation') or cleaned_data.get('has_sessions')):
-            msg = _(u'Je dient minstens één van de opties te selecteren')
-            self.add_error('has_sessions',
-                           forms.ValidationError(msg, code='required'))
+        if not (
+            cleaned_data.get("has_intervention")
+            or cleaned_data.get("has_observation")
+            or cleaned_data.get("has_sessions")
+        ):
+            msg = _("Je dient minstens één van de opties te selecteren")
+            self.add_error("has_sessions", forms.ValidationError(msg, code="required"))
 
 
 class StudyConsentForm(ConditionalModelForm):
     class Meta:
         model = Documents
         fields = [
-            'proposal',
-            'study',
-            'informed_consent',
-            'briefing',
-            'director_consent_declaration',
-            'director_consent_information',
-            'parents_information'
+            "proposal",
+            "study",
+            "informed_consent",
+            "briefing",
+            "director_consent_declaration",
+            "director_consent_information",
+            "parents_information",
         ]
-        widgets = {
-            'proposal': forms.HiddenInput,
-            'study':    forms.HiddenInput
-        }
+        widgets = {"proposal": forms.HiddenInput, "study": forms.HiddenInput}
 
     def clean(self):
         cleaned_data = super(StudyConsentForm, self).clean()
@@ -149,27 +181,31 @@ class StudyEndForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Study
         fields = [
-            'deception', 'deception_details',
-            'negativity', 'negativity_details',
-            'stressful', 'stressful_details',
-            'risk', 'risk_details',
+            "deception",
+            "deception_details",
+            "negativity",
+            "negativity_details",
+            "stressful",
+            "stressful_details",
+            "risk",
+            "risk_details",
         ]
         widgets = {
-            'deception':  forms.RadioSelect(),
-            'negativity': forms.RadioSelect(),
-            'stressful':  forms.RadioSelect(),
-            'risk':       forms.RadioSelect(),
+            "deception": forms.RadioSelect(),
+            "negativity": forms.RadioSelect(),
+            "stressful": forms.RadioSelect(),
+            "risk": forms.RadioSelect(),
         }
 
     _soft_validation_fields = [
-        'deception',
-        'deception_details',
-        'negativity',
-        'negativity_details',
-        'stressful',
-        'stressful_details',
-        'risk',
-        'risk_detail',
+        "deception",
+        "deception_details",
+        "negativity",
+        "negativity_details",
+        "stressful",
+        "stressful_details",
+        "risk",
+        "risk_detail",
     ]
 
     def __init__(self, *args, **kwargs):
@@ -178,28 +214,26 @@ def __init__(self, *args, **kwargs):
         - Remove empty label from deception/negativity/stressful/risk field and reset the choices
         - mark_safe the labels of negativity/stressful/risk
         """
-        self.study = kwargs.pop('study', None)
+        self.study = kwargs.pop("study", None)
 
         super(StudyEndForm, self).__init__(*args, **kwargs)
 
-        self.fields['deception'].empty_label = None
-        self.fields['deception'].choices = YesNoDoubt.choices
-        self.fields['negativity'].empty_label = None
-        self.fields['negativity'].choices = YesNoDoubt.choices
-        self.fields['stressful'].empty_label = None
-        self.fields['stressful'].choices = YesNoDoubt.choices
-        self.fields['risk'].empty_label = None
-        self.fields['risk'].choices = YesNoDoubt.choices
-
-        self.fields['negativity'].label = mark_safe(
-            self.fields['negativity'].label)
-        self.fields['stressful'].label = mark_safe(
-            self.fields['stressful'].label)
-        self.fields['risk'].label = mark_safe(self.fields['risk'].label)
+        self.fields["deception"].empty_label = None
+        self.fields["deception"].choices = YesNoDoubt.choices
+        self.fields["negativity"].empty_label = None
+        self.fields["negativity"].choices = YesNoDoubt.choices
+        self.fields["stressful"].empty_label = None
+        self.fields["stressful"].choices = YesNoDoubt.choices
+        self.fields["risk"].empty_label = None
+        self.fields["risk"].choices = YesNoDoubt.choices
+
+        self.fields["negativity"].label = mark_safe(self.fields["negativity"].label)
+        self.fields["stressful"].label = mark_safe(self.fields["stressful"].label)
+        self.fields["risk"].label = mark_safe(self.fields["risk"].label)
 
         if not self.study.has_sessions:
-            del self.fields['deception']
-            del self.fields['deception_details']
+            del self.fields["deception"]
+            del self.fields["deception_details"]
 
     def clean(self):
         """
@@ -212,27 +246,35 @@ def clean(self):
         cleaned_data = super(StudyEndForm, self).clean()
 
         # TODO: find a way to hide this on the first view
-        self.mark_soft_required(
-            cleaned_data,
-            'negativity',
-            'stressful',
-            'risk'
-        )
+        self.mark_soft_required(cleaned_data, "negativity", "stressful", "risk")
 
-        if 'deception' in self.fields:
-            self.mark_soft_required(cleaned_data, 'deception')
+        if "deception" in self.fields:
+            self.mark_soft_required(cleaned_data, "deception")
 
-        self.check_dependency_list(cleaned_data, 'deception',
-                                   'deception_details',
-                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
-        self.check_dependency_list(cleaned_data, 'negativity',
-                                   'negativity_details',
-                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
-        self.check_dependency_list(cleaned_data, 'stressful',
-                                   'stressful_details',
-                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
-        self.check_dependency_list(cleaned_data, 'risk', 'risk_details',
-                                   f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT])
+        self.check_dependency_list(
+            cleaned_data,
+            "deception",
+            "deception_details",
+            f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT],
+        )
+        self.check_dependency_list(
+            cleaned_data,
+            "negativity",
+            "negativity_details",
+            f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT],
+        )
+        self.check_dependency_list(
+            cleaned_data,
+            "stressful",
+            "stressful_details",
+            f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT],
+        )
+        self.check_dependency_list(
+            cleaned_data,
+            "risk",
+            "risk_details",
+            f1_value_list=[YesNoDoubt.YES, YesNoDoubt.DOUBT],
+        )
 
 
 class StudyUpdateAttachmentsForm(forms.ModelForm):
@@ -240,11 +282,11 @@ class Meta:
         model = Documents
         fields = [
             # 'passive_consent',
-            'informed_consent',
-            'briefing',
-            'director_consent_declaration',
-            'director_consent_information',
-            'parents_information'
+            "informed_consent",
+            "briefing",
+            "director_consent_declaration",
+            "director_consent_information",
+            "parents_information",
         ]
         widgets = {
             # 'passive_consent': forms.HiddenInput
@@ -254,11 +296,11 @@ class Meta:
 class SessionStartForm(forms.ModelForm):
     class Meta:
         model = Study
-        fields = ['sessions_number']
+        fields = ["sessions_number"]
 
     def __init__(self, *args, **kwargs):
         """
         - Set the sessions_number field as required
         """
         super(SessionStartForm, self).__init__(*args, **kwargs)
-        self.fields['sessions_number'].required = True
+        self.fields["sessions_number"].required = True
diff --git a/studies/migrations/0001_initial.py b/studies/migrations/0001_initial.py
index b0dbc3bfa..8c0bca891 100644
--- a/studies/migrations/0001_initial.py
+++ b/studies/migrations/0001_initial.py
@@ -7,107 +7,321 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0001_initial'),
+        ("proposals", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='AgeGroup',
+            name="AgeGroup",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('age_min', models.PositiveIntegerField()),
-                ('age_max', models.PositiveIntegerField(null=True, blank=True)),
-                ('description', models.CharField(max_length=200)),
-                ('is_adult', models.BooleanField(default=False)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('max_net_duration', models.PositiveIntegerField()),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("age_min", models.PositiveIntegerField()),
+                ("age_max", models.PositiveIntegerField(null=True, blank=True)),
+                ("description", models.CharField(max_length=200)),
+                ("is_adult", models.BooleanField(default=False)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("max_net_duration", models.PositiveIntegerField()),
             ],
         ),
         migrations.CreateModel(
-            name='Compensation',
+            name="Compensation",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('requires_review', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("requires_review", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Recruitment',
+            name="Recruitment",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('requires_review', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("requires_review", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Study',
+            name="Study",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField()),
-                ('name', models.CharField(max_length=15, verbose_name='Naam traject', blank=True)),
-                ('legally_incapable', models.BooleanField(default=False, help_text='Wilsonbekwame volwassenen zijn volwassenen die waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.', verbose_name='Maakt uw studie gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?')),
-                ('legally_incapable_details', models.TextField(verbose_name='Licht toe', blank=True)),
-                ('has_traits', models.NullBooleanField(verbose_name='Deelnemers kunnen ge\xefncludeerd worden op bepaalde bijzondere kenmerken. Is dit in uw studie bij (een deel van) de deelnemers het geval?')),
-                ('traits_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('necessity', models.CharField(blank=True, help_text='Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou u de vraag ook kunnen beantwoorden door volwassen deelnemers te testen?', max_length=1, verbose_name='Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het geselecteerde type deelnemer aan de studie te laten meedoen?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('necessity_reason', models.TextField(verbose_name='Leg uit waarom', blank=True)),
-                ('recruitment_details', models.TextField(verbose_name='Licht toe', blank=True)),
-                ('compensation_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('has_intervention', models.BooleanField(default=False, verbose_name='Interventieonderzoek')),
-                ('has_observation', models.BooleanField(default=False, verbose_name='Observatieonderzoek')),
-                ('has_sessions', models.BooleanField(default=False, verbose_name='Taakonderzoek')),
-                ('informed_consent', models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc])),
-                ('briefing', models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc])),
-                ('passive_consent', models.BooleanField(default=False, help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://etcl.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de ETCL-website</a>.', verbose_name='Maakt u gebruik van passieve informed consent?')),
-                ('sessions_number', models.PositiveIntegerField(help_text='Wanneer u bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en u laat de deelnemer nog een keer terugkomen om dezelfde taak/taken of andere taak/taken te doen, dan spreken we van twee sessies. Wanneer u meerdere taken afneemt op dezelfde dag, met pauzes daartussen, dan geldt dat toch als \xe9\xe9n sessie.', null=True, verbose_name='Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?', validators=[django.core.validators.MinValueValidator(1)])),
-                ('deception', models.CharField(blank=True, help_text='Misleiding is het doelbewust verschaffen van inaccurate informatie over het doel en/of belangrijke aspecten van de gang van zaken tijdens de studie. Denk aan zaken als een bewust misleidende "cover story" voor het experiment; het ten onrechte suggereren dat er met andere deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: het gaat hierbij niet om fillers.', max_length=1, verbose_name='Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de deelnemer?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('deception_details', models.TextField(verbose_name='Geef een toelichting en beschrijf hoe en wanneer de deelnemer zal worden gedebrieft.', blank=True)),
-                ('negativity', models.CharField(blank=True, max_length=1, verbose_name='Bevat bovenstaand onderzoekstraject elementen die <em>tijdens</em> de deelname niet-triviale negatieve emoties kunnen opwekken? Denk hierbij bijvoorbeeld aan emotioneel indringende vragen, kwetsende uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of (heel) saaie taken.', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('negativity_details', models.TextField(verbose_name='Licht uw antwoord toe.', blank=True)),
-                ('stressful', models.CharField(blank=True, help_text="Dit zou bijvoorbeeld het geval kunnen zijn bij een 'onmenselijk' lange en uitputtende taak, een zeer confronterende vragenlijst, of voortdurend vernietigende feedback, maar ook bij een ervaren inbreuk op de privacy, of een ander ervaren gebrek aan respect. Let op, het gaat bij deze vraag om de door de deelnemer ervaren belasting tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade door het onderzoek.", max_length=1, verbose_name='Bevat bovenstaand onderzoekstraject elementen die tijdens de deelname zodanig belastend zijn dat deze <em>ondanks de verkregen informed consent</em> vragen zou kunnen oproepen (of zelfs verontwaardiging), bijvoorbeeld bij collega-onderzoekers, bij de deelnemers zelf, of bij ouders of andere vertegenwoordigers?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('stressful_details', models.TextField(verbose_name='Licht uw antwoord toe. Geef concrete voorbeelden van de relevante aspecten van uw studie (bijv. representatieve voorbeelden van mogelijk zeer kwetsende woorden of uitspraken in de taak, of van zeer confronterende vragen in een vragenlijst), zodat de commissie zich een goed beeld kan vormen.', blank=True)),
-                ('risk', models.CharField(blank=True, help_text='Achtergrondrisico is datgene dat gezonde, gemiddelde burgers in de relevante leeftijdscategorie normaalgesproken in het dagelijks leven ten deel valt. Denk bij schade ook aan de gevolgen die het voor de deelnemer of anderen beschikbaar komen van bepaalde informatie kan hebben, bijv. op het vlak van zelfbeeld, stigmatisering door anderen, economische schade door data-koppeling, et cetera. Het achtergrondrisico voor psychische en fysieke schade omvat bijvoorbeeld ook de risico\'s van "routine"-tests, -onderzoeken of -procedures die in alledaagse didactische, psychologische of medische contexten plaatsvinden (zoals een eindexamen, een rijexamen, een stressbestendigheids-<em>assessment</em>, een intelligentie- of persoonlijkheidstest, of een hartslagmeting na fysieke inspanning; dit alles, waar relevant, onder begeleiding van adequaat geschoolde specialisten).', max_length=1, verbose_name='Zijn de risico\'s op psychische, fysieke, of andere (bijv. economische, juridische) schade door deelname aan bovenstaand onderzoekstraject <em>meer dan</em> minimaal? D.w.z. ligt de kans op en/of omvang van mogelijke schade bij de deelnemers duidelijk <em>boven</em> het "achtergrondrisico"?', choices=[(b'Y', 'ja'), (b'N', 'nee'), (b'?', 'twijfel')])),
-                ('risk_details', models.TextField(max_length=200, verbose_name='Licht toe', blank=True)),
-                ('age_groups', models.ManyToManyField(help_text='De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet u hier hier 4-5 \xe9n 6-11 invullen.', to='studies.AgeGroup', verbose_name='Uit welke leeftijdscategorie(\xebn) bestaat uw deelnemersgroep?')),
-                ('compensation', models.ForeignKey(verbose_name='Welke vergoeding krijgt de deelnemer voor zijn/haar deelname?', to='studies.Compensation', help_text='Het standaardbedrag voor vergoeding aan de deelnemers is \u20ac10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje.', null=True, on_delete=models.CASCADE)),
-                ('proposal', models.ForeignKey(to='proposals.Proposal', on_delete=models.CASCADE)),
-                ('recruitment', models.ManyToManyField(to='studies.Recruitment', verbose_name='Hoe worden de deelnemers geworven?')),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField()),
+                (
+                    "name",
+                    models.CharField(
+                        max_length=15, verbose_name="Naam traject", blank=True
+                    ),
+                ),
+                (
+                    "legally_incapable",
+                    models.BooleanField(
+                        default=False,
+                        help_text="Wilsonbekwame volwassenen zijn volwassenen die waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.",
+                        verbose_name="Maakt uw studie gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?",
+                    ),
+                ),
+                (
+                    "legally_incapable_details",
+                    models.TextField(verbose_name="Licht toe", blank=True),
+                ),
+                (
+                    "has_traits",
+                    models.NullBooleanField(
+                        verbose_name="Deelnemers kunnen ge\xefncludeerd worden op bepaalde bijzondere kenmerken. Is dit in uw studie bij (een deel van) de deelnemers het geval?"
+                    ),
+                ),
+                (
+                    "traits_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "necessity",
+                    models.CharField(
+                        blank=True,
+                        help_text="Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou u de vraag ook kunnen beantwoorden door volwassen deelnemers te testen?",
+                        max_length=1,
+                        verbose_name="Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het geselecteerde type deelnemer aan de studie te laten meedoen?",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "necessity_reason",
+                    models.TextField(verbose_name="Leg uit waarom", blank=True),
+                ),
+                (
+                    "recruitment_details",
+                    models.TextField(verbose_name="Licht toe", blank=True),
+                ),
+                (
+                    "compensation_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "has_intervention",
+                    models.BooleanField(
+                        default=False, verbose_name="Interventieonderzoek"
+                    ),
+                ),
+                (
+                    "has_observation",
+                    models.BooleanField(
+                        default=False, verbose_name="Observatieonderzoek"
+                    ),
+                ),
+                (
+                    "has_sessions",
+                    models.BooleanField(default=False, verbose_name="Taakonderzoek"),
+                ),
+                (
+                    "informed_consent",
+                    models.FileField(
+                        blank=True,
+                        upload_to=b"",
+                        verbose_name="Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)",
+                        validators=[main.validators.validate_pdf_or_doc],
+                    ),
+                ),
+                (
+                    "briefing",
+                    models.FileField(
+                        blank=True,
+                        upload_to=b"",
+                        verbose_name="Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)",
+                        validators=[main.validators.validate_pdf_or_doc],
+                    ),
+                ),
+                (
+                    "passive_consent",
+                    models.BooleanField(
+                        default=False,
+                        help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://etcl.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de ETCL-website</a>.',
+                        verbose_name="Maakt u gebruik van passieve informed consent?",
+                    ),
+                ),
+                (
+                    "sessions_number",
+                    models.PositiveIntegerField(
+                        help_text="Wanneer u bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en u laat de deelnemer nog een keer terugkomen om dezelfde taak/taken of andere taak/taken te doen, dan spreken we van twee sessies. Wanneer u meerdere taken afneemt op dezelfde dag, met pauzes daartussen, dan geldt dat toch als \xe9\xe9n sessie.",
+                        null=True,
+                        verbose_name="Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?",
+                        validators=[django.core.validators.MinValueValidator(1)],
+                    ),
+                ),
+                (
+                    "deception",
+                    models.CharField(
+                        blank=True,
+                        help_text='Misleiding is het doelbewust verschaffen van inaccurate informatie over het doel en/of belangrijke aspecten van de gang van zaken tijdens de studie. Denk aan zaken als een bewust misleidende "cover story" voor het experiment; het ten onrechte suggereren dat er met andere deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: het gaat hierbij niet om fillers.',
+                        max_length=1,
+                        verbose_name="Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de deelnemer?",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "deception_details",
+                    models.TextField(
+                        verbose_name="Geef een toelichting en beschrijf hoe en wanneer de deelnemer zal worden gedebrieft.",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "negativity",
+                    models.CharField(
+                        blank=True,
+                        max_length=1,
+                        verbose_name="Bevat bovenstaand onderzoekstraject elementen die <em>tijdens</em> de deelname niet-triviale negatieve emoties kunnen opwekken? Denk hierbij bijvoorbeeld aan emotioneel indringende vragen, kwetsende uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of (heel) saaie taken.",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "negativity_details",
+                    models.TextField(verbose_name="Licht uw antwoord toe.", blank=True),
+                ),
+                (
+                    "stressful",
+                    models.CharField(
+                        blank=True,
+                        help_text="Dit zou bijvoorbeeld het geval kunnen zijn bij een 'onmenselijk' lange en uitputtende taak, een zeer confronterende vragenlijst, of voortdurend vernietigende feedback, maar ook bij een ervaren inbreuk op de privacy, of een ander ervaren gebrek aan respect. Let op, het gaat bij deze vraag om de door de deelnemer ervaren belasting tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade door het onderzoek.",
+                        max_length=1,
+                        verbose_name="Bevat bovenstaand onderzoekstraject elementen die tijdens de deelname zodanig belastend zijn dat deze <em>ondanks de verkregen informed consent</em> vragen zou kunnen oproepen (of zelfs verontwaardiging), bijvoorbeeld bij collega-onderzoekers, bij de deelnemers zelf, of bij ouders of andere vertegenwoordigers?",
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "stressful_details",
+                    models.TextField(
+                        verbose_name="Licht uw antwoord toe. Geef concrete voorbeelden van de relevante aspecten van uw studie (bijv. representatieve voorbeelden van mogelijk zeer kwetsende woorden of uitspraken in de taak, of van zeer confronterende vragen in een vragenlijst), zodat de commissie zich een goed beeld kan vormen.",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "risk",
+                    models.CharField(
+                        blank=True,
+                        help_text='Achtergrondrisico is datgene dat gezonde, gemiddelde burgers in de relevante leeftijdscategorie normaalgesproken in het dagelijks leven ten deel valt. Denk bij schade ook aan de gevolgen die het voor de deelnemer of anderen beschikbaar komen van bepaalde informatie kan hebben, bijv. op het vlak van zelfbeeld, stigmatisering door anderen, economische schade door data-koppeling, et cetera. Het achtergrondrisico voor psychische en fysieke schade omvat bijvoorbeeld ook de risico\'s van "routine"-tests, -onderzoeken of -procedures die in alledaagse didactische, psychologische of medische contexten plaatsvinden (zoals een eindexamen, een rijexamen, een stressbestendigheids-<em>assessment</em>, een intelligentie- of persoonlijkheidstest, of een hartslagmeting na fysieke inspanning; dit alles, waar relevant, onder begeleiding van adequaat geschoolde specialisten).',
+                        max_length=1,
+                        verbose_name='Zijn de risico\'s op psychische, fysieke, of andere (bijv. economische, juridische) schade door deelname aan bovenstaand onderzoekstraject <em>meer dan</em> minimaal? D.w.z. ligt de kans op en/of omvang van mogelijke schade bij de deelnemers duidelijk <em>boven</em> het "achtergrondrisico"?',
+                        choices=[(b"Y", "ja"), (b"N", "nee"), (b"?", "twijfel")],
+                    ),
+                ),
+                (
+                    "risk_details",
+                    models.TextField(
+                        max_length=200, verbose_name="Licht toe", blank=True
+                    ),
+                ),
+                (
+                    "age_groups",
+                    models.ManyToManyField(
+                        help_text="De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet u hier hier 4-5 \xe9n 6-11 invullen.",
+                        to="studies.AgeGroup",
+                        verbose_name="Uit welke leeftijdscategorie(\xebn) bestaat uw deelnemersgroep?",
+                    ),
+                ),
+                (
+                    "compensation",
+                    models.ForeignKey(
+                        verbose_name="Welke vergoeding krijgt de deelnemer voor zijn/haar deelname?",
+                        to="studies.Compensation",
+                        help_text="Het standaardbedrag voor vergoeding aan de deelnemers is \u20ac10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje.",
+                        null=True,
+                        on_delete=models.CASCADE,
+                    ),
+                ),
+                (
+                    "proposal",
+                    models.ForeignKey(
+                        to="proposals.Proposal", on_delete=models.CASCADE
+                    ),
+                ),
+                (
+                    "recruitment",
+                    models.ManyToManyField(
+                        to="studies.Recruitment",
+                        verbose_name="Hoe worden de deelnemers geworven?",
+                    ),
+                ),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Trait',
+            name="Trait",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.AddField(
-            model_name='study',
-            name='traits',
-            field=models.ManyToManyField(to='studies.Trait', verbose_name='Selecteer de bijzondere kenmerken van uw proefpersonen', blank=True),
+            model_name="study",
+            name="traits",
+            field=models.ManyToManyField(
+                to="studies.Trait",
+                verbose_name="Selecteer de bijzondere kenmerken van uw proefpersonen",
+                blank=True,
+            ),
         ),
         migrations.AlterUniqueTogether(
-            name='study',
-            unique_together=set([('proposal', 'order')]),
+            name="study",
+            unique_together=set([("proposal", "order")]),
         ),
     ]
diff --git a/studies/migrations/0002_auto_20161013_1959.py b/studies/migrations/0002_auto_20161013_1959.py
index 6251503d6..06d95a1cc 100644
--- a/studies/migrations/0002_auto_20161013_1959.py
+++ b/studies/migrations/0002_auto_20161013_1959.py
@@ -5,50 +5,49 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0001_initial'),
+        ("studies", "0001_initial"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='agegroup',
-            name='description_en',
+            model_name="agegroup",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='agegroup',
-            name='description_nl',
+            model_name="agegroup",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='compensation',
-            name='description_en',
+            model_name="compensation",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='compensation',
-            name='description_nl',
+            model_name="compensation",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='recruitment',
-            name='description_en',
+            model_name="recruitment",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='recruitment',
-            name='description_nl',
+            model_name="recruitment",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='trait',
-            name='description_en',
+            model_name="trait",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='trait',
-            name='description_nl',
+            model_name="trait",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/studies/migrations/0003_study_passive_consent_details.py b/studies/migrations/0003_study_passive_consent_details.py
index c2a0ad5fc..e86984caf 100644
--- a/studies/migrations/0003_study_passive_consent_details.py
+++ b/studies/migrations/0003_study_passive_consent_details.py
@@ -5,15 +5,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0002_auto_20161013_1959'),
+        ("studies", "0002_auto_20161013_1959"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='study',
-            name='passive_consent_details',
-            field=models.TextField(verbose_name="Licht uw antwoord toe. Wij willen u wijzen op het reglement, sectie 3.1 'd' en 'e'. Passive consent is slechts in enkele gevallen toegestaan en draagt niet de voorkeur van de commissie.", blank=True),
+            model_name="study",
+            name="passive_consent_details",
+            field=models.TextField(
+                verbose_name="Licht uw antwoord toe. Wij willen u wijzen op het reglement, sectie 3.1 'd' en 'e'. Passive consent is slechts in enkele gevallen toegestaan en draagt niet de voorkeur van de commissie.",
+                blank=True,
+            ),
         ),
     ]
diff --git a/studies/migrations/0004_auto_20170601_0816.py b/studies/migrations/0004_auto_20170601_0816.py
index 612b806d1..3083eb079 100644
--- a/studies/migrations/0004_auto_20170601_0816.py
+++ b/studies/migrations/0004_auto_20170601_0816.py
@@ -5,19 +5,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0003_study_passive_consent_details'),
+        ("studies", "0003_study_passive_consent_details"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='recruitment',
-            options={'ordering': ['order'], 'verbose_name': 'Werving'},
+            name="recruitment",
+            options={"ordering": ["order"], "verbose_name": "Werving"},
         ),
         migrations.AddField(
-            model_name='recruitment',
-            name='is_local',
+            model_name="recruitment",
+            name="is_local",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/studies/migrations/0005_auto_20180302_1518.py b/studies/migrations/0005_auto_20180302_1518.py
index bc160edb0..4115a3f94 100644
--- a/studies/migrations/0005_auto_20180302_1518.py
+++ b/studies/migrations/0005_auto_20180302_1518.py
@@ -6,25 +6,40 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0004_auto_20170601_0816'),
+        ("studies", "0004_auto_20170601_0816"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='study',
-            name='director_consent_declaration',
-            field=models.FileField(validators=[main.validators.validate_pdf_or_doc], upload_to=b'', blank=True, help_text=b'If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL', verbose_name=b'Please upload the declaration of consent for the school director/head of the department (in .pdf of .doc(x)-formaat)'),
+            model_name="study",
+            name="director_consent_declaration",
+            field=models.FileField(
+                validators=[main.validators.validate_pdf_or_doc],
+                upload_to=b"",
+                blank=True,
+                help_text=b"If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL",
+                verbose_name=b"Please upload the declaration of consent for the school director/head of the department (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AddField(
-            model_name='study',
-            name='director_consent_information',
-            field=models.FileField(blank=True, upload_to=b'', verbose_name=b'Please upload the the information letter for the school director/head of the department (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc]),
+            model_name="study",
+            name="director_consent_information",
+            field=models.FileField(
+                blank=True,
+                upload_to=b"",
+                verbose_name=b"Please upload the the information letter for the school director/head of the department (in .pdf of .doc(x)-formaat)",
+                validators=[main.validators.validate_pdf_or_doc],
+            ),
         ),
         migrations.AddField(
-            model_name='study',
-            name='parents_information',
-            field=models.FileField(blank=True, upload_to=b'', verbose_name=b'Please upload the information letter for the parents here (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc]),
+            model_name="study",
+            name="parents_information",
+            field=models.FileField(
+                blank=True,
+                upload_to=b"",
+                verbose_name=b"Please upload the information letter for the parents here (in .pdf of .doc(x)-formaat)",
+                validators=[main.validators.validate_pdf_or_doc],
+            ),
         ),
     ]
diff --git a/studies/migrations/0006_auto_20180306_1320.py b/studies/migrations/0006_auto_20180306_1320.py
index 053d0d030..6c0170314 100644
--- a/studies/migrations/0006_auto_20180306_1320.py
+++ b/studies/migrations/0006_auto_20180306_1320.py
@@ -6,30 +6,48 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0005_auto_20180302_1518'),
+        ("studies", "0005_auto_20180302_1518"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='director_consent_declaration',
-            field=models.FileField(validators=[main.validators.validate_pdf_or_doc], upload_to=b'', blank=True, help_text=b'If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL', verbose_name='Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)'),
+            model_name="study",
+            name="director_consent_declaration",
+            field=models.FileField(
+                validators=[main.validators.validate_pdf_or_doc],
+                upload_to=b"",
+                blank=True,
+                help_text=b"If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL",
+                verbose_name="Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='director_consent_information',
-            field=models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc]),
+            model_name="study",
+            name="director_consent_information",
+            field=models.FileField(
+                blank=True,
+                upload_to=b"",
+                verbose_name="Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)",
+                validators=[main.validators.validate_pdf_or_doc],
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='parents_information',
-            field=models.FileField(blank=True, upload_to=b'', verbose_name='Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)', validators=[main.validators.validate_pdf_or_doc]),
+            model_name="study",
+            name="parents_information",
+            field=models.FileField(
+                blank=True,
+                upload_to=b"",
+                verbose_name="Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)",
+                validators=[main.validators.validate_pdf_or_doc],
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='passive_consent',
-            field=models.NullBooleanField(help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://etcl.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de ETCL-website</a>.', verbose_name='Maakt u gebruik van passieve informed consent?'),
+            model_name="study",
+            name="passive_consent",
+            field=models.NullBooleanField(
+                help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://etcl.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de ETCL-website</a>.',
+                verbose_name="Maakt u gebruik van passieve informed consent?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0007_auto_20180808_1129.py b/studies/migrations/0007_auto_20180808_1129.py
index 0bb4a8264..bd0916969 100644
--- a/studies/migrations/0007_auto_20180808_1129.py
+++ b/studies/migrations/0007_auto_20180808_1129.py
@@ -7,60 +7,114 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0006_auto_20180306_1320'),
+        ("studies", "0006_auto_20180306_1320"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='briefing',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)'),
+            model_name="study",
+            name="briefing",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='deception',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='Misleiding is het doelbewust verschaffen van inaccurate informatie over het doel en/of belangrijke aspecten van de gang van zaken tijdens de studie. Denk aan zaken als een bewust misleidende "cover story" voor het experiment; het ten onrechte suggereren dat er met andere deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: het gaat hierbij niet om fillers.', max_length=1, verbose_name='Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de deelnemer?'),
+            model_name="study",
+            name="deception",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text='Misleiding is het doelbewust verschaffen van inaccurate informatie over het doel en/of belangrijke aspecten van de gang van zaken tijdens de studie. Denk aan zaken als een bewust misleidende "cover story" voor het experiment; het ten onrechte suggereren dat er met andere deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: het gaat hierbij niet om fillers.',
+                max_length=1,
+                verbose_name="Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de deelnemer?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='director_consent_declaration',
-            field=models.FileField(blank=True, help_text='If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL', upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)'),
+            model_name="study",
+            name="director_consent_declaration",
+            field=models.FileField(
+                blank=True,
+                help_text="If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL",
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='director_consent_information',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)'),
+            model_name="study",
+            name="director_consent_information",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='informed_consent',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)'),
+            model_name="study",
+            name="informed_consent",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='necessity',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou u de vraag ook kunnen beantwoorden door volwassen deelnemers te testen?', max_length=1, verbose_name='Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het geselecteerde type deelnemer aan de studie te laten meedoen?'),
+            model_name="study",
+            name="necessity",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text="Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou u de vraag ook kunnen beantwoorden door volwassen deelnemers te testen?",
+                max_length=1,
+                verbose_name="Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het geselecteerde type deelnemer aan de studie te laten meedoen?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='negativity',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], max_length=1, verbose_name='Bevat bovenstaand onderzoekstraject elementen die <em>tijdens</em> de deelname niet-triviale negatieve emoties kunnen opwekken? Denk hierbij bijvoorbeeld aan emotioneel indringende vragen, kwetsende uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of (heel) saaie taken.'),
+            model_name="study",
+            name="negativity",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                max_length=1,
+                verbose_name="Bevat bovenstaand onderzoekstraject elementen die <em>tijdens</em> de deelname niet-triviale negatieve emoties kunnen opwekken? Denk hierbij bijvoorbeeld aan emotioneel indringende vragen, kwetsende uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of (heel) saaie taken.",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='parents_information',
-            field=models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)'),
+            model_name="study",
+            name="parents_information",
+            field=models.FileField(
+                blank=True,
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='risk',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='Achtergrondrisico is datgene dat gezonde, gemiddelde burgers in de relevante leeftijdscategorie normaalgesproken in het dagelijks leven ten deel valt. Denk bij schade ook aan de gevolgen die het voor de deelnemer of anderen beschikbaar komen van bepaalde informatie kan hebben, bijv. op het vlak van zelfbeeld, stigmatisering door anderen, economische schade door data-koppeling, et cetera. Het achtergrondrisico voor psychische en fysieke schade omvat bijvoorbeeld ook de risico\'s van "routine"-tests, -onderzoeken of -procedures die in alledaagse didactische, psychologische of medische contexten plaatsvinden (zoals een eindexamen, een rijexamen, een stressbestendigheids-<em>assessment</em>, een intelligentie- of persoonlijkheidstest, of een hartslagmeting na fysieke inspanning; dit alles, waar relevant, onder begeleiding van adequaat geschoolde specialisten).', max_length=1, verbose_name='Zijn de risico\'s op psychische, fysieke, of andere (bijv. economische, juridische) schade door deelname aan bovenstaand onderzoekstraject <em>meer dan</em> minimaal? D.w.z. ligt de kans op en/of omvang van mogelijke schade bij de deelnemers duidelijk <em>boven</em> het "achtergrondrisico"?'),
+            model_name="study",
+            name="risk",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text='Achtergrondrisico is datgene dat gezonde, gemiddelde burgers in de relevante leeftijdscategorie normaalgesproken in het dagelijks leven ten deel valt. Denk bij schade ook aan de gevolgen die het voor de deelnemer of anderen beschikbaar komen van bepaalde informatie kan hebben, bijv. op het vlak van zelfbeeld, stigmatisering door anderen, economische schade door data-koppeling, et cetera. Het achtergrondrisico voor psychische en fysieke schade omvat bijvoorbeeld ook de risico\'s van "routine"-tests, -onderzoeken of -procedures die in alledaagse didactische, psychologische of medische contexten plaatsvinden (zoals een eindexamen, een rijexamen, een stressbestendigheids-<em>assessment</em>, een intelligentie- of persoonlijkheidstest, of een hartslagmeting na fysieke inspanning; dit alles, waar relevant, onder begeleiding van adequaat geschoolde specialisten).',
+                max_length=1,
+                verbose_name='Zijn de risico\'s op psychische, fysieke, of andere (bijv. economische, juridische) schade door deelname aan bovenstaand onderzoekstraject <em>meer dan</em> minimaal? D.w.z. ligt de kans op en/of omvang van mogelijke schade bij de deelnemers duidelijk <em>boven</em> het "achtergrondrisico"?',
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='stressful',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text="Dit zou bijvoorbeeld het geval kunnen zijn bij een 'onmenselijk' lange en uitputtende taak, een zeer confronterende vragenlijst, of voortdurend vernietigende feedback, maar ook bij een ervaren inbreuk op de privacy, of een ander ervaren gebrek aan respect. Let op, het gaat bij deze vraag om de door de deelnemer ervaren belasting tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade door het onderzoek.", max_length=1, verbose_name='Bevat bovenstaand onderzoekstraject elementen die tijdens de deelname zodanig belastend zijn dat deze <em>ondanks de verkregen informed consent</em> vragen zou kunnen oproepen (of zelfs verontwaardiging), bijvoorbeeld bij collega-onderzoekers, bij de deelnemers zelf, of bij ouders of andere vertegenwoordigers?'),
+            model_name="study",
+            name="stressful",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text="Dit zou bijvoorbeeld het geval kunnen zijn bij een 'onmenselijk' lange en uitputtende taak, een zeer confronterende vragenlijst, of voortdurend vernietigende feedback, maar ook bij een ervaren inbreuk op de privacy, of een ander ervaren gebrek aan respect. Let op, het gaat bij deze vraag om de door de deelnemer ervaren belasting tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade door het onderzoek.",
+                max_length=1,
+                verbose_name="Bevat bovenstaand onderzoekstraject elementen die tijdens de deelname zodanig belastend zijn dat deze <em>ondanks de verkregen informed consent</em> vragen zou kunnen oproepen (of zelfs verontwaardiging), bijvoorbeeld bij collega-onderzoekers, bij de deelnemers zelf, of bij ouders of andere vertegenwoordigers?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0008_auto_20180808_1322.py b/studies/migrations/0008_auto_20180808_1322.py
index 62810285e..c5230eedf 100644
--- a/studies/migrations/0008_auto_20180808_1322.py
+++ b/studies/migrations/0008_auto_20180808_1322.py
@@ -6,14 +6,13 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0007_auto_20180808_1129'),
+        ("studies", "0007_auto_20180808_1129"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='agegroup',
-            options={'ordering': ('age_min',)},
+            name="agegroup",
+            options={"ordering": ("age_min",)},
         ),
     ]
diff --git a/studies/migrations/0009_agegroup_is_active.py b/studies/migrations/0009_agegroup_is_active.py
index e84c70aed..8178f10e4 100644
--- a/studies/migrations/0009_agegroup_is_active.py
+++ b/studies/migrations/0009_agegroup_is_active.py
@@ -6,15 +6,14 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0008_auto_20180808_1322'),
+        ("studies", "0008_auto_20180808_1322"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='agegroup',
-            name='is_active',
+            model_name="agegroup",
+            name="is_active",
             field=models.BooleanField(default=True),
         ),
     ]
diff --git a/studies/migrations/0010_documents.py b/studies/migrations/0010_documents.py
index a9d2406a9..cbd71111e 100644
--- a/studies/migrations/0010_documents.py
+++ b/studies/migrations/0010_documents.py
@@ -8,24 +8,86 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('proposals', '0014_auto_20180808_1129'),
-        ('studies', '0009_agegroup_is_active'),
+        ("proposals", "0014_auto_20180808_1129"),
+        ("studies", "0009_agegroup_is_active"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Documents',
+            name="Documents",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('informed_consent', models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)')),
-                ('briefing', models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)')),
-                ('director_consent_declaration', models.FileField(blank=True, help_text='If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL', upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)')),
-                ('director_consent_information', models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)')),
-                ('parents_information', models.FileField(blank=True, upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)')),
-                ('proposal', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='proposals.Proposal')),
-                ('study', models.OneToOneField(blank=True, on_delete=django.db.models.deletion.CASCADE, to='studies.Study', null=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                (
+                    "informed_consent",
+                    models.FileField(
+                        blank=True,
+                        upload_to="",
+                        validators=[main.validators.validate_pdf_or_doc],
+                        verbose_name="Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)",
+                    ),
+                ),
+                (
+                    "briefing",
+                    models.FileField(
+                        blank=True,
+                        upload_to="",
+                        validators=[main.validators.validate_pdf_or_doc],
+                        verbose_name="Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)",
+                    ),
+                ),
+                (
+                    "director_consent_declaration",
+                    models.FileField(
+                        blank=True,
+                        help_text="If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the EtCL",
+                        upload_to="",
+                        validators=[main.validators.validate_pdf_or_doc],
+                        verbose_name="Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)",
+                    ),
+                ),
+                (
+                    "director_consent_information",
+                    models.FileField(
+                        blank=True,
+                        upload_to="",
+                        validators=[main.validators.validate_pdf_or_doc],
+                        verbose_name="Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)",
+                    ),
+                ),
+                (
+                    "parents_information",
+                    models.FileField(
+                        blank=True,
+                        upload_to="",
+                        validators=[main.validators.validate_pdf_or_doc],
+                        verbose_name="Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)",
+                    ),
+                ),
+                (
+                    "proposal",
+                    models.ForeignKey(
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="proposals.Proposal",
+                    ),
+                ),
+                (
+                    "study",
+                    models.OneToOneField(
+                        blank=True,
+                        on_delete=django.db.models.deletion.CASCADE,
+                        to="studies.Study",
+                        null=True,
+                    ),
+                ),
             ],
         ),
     ]
diff --git a/studies/migrations/0011_auto_20180914_1358.py b/studies/migrations/0011_auto_20180914_1358.py
index 810eebe1b..efffe3834 100644
--- a/studies/migrations/0011_auto_20180914_1358.py
+++ b/studies/migrations/0011_auto_20180914_1358.py
@@ -6,8 +6,8 @@
 
 
 def migrate(apps, schema_editor):
-    Study = apps.get_model('studies', 'Study')
-    Documents = apps.get_model('studies', 'Documents')
+    Study = apps.get_model("studies", "Study")
+    Documents = apps.get_model("studies", "Documents")
 
     for study in Study.objects.all():
         d = Documents()
@@ -20,13 +20,18 @@ def migrate(apps, schema_editor):
         d.parents_information = study.parents_information
         d.save()
 
+
 def reverse(apps, schema_editor):
-    Study = apps.get_model('studies', 'Study')
-    Documents = apps.get_model('studies', 'Documents')
+    Study = apps.get_model("studies", "Study")
+    Documents = apps.get_model("studies", "Documents")
 
     for documents in Documents.objects.all():
         if not documents.study:
-            print("Could not restore {} as it's not connected to a study".format(documents))
+            print(
+                "Could not restore {} as it's not connected to a study".format(
+                    documents
+                )
+            )
             continue
 
         study = documents.study
@@ -40,15 +45,14 @@ def reverse(apps, schema_editor):
 
         documents.delete()
 
+
 class Migration(migrations.Migration):
     """
     This migrates data a study to the new documents model created in 0010_documents.py
     """
 
     dependencies = [
-        ('studies', '0010_documents'),
+        ("studies", "0010_documents"),
     ]
 
-    operations = [
-        migrations.RunPython(migrate, reverse_code=reverse)
-    ]
+    operations = [migrations.RunPython(migrate, reverse_code=reverse)]
diff --git a/studies/migrations/0012_auto_20180914_1435.py b/studies/migrations/0012_auto_20180914_1435.py
index c08269ffe..3ed235f27 100644
--- a/studies/migrations/0012_auto_20180914_1435.py
+++ b/studies/migrations/0012_auto_20180914_1435.py
@@ -6,30 +6,29 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0011_auto_20180914_1358'),
+        ("studies", "0011_auto_20180914_1358"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='study',
-            name='briefing',
+            model_name="study",
+            name="briefing",
         ),
         migrations.RemoveField(
-            model_name='study',
-            name='director_consent_declaration',
+            model_name="study",
+            name="director_consent_declaration",
         ),
         migrations.RemoveField(
-            model_name='study',
-            name='director_consent_information',
+            model_name="study",
+            name="director_consent_information",
         ),
         migrations.RemoveField(
-            model_name='study',
-            name='informed_consent',
+            model_name="study",
+            name="informed_consent",
         ),
         migrations.RemoveField(
-            model_name='study',
-            name='parents_information',
+            model_name="study",
+            name="parents_information",
         ),
     ]
diff --git a/studies/migrations/0013_auto_20190401_1343.py b/studies/migrations/0013_auto_20190401_1343.py
index fcf6708a0..7c1a2af27 100644
--- a/studies/migrations/0013_auto_20190401_1343.py
+++ b/studies/migrations/0013_auto_20190401_1343.py
@@ -8,30 +8,47 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0012_auto_20180914_1435'),
+        ("studies", "0012_auto_20180914_1435"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='documents',
-            name='director_consent_declaration',
-            field=models.FileField(blank=True, help_text='If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the FEtC-H', upload_to='', validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)'),
+            model_name="documents",
+            name="director_consent_declaration",
+            field=models.FileField(
+                blank=True,
+                help_text="If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the FEtC-H",
+                upload_to="",
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='compensation',
-            field=models.ForeignKey(blank=True, help_text='Het standaardbedrag voor vergoeding aan de deelnemers is €10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje.', null=True, on_delete=django.db.models.deletion.CASCADE, to='studies.Compensation', verbose_name='Welke vergoeding krijgt de deelnemer voor zijn/haar deelname?'),
+            model_name="study",
+            name="compensation",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Het standaardbedrag voor vergoeding aan de deelnemers is €10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="studies.Compensation",
+                verbose_name="Welke vergoeding krijgt de deelnemer voor zijn/haar deelname?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='has_sessions',
-            field=models.BooleanField(default=False, verbose_name='Taakonderzoek en interviews'),
+            model_name="study",
+            name="has_sessions",
+            field=models.BooleanField(
+                default=False, verbose_name="Taakonderzoek en interviews"
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='passive_consent',
-            field=models.NullBooleanField(help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://fetc-gw.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de FETC-GW-website</a>.', verbose_name='Maakt u gebruik van passieve informed consent?'),
+            model_name="study",
+            name="passive_consent",
+            field=models.NullBooleanField(
+                help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://fetc-gw.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de FETC-GW-website</a>.',
+                verbose_name="Maakt u gebruik van passieve informed consent?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0014_auto_20200428_1337.py b/studies/migrations/0014_auto_20200428_1337.py
index bc92ae67d..e5e3b365d 100644
--- a/studies/migrations/0014_auto_20200428_1337.py
+++ b/studies/migrations/0014_auto_20200428_1337.py
@@ -4,20 +4,28 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0013_auto_20190401_1343'),
+        ("studies", "0013_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='has_traits',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is dit in uw studie bij (een deel van) de deelnemers het geval?'),
+            model_name="study",
+            name="has_traits",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is dit in uw studie bij (een deel van) de deelnemers het geval?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='passive_consent',
-            field=models.BooleanField(blank=True, help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://fetc-gw.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de FETC-GW-website</a>.', null=True, verbose_name='Maakt u gebruik van passieve informed consent?'),
+            model_name="study",
+            name="passive_consent",
+            field=models.BooleanField(
+                blank=True,
+                help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://fetc-gw.wp.hum.uu.nl/toestemmingsverklaringen/" target="_blank">de FETC-GW-website</a>.',
+                null=True,
+                verbose_name="Maakt u gebruik van passieve informed consent?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0015_auto_20210125_1159.py b/studies/migrations/0015_auto_20210125_1159.py
index 5453c1911..5ae4dc86e 100644
--- a/studies/migrations/0015_auto_20210125_1159.py
+++ b/studies/migrations/0015_auto_20210125_1159.py
@@ -6,35 +6,73 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0014_auto_20200428_1337'),
+        ("studies", "0014_auto_20200428_1337"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='documents',
-            name='briefing',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Briefing'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)'),
+            model_name="documents",
+            name="briefing",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory("Briefing"),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='documents',
-            name='director_consent_declaration',
-            field=models.FileField(blank=True, help_text='If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the FEtC-H', storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Department_Consent'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)'),
+            model_name="documents",
+            name="director_consent_declaration",
+            field=models.FileField(
+                blank=True,
+                help_text="If it is already signed, upload the signed declaration form. If it is not signed yet, you can upload the unsigned document and send the document when it is signed to the secretary of the FEtC-H",
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Department_Consent"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de toestemmingsverklaring van de schoolleider/hoofd van het departement (in .pdf of .doc(x)-format)",
+            ),
         ),
         migrations.AlterField(
-            model_name='documents',
-            name='director_consent_information',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Department_Info'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)'),
+            model_name="documents",
+            name="director_consent_information",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Department_Info"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief voor de schoolleider/hoofd van het departement (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='documents',
-            name='informed_consent',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Informed_Consent'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)'),
+            model_name="documents",
+            name="informed_consent",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Informed_Consent"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='documents',
-            name='parents_information',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Parental_Info'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)'),
+            model_name="documents",
+            name="parents_information",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Parental_Info"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief voor de ouders (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/studies/migrations/0016_auto_20210301_1626.py b/studies/migrations/0016_auto_20210301_1626.py
index a0522504d..6ac117957 100644
--- a/studies/migrations/0016_auto_20210301_1626.py
+++ b/studies/migrations/0016_auto_20210301_1626.py
@@ -5,25 +5,42 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0015_auto_20210125_1159'),
+        ("studies", "0015_auto_20210125_1159"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='age_groups',
-            field=models.ManyToManyField(blank=True, help_text='De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet u hier hier 4-5 én 6-11 invullen.', to='studies.AgeGroup', verbose_name='Uit welke leeftijdscategorie(ën) bestaat uw deelnemersgroep?'),
+            model_name="study",
+            name="age_groups",
+            field=models.ManyToManyField(
+                blank=True,
+                help_text="De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet u hier hier 4-5 én 6-11 invullen.",
+                to="studies.AgeGroup",
+                verbose_name="Uit welke leeftijdscategorie(ën) bestaat uw deelnemersgroep?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='legally_incapable',
-            field=models.BooleanField(blank=True, default=False, help_text='Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.', verbose_name='Maakt uw studie gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?'),
+            model_name="study",
+            name="legally_incapable",
+            field=models.BooleanField(
+                blank=True,
+                default=False,
+                help_text="Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.",
+                verbose_name="Maakt uw studie gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='sessions_number',
-            field=models.PositiveIntegerField(help_text='Wanneer u bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en u laat de deelnemer nog een keer terugkomen om dezelfde taak/taken of andere taak/taken te doen, dan spreken we van twee sessies. Wanneer u meerdere taken afneemt op dezelfde dag, met pauzes daartussen, dan geldt dat toch als één sessie.', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?'),
+            model_name="study",
+            name="sessions_number",
+            field=models.PositiveIntegerField(
+                help_text="Wanneer u bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en u laat de deelnemer nog een keer terugkomen om dezelfde taak/taken of andere taak/taken te doen, dan spreken we van twee sessies. Wanneer u meerdere taken afneemt op dezelfde dag, met pauzes daartussen, dan geldt dat toch als één sessie.",
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(100),
+                ],
+                verbose_name="Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0017_auto_20210302_1453.py b/studies/migrations/0017_auto_20210302_1453.py
index 53e31344d..1f4e7f1a3 100644
--- a/studies/migrations/0017_auto_20210302_1453.py
+++ b/studies/migrations/0017_auto_20210302_1453.py
@@ -4,20 +4,27 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0016_auto_20210301_1626'),
+        ("studies", "0016_auto_20210301_1626"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='age_groups',
-            field=models.ManyToManyField(help_text='De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet u hier hier 4-5 én 6-11 invullen.', to='studies.AgeGroup', verbose_name='Uit welke leeftijdscategorie(ën) bestaat uw deelnemersgroep?'),
+            model_name="study",
+            name="age_groups",
+            field=models.ManyToManyField(
+                help_text="De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet u hier hier 4-5 én 6-11 invullen.",
+                to="studies.AgeGroup",
+                verbose_name="Uit welke leeftijdscategorie(ën) bestaat uw deelnemersgroep?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='legally_incapable',
-            field=models.BooleanField(default=False, help_text='Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.', verbose_name='Maakt uw studie gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?'),
+            model_name="study",
+            name="legally_incapable",
+            field=models.BooleanField(
+                default=False,
+                help_text="Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.",
+                verbose_name="Maakt uw studie gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0018_auto_20210409_1211.py b/studies/migrations/0018_auto_20210409_1211.py
index b876eb656..92e517b0f 100644
--- a/studies/migrations/0018_auto_20210409_1211.py
+++ b/studies/migrations/0018_auto_20210409_1211.py
@@ -4,15 +4,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0017_auto_20210302_1453'),
+        ("studies", "0017_auto_20210302_1453"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='passive_consent',
-            field=models.BooleanField(blank=True, help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">de FETC-GW-website</a>.', null=True, verbose_name='Maakt u gebruik van passieve informed consent?'),
+            model_name="study",
+            name="passive_consent",
+            field=models.BooleanField(
+                blank=True,
+                help_text='Wanneer u kinderen via een instelling (dus ook school) werft en u de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maakt u gebruik van passieve informed consent. U kunt de templates vinden op <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">de FETC-GW-website</a>.',
+                null=True,
+                verbose_name="Maakt u gebruik van passieve informed consent?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0019_auto_20211213_1503.py b/studies/migrations/0019_auto_20211213_1503.py
index 2eedbe509..cc2beaf33 100644
--- a/studies/migrations/0019_auto_20211213_1503.py
+++ b/studies/migrations/0019_auto_20211213_1503.py
@@ -6,70 +6,123 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0018_auto_20210409_1211'),
+        ("studies", "0018_auto_20210409_1211"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='age_groups',
-            field=models.ManyToManyField(help_text='De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet je hier hier 4-5 én 6-11 invullen.', to='studies.AgeGroup', verbose_name='Uit welke leeftijdscategorie(ën) bestaat je deelnemersgroep?'),
+            model_name="study",
+            name="age_groups",
+            field=models.ManyToManyField(
+                help_text="De beoogde leeftijdsgroep kan zijn 5-7 jarigen. Dan moet je hier hier 4-5 én 6-11 invullen.",
+                to="studies.AgeGroup",
+                verbose_name="Uit welke leeftijdscategorie(ën) bestaat je deelnemersgroep?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='compensation',
-            field=models.ForeignKey(blank=True, help_text='Het standaardbedrag voor vergoeding aan de deelnemers is €10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje.', null=True, on_delete=django.db.models.deletion.CASCADE, to='studies.Compensation', verbose_name='Welke vergoeding krijgt de deelnemer voor hun deelname?'),
+            model_name="study",
+            name="compensation",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Het standaardbedrag voor vergoeding aan de deelnemers is €10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje.",
+                null=True,
+                on_delete=django.db.models.deletion.CASCADE,
+                to="studies.Compensation",
+                verbose_name="Welke vergoeding krijgt de deelnemer voor hun deelname?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='deception',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='Misleiding is het doelbewust verschaffen van inaccurate informatie over het doel en/of belangrijke aspecten van de gang van zaken tijdens het onderzoek. Denk aan zaken als een bewust misleidende "cover story" voor het experiment; het ten onrechte suggereren dat er met andere deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: het gaat hierbij niet om fillers.', max_length=1, verbose_name='Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de deelnemer?'),
+            model_name="study",
+            name="deception",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text='Misleiding is het doelbewust verschaffen van inaccurate informatie over het doel en/of belangrijke aspecten van de gang van zaken tijdens het onderzoek. Denk aan zaken als een bewust misleidende "cover story" voor het experiment; het ten onrechte suggereren dat er met andere deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: het gaat hierbij niet om fillers.',
+                max_length=1,
+                verbose_name="Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de deelnemer?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='has_traits',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is dit in jouw onderzoek bij (een deel van) de deelnemers het geval?'),
+            model_name="study",
+            name="has_traits",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is dit in jouw onderzoek bij (een deel van) de deelnemers het geval?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='legally_incapable',
-            field=models.BooleanField(default=False, help_text='Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.', verbose_name='Maakt je onderzoek gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?'),
+            model_name="study",
+            name="legally_incapable",
+            field=models.BooleanField(
+                default=False,
+                help_text="Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag worden aangenomen dat informed consent niet goed gerealiseerd kan worden (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). Hier dient in ieder geval altijd informed consent van een relevante vertegenwoordiger te worden verkregen.",
+                verbose_name="Maakt je onderzoek gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='necessity',
-            field=models.CharField(blank=True, choices=[('Y', 'ja'), ('N', 'nee'), ('?', 'twijfel')], help_text='Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou je de vraag ook kunnen beantwoorden door volwassen deelnemers te testen?', max_length=1, verbose_name='Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het geselecteerde type deelnemer aan het onderzoek te laten meedoen?'),
+            model_name="study",
+            name="necessity",
+            field=models.CharField(
+                blank=True,
+                choices=[("Y", "ja"), ("N", "nee"), ("?", "twijfel")],
+                help_text="Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou je de vraag ook kunnen beantwoorden door volwassen deelnemers te testen?",
+                max_length=1,
+                verbose_name="Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het geselecteerde type deelnemer aan het onderzoek te laten meedoen?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='negativity_details',
-            field=models.TextField(blank=True, verbose_name='Licht je antwoord toe.'),
+            model_name="study",
+            name="negativity_details",
+            field=models.TextField(blank=True, verbose_name="Licht je antwoord toe."),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='passive_consent',
-            field=models.BooleanField(blank=True, help_text='Wanneer je kinderen via een instelling (dus ook school) werft en je de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maak je gebruik van passieve informed consent. Je kan de templates vinden op <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">de FETC-GW-website</a>.', null=True, verbose_name='Maak je gebruik van passieve informed consent?'),
+            model_name="study",
+            name="passive_consent",
+            field=models.BooleanField(
+                blank=True,
+                help_text='Wanneer je kinderen via een instelling (dus ook school) werft en je de ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die instelling, dan maak je gebruik van passieve informed consent. Je kan de templates vinden op <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">de FETC-GW-website</a>.',
+                null=True,
+                verbose_name="Maak je gebruik van passieve informed consent?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='passive_consent_details',
-            field=models.TextField(blank=True, verbose_name="Licht je antwoord toe. Wij willen je wijzen op het reglement, sectie 3.1 'd' en 'e'. Passive consent is slechts in enkele gevallen toegestaan en draagt niet de voorkeur van de commissie."),
+            model_name="study",
+            name="passive_consent_details",
+            field=models.TextField(
+                blank=True,
+                verbose_name="Licht je antwoord toe. Wij willen je wijzen op het reglement, sectie 3.1 'd' en 'e'. Passive consent is slechts in enkele gevallen toegestaan en draagt niet de voorkeur van de commissie.",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='sessions_number',
-            field=models.PositiveIntegerField(help_text='Wanneer je bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en je laat de deelnemer nog een keer terugkomen om dezelfde taak/taken of andere taak/taken te doen, dan spreken we van twee sessies. Wanneer je meerdere taken afneemt op dezelfde dag, met pauzes daartussen, dan geldt dat toch als één sessie.', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?'),
+            model_name="study",
+            name="sessions_number",
+            field=models.PositiveIntegerField(
+                help_text="Wanneer je bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en je laat de deelnemer nog een keer terugkomen om dezelfde taak/taken of andere taak/taken te doen, dan spreken we van twee sessies. Wanneer je meerdere taken afneemt op dezelfde dag, met pauzes daartussen, dan geldt dat toch als één sessie.",
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(100),
+                ],
+                verbose_name="Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='stressful_details',
-            field=models.TextField(blank=True, verbose_name='Licht je antwoord toe. Geef concrete voorbeelden van de relevante aspecten van jouw onderzoek (bijv. representatieve voorbeelden van mogelijk zeer kwetsende woorden of uitspraken in de taak, of van zeer confronterende vragen in een vragenlijst), zodat de commissie zich een goed beeld kan vormen.'),
+            model_name="study",
+            name="stressful_details",
+            field=models.TextField(
+                blank=True,
+                verbose_name="Licht je antwoord toe. Geef concrete voorbeelden van de relevante aspecten van jouw onderzoek (bijv. representatieve voorbeelden van mogelijk zeer kwetsende woorden of uitspraken in de taak, of van zeer confronterende vragen in een vragenlijst), zodat de commissie zich een goed beeld kan vormen.",
+            ),
         ),
         migrations.AlterField(
-            model_name='study',
-            name='traits',
-            field=models.ManyToManyField(blank=True, to='studies.Trait', verbose_name='Selecteer de bijzondere kenmerken van je proefpersonen'),
+            model_name="study",
+            name="traits",
+            field=models.ManyToManyField(
+                blank=True,
+                to="studies.Trait",
+                verbose_name="Selecteer de bijzondere kenmerken van je proefpersonen",
+            ),
         ),
     ]
diff --git a/studies/migrations/0020_study_self_assesment.py b/studies/migrations/0020_study_self_assesment.py
index 0650394fa..c756cd7d0 100644
--- a/studies/migrations/0020_study_self_assesment.py
+++ b/studies/migrations/0020_study_self_assesment.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0019_auto_20211213_1503'),
+        ("studies", "0019_auto_20211213_1503"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='study',
-            name='self_assesment',
-            field=models.TextField(blank=True, max_length=500, verbose_name='PLACEHOLDER QUESTION FOR SELF ASSESMENT'),
+            model_name="study",
+            name="self_assesment",
+            field=models.TextField(
+                blank=True,
+                max_length=500,
+                verbose_name="PLACEHOLDER QUESTION FOR SELF ASSESMENT",
+            ),
         ),
     ]
diff --git a/studies/migrations/0021_remove_study_self_assesment.py b/studies/migrations/0021_remove_study_self_assesment.py
index 0f1c573d1..8ea21f0bf 100644
--- a/studies/migrations/0021_remove_study_self_assesment.py
+++ b/studies/migrations/0021_remove_study_self_assesment.py
@@ -4,14 +4,13 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0020_study_self_assesment'),
+        ("studies", "0020_study_self_assesment"),
     ]
 
     operations = [
         migrations.RemoveField(
-            model_name='study',
-            name='self_assesment',
+            model_name="study",
+            name="self_assesment",
         ),
     ]
diff --git a/studies/migrations/0022_alter_study_recruitment_details.py b/studies/migrations/0022_alter_study_recruitment_details.py
index 944cfa4c9..324cd92eb 100644
--- a/studies/migrations/0022_alter_study_recruitment_details.py
+++ b/studies/migrations/0022_alter_study_recruitment_details.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0021_remove_study_self_assesment'),
+        ("studies", "0021_remove_study_self_assesment"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='recruitment_details',
-            field=models.TextField(blank=True, help_text='Er zijn specifieke voorbeelddocumenten voor het gebruik van             Amazon Mechanical Turk/Prolific op <a href="https://intranet.uu.nl/en/knowledgebase/documents-ethics-assessment-committee-humanities">deze pagina</a>.', verbose_name='Licht toe'),
+            model_name="study",
+            name="recruitment_details",
+            field=models.TextField(
+                blank=True,
+                help_text='Er zijn specifieke voorbeelddocumenten voor het gebruik van             Amazon Mechanical Turk/Prolific op <a href="https://intranet.uu.nl/en/knowledgebase/documents-ethics-assessment-committee-humanities">deze pagina</a>.',
+                verbose_name="Licht toe",
+            ),
         ),
     ]
diff --git a/studies/migrations/0023_auto_20221018_1541.py b/studies/migrations/0023_auto_20221018_1541.py
index 8f9dd4723..1302b43e1 100644
--- a/studies/migrations/0023_auto_20221018_1541.py
+++ b/studies/migrations/0023_auto_20221018_1541.py
@@ -4,20 +4,27 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0022_alter_study_recruitment_details'),
+        ("studies", "0022_alter_study_recruitment_details"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='study',
-            name='hierarchy',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Bestaat een hiërarchische relatie tussen onderzoeker(s) en deelnemer(s)?'),
+            model_name="study",
+            name="hierarchy",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Bestaat een hiërarchische relatie tussen onderzoeker(s) en deelnemer(s)?",
+            ),
         ),
         migrations.AddField(
-            model_name='study',
-            name='hierarchy_details',
-            field=models.TextField(blank=True, max_length=500, verbose_name='Zo ja, wat is de relatie (bijv. docent-student)?'),
+            model_name="study",
+            name="hierarchy_details",
+            field=models.TextField(
+                blank=True,
+                max_length=500,
+                verbose_name="Zo ja, wat is de relatie (bijv. docent-student)?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0024_alter_study_has_traits.py b/studies/migrations/0024_alter_study_has_traits.py
index 730edb073..98496542e 100644
--- a/studies/migrations/0024_alter_study_has_traits.py
+++ b/studies/migrations/0024_alter_study_has_traits.py
@@ -4,15 +4,19 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0023_auto_20221018_1541'),
+        ("studies", "0023_auto_20221018_1541"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='has_traits',
-            field=models.BooleanField(blank=True, help_text="In de meeste gevallen kun je dit soort gegevens alleen verzamelen als je daar toestemming voor hebt: zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming,</a> ‘Bijzondere persoonsgegevens’. Is het in de praktijk onmogelijk of disproportioneel moeilijk om om toestemming te vragen, neem dan eerst contact op met de <a href='mailto:privacy.gw@uu.nl'>privacy officer</a>, voordat je je aanvraag indient.", null=True, verbose_name='Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is dit in jouw onderzoek bij (een deel van) de deelnemers het geval?'),
+            model_name="study",
+            name="has_traits",
+            field=models.BooleanField(
+                blank=True,
+                help_text="In de meeste gevallen kun je dit soort gegevens alleen verzamelen als je daar toestemming voor hebt: zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming,</a> ‘Bijzondere persoonsgegevens’. Is het in de praktijk onmogelijk of disproportioneel moeilijk om om toestemming te vragen, neem dan eerst contact op met de <a href='mailto:privacy.gw@uu.nl'>privacy officer</a>, voordat je je aanvraag indient.",
+                null=True,
+                verbose_name="Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is dit in jouw onderzoek bij (een deel van) de deelnemers het geval?",
+            ),
         ),
     ]
diff --git a/studies/migrations/0024_auto_20221018_1653.py b/studies/migrations/0024_auto_20221018_1653.py
index aa2593d28..3c13f3075 100644
--- a/studies/migrations/0024_auto_20221018_1653.py
+++ b/studies/migrations/0024_auto_20221018_1653.py
@@ -4,34 +4,50 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0023_auto_20221018_1541'),
+        ("studies", "0023_auto_20221018_1541"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='SpecialDetail',
+            name="SpecialDetail",
             fields=[
-                ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('description_nl', models.CharField(max_length=200, null=True)),
-                ('description_en', models.CharField(max_length=200, null=True)),
-                ('medical_traits', models.BooleanField(default=False)),
+                (
+                    "id",
+                    models.AutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("description_nl", models.CharField(max_length=200, null=True)),
+                ("description_en", models.CharField(max_length=200, null=True)),
+                ("medical_traits", models.BooleanField(default=False)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.AddField(
-            model_name='study',
-            name='has_special_details',
-            field=models.BooleanField(blank=True, help_text="zie de <a href='https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw'             target='_blank'>Richtlijnen</a>", null=True, verbose_name='Worden er bijzondere persoonsgegevens verzameld?'),
+            model_name="study",
+            name="has_special_details",
+            field=models.BooleanField(
+                blank=True,
+                help_text="zie de <a href='https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw'             target='_blank'>Richtlijnen</a>",
+                null=True,
+                verbose_name="Worden er bijzondere persoonsgegevens verzameld?",
+            ),
         ),
         migrations.AddField(
-            model_name='study',
-            name='special_details',
-            field=models.ManyToManyField(blank=True, to='studies.SpecialDetail', verbose_name='Geef aan welke bijzondere persoonsgegevens worden verzameld:'),
+            model_name="study",
+            name="special_details",
+            field=models.ManyToManyField(
+                blank=True,
+                to="studies.SpecialDetail",
+                verbose_name="Geef aan welke bijzondere persoonsgegevens worden verzameld:",
+            ),
         ),
     ]
diff --git a/studies/migrations/0025_merge_20221206_1309.py b/studies/migrations/0025_merge_20221206_1309.py
index f6eb7957c..b47dd1f80 100644
--- a/studies/migrations/0025_merge_20221206_1309.py
+++ b/studies/migrations/0025_merge_20221206_1309.py
@@ -4,11 +4,9 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0024_alter_study_has_traits'),
-        ('studies', '0024_auto_20221018_1653'),
+        ("studies", "0024_alter_study_has_traits"),
+        ("studies", "0024_auto_20221018_1653"),
     ]
 
-    operations = [
-    ]
+    operations = []
diff --git a/studies/migrations/0026_alter_study_traits.py b/studies/migrations/0026_alter_study_traits.py
index 302ca368c..10fc79acb 100644
--- a/studies/migrations/0026_alter_study_traits.py
+++ b/studies/migrations/0026_alter_study_traits.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0025_merge_20221206_1309'),
+        ("studies", "0025_merge_20221206_1309"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='study',
-            name='traits',
-            field=models.ManyToManyField(blank=True, to='studies.Trait', verbose_name='Selecteer de medische gegevens van je proefpersonen die worden verzameld'),
+            model_name="study",
+            name="traits",
+            field=models.ManyToManyField(
+                blank=True,
+                to="studies.Trait",
+                verbose_name="Selecteer de medische gegevens van je proefpersonen die worden verzameld",
+            ),
         ),
     ]
diff --git a/studies/migrations/0027_auto_20230227_1425.py b/studies/migrations/0027_auto_20230227_1425.py
index 4a5728058..02d839644 100644
--- a/studies/migrations/0027_auto_20230227_1425.py
+++ b/studies/migrations/0027_auto_20230227_1425.py
@@ -6,25 +6,49 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0026_alter_study_traits'),
+        ("studies", "0026_alter_study_traits"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='documents',
-            name='director_consent_declaration',
-            field=models.FileField(blank=True, help_text='Upload indien mogelijk een ondertekende versie van het document. Upload als deze nog niet bestaat een blanco versie, en stuur de ondertekende versie later op naar de secretaris van de FETC-GW.', storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Department_Consent'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring voor de leiding of het management van de instelling (in .pdf of .doc(x)-format)'),
+            model_name="documents",
+            name="director_consent_declaration",
+            field=models.FileField(
+                blank=True,
+                help_text="Upload indien mogelijk een ondertekende versie van het document. Upload als deze nog niet bestaat een blanco versie, en stuur de ondertekende versie later op naar de secretaris van de FETC-GW.",
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Department_Consent"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de toestemmingsverklaring voor de leiding of het management van de instelling (in .pdf of .doc(x)-format)",
+            ),
         ),
         migrations.AlterField(
-            model_name='documents',
-            name='director_consent_information',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Department_Info'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de leiding of het management van de instelling (in .pdf of .doc(x)-formaat)'),
+            model_name="documents",
+            name="director_consent_information",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Department_Info"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief voor de leiding of het management van de instelling (in .pdf of .doc(x)-formaat)",
+            ),
         ),
         migrations.AlterField(
-            model_name='documents',
-            name='parents_information',
-            field=models.FileField(blank=True, storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Parental_Info'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of .doc(x)-formaat)'),
+            model_name="documents",
+            name="parents_information",
+            field=models.FileField(
+                blank=True,
+                storage=proposals.utils.proposal_utils.OverwriteStorage(),
+                upload_to=proposals.utils.proposal_utils.FilenameFactory(
+                    "Parental_Info"
+                ),
+                validators=[main.validators.validate_pdf_or_doc],
+                verbose_name="Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of .doc(x)-formaat)",
+            ),
         ),
     ]
diff --git a/studies/models.py b/studies/models.py
index e39884d16..8644113f0 100644
--- a/studies/models.py
+++ b/studies/models.py
@@ -6,10 +6,10 @@
 from django.db.models import Q
 
 
-
 from django.utils.translation import ugettext_lazy as _
 from django.utils.functional import lazy
 from django.utils.safestring import mark_safe
+
 mark_safe_lazy = lazy(mark_safe, str)
 
 from main.models import YesNoDoubt
@@ -19,13 +19,12 @@
 from proposals.utils.proposal_utils import FilenameFactory, OverwriteStorage
 
 
-INFORMED_CONSENT_FILENAME = FilenameFactory('Informed_Consent')
-METC_DECISION_FILENAME = FilenameFactory('METC_Decision')
-BRIEFING_FILENAME = FilenameFactory('Briefing')
-DEPARTMENT_CONSENT_FILENAME = FilenameFactory('Department_Consent')
-DEPARTMENT_INFO_FILENAME = FilenameFactory('Department_Info')
-PARENTAL_INFO_FILENAME = FilenameFactory('Parental_Info')
-
+INFORMED_CONSENT_FILENAME = FilenameFactory("Informed_Consent")
+METC_DECISION_FILENAME = FilenameFactory("METC_Decision")
+BRIEFING_FILENAME = FilenameFactory("Briefing")
+DEPARTMENT_CONSENT_FILENAME = FilenameFactory("Department_Consent")
+DEPARTMENT_INFO_FILENAME = FilenameFactory("Department_Info")
+PARENTAL_INFO_FILENAME = FilenameFactory("Parental_Info")
 
 
 class AgeGroup(models.Model):
@@ -39,7 +38,7 @@ class AgeGroup(models.Model):
     """
 
     class Meta:
-        ordering = ('age_min',)
+        ordering = ("age_min",)
 
     age_min = models.PositiveIntegerField()
     age_max = models.PositiveIntegerField(blank=True, null=True)
@@ -51,9 +50,9 @@ class Meta:
 
     def __str__(self):
         if self.age_max:
-            return _('{}-{} jaar').format(self.age_min, self.age_max)
+            return _("{}-{} jaar").format(self.age_min, self.age_max)
         else:
-            return _('{} jaar en ouder').format(self.age_min)
+            return _("{} jaar en ouder").format(self.age_min)
 
 
 class Trait(models.Model):
@@ -64,32 +63,34 @@ class Trait(models.Model):
     This class of traits is now organised as a subquestion of the special_personal_details under the 2022 regulations,
     but Traits have been recorded before we started recording special_personal_details
     """
+
     order = models.PositiveIntegerField(unique=True)
     description = models.CharField(max_length=200)
     needs_details = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
 
+
 class SpecialDetail(models.Model):
-    """"
+    """ "
     A model to store different 'special details' that are extra sensitive, such as race, sexuality etc.
     """
+
     order = models.PositiveIntegerField(unique=True)
     description = models.CharField(max_length=200)
     medical_traits = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
 
 
-
 class Compensation(models.Model):
     """
     A model to store forms of participant compensation.
@@ -97,13 +98,14 @@ class Compensation(models.Model):
     The 'needs_details' field is used to determine whether the 'compensation_details' field on Study needs to be filled.
     The 'requires_review' field is used in the automatic review to tag anomalous forms of compensation.
     """
+
     order = models.PositiveIntegerField(unique=True)
     description = models.CharField(max_length=200)
     needs_details = models.BooleanField(default=False)
     requires_review = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
@@ -117,6 +119,7 @@ class Recruitment(models.Model):
     The 'needs_details' field is used to determine whether the 'recruitment_details' field on Study needs to be filled.
     The 'requires_review' field is used in the automatic review to tag anomalous forms of recruitment.
     """
+
     order = models.PositiveIntegerField(unique=True)
     description = models.CharField(max_length=200)
     is_local = models.BooleanField(default=False)
@@ -124,8 +127,8 @@ class Recruitment(models.Model):
     requires_review = models.BooleanField(default=False)
 
     class Meta:
-        ordering = ['order']
-        verbose_name = _('Werving')
+        ordering = ["order"]
+        verbose_name = _("Werving")
 
     def __str__(self):
         return self.description
@@ -138,36 +141,40 @@ class Study(models.Model):
     """
 
     order = models.PositiveIntegerField()
-    name = models.CharField(
-        _('Naam traject'),
-        max_length=15,
-        blank=True)
+    name = models.CharField(_("Naam traject"), max_length=15, blank=True)
 
     age_groups = models.ManyToManyField(
         AgeGroup,
-        verbose_name=_(
-            'Uit welke leeftijdscategorie(ën) bestaat je deelnemersgroep?'),
-        help_text=_('De beoogde leeftijdsgroep kan zijn 5-7 jarigen. \
-Dan moet je hier hier 4-5 én 6-11 invullen.'))
+        verbose_name=_("Uit welke leeftijdscategorie(ën) bestaat je deelnemersgroep?"),
+        help_text=_(
+            "De beoogde leeftijdsgroep kan zijn 5-7 jarigen. \
+Dan moet je hier hier 4-5 én 6-11 invullen."
+        ),
+    )
     legally_incapable = models.BooleanField(
-        _('Maakt je onderzoek gebruik van wils<u>on</u>bekwame (volwassen) \
-deelnemers?'), # Note: Form labels with HTML are hard-coded in the Form meta class
-        help_text=_('Wilsonbekwame volwassenen zijn volwassenen waarvan \
+        _(
+            "Maakt je onderzoek gebruik van wils<u>on</u>bekwame (volwassen) \
+deelnemers?"
+        ),  # Note: Form labels with HTML are hard-coded in the Form meta class
+        help_text=_(
+            "Wilsonbekwame volwassenen zijn volwassenen waarvan \
 redelijkerwijs mag worden aangenomen dat ze onvoldoende kunnen inschatten \
 wat hun eventuele deelname allemaal behelst, en/of waarvan anderszins mag \
 worden aangenomen dat informed consent niet goed gerealiseerd kan worden \
 (bijvoorbeeld omdat ze niet goed hun eigen mening kunnen geven). \
 Hier dient in ieder geval altijd informed consent van een relevante \
-vertegenwoordiger te worden verkregen.'),
-        default=False)
-    legally_incapable_details = models.TextField(
-        _('Licht toe'),
-        blank=True)
+vertegenwoordiger te worden verkregen."
+        ),
+        default=False,
+    )
+    legally_incapable_details = models.TextField(_("Licht toe"), blank=True)
 
     has_special_details = models.BooleanField(
-        verbose_name=_('Worden er bijzondere persoonsgegevens verzameld?'),
-        help_text=_("zie de <a href='https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw' \
-            target='_blank'>Richtlijnen</a>"),
+        verbose_name=_("Worden er bijzondere persoonsgegevens verzameld?"),
+        help_text=_(
+            "zie de <a href='https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw' \
+            target='_blank'>Richtlijnen</a>"
+        ),
         null=True,
         blank=True,
     )
@@ -175,161 +182,194 @@ class Study(models.Model):
     special_details = models.ManyToManyField(
         SpecialDetail,
         blank=True,
-        verbose_name=_('Geef aan welke bijzondere persoonsgegevens worden verzameld:')
+        verbose_name=_("Geef aan welke bijzondere persoonsgegevens worden verzameld:"),
     )
 
-
     has_traits = models.BooleanField(
-        _('Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. \
-Is dit in jouw onderzoek bij (een deel van) de deelnemers het geval?'),
-        help_text =_("In de meeste gevallen kun je dit soort gegevens alleen verzamelen als je \
+        _(
+            "Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. \
+Is dit in jouw onderzoek bij (een deel van) de deelnemers het geval?"
+        ),
+        help_text=_(
+            "In de meeste gevallen kun je dit soort gegevens alleen verzamelen als je \
 daar toestemming voor hebt: zie de \
 <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf' target='_blank'>Richtlijnen voor geïnformeerde toestemming,</a> \
 ‘Bijzondere persoonsgegevens’. Is het in de praktijk onmogelijk of \
 disproportioneel moeilijk om om toestemming te vragen, neem dan \
-eerst contact op met de <a href='mailto:privacy.gw@uu.nl'>privacy officer</a>, voordat je je aanvraag indient."),
+eerst contact op met de <a href='mailto:privacy.gw@uu.nl'>privacy officer</a>, voordat je je aanvraag indient."
+        ),
         null=True,
-        blank=True
+        blank=True,
     )
     traits = models.ManyToManyField(
         Trait,
         blank=True,
         verbose_name=_(
-            'Selecteer de medische gegevens van je proefpersonen die worden verzameld'))
-    traits_details = models.CharField(
-        _('Namelijk'),
-        max_length=200,
-        blank=True)
+            "Selecteer de medische gegevens van je proefpersonen die worden verzameld"
+        ),
+    )
+    traits_details = models.CharField(_("Namelijk"), max_length=200, blank=True)
     necessity = models.CharField(
-        _('Is het, om de onderzoeksvraag beantwoord te krijgen, \
+        _(
+            "Is het, om de onderzoeksvraag beantwoord te krijgen, \
 noodzakelijk om het geselecteerde type deelnemer aan het onderzoek te \
-laten meedoen?'),
-        help_text=_('Is het bijvoorbeeld noodzakelijk om kinderen te testen, \
+laten meedoen?"
+        ),
+        help_text=_(
+            "Is het bijvoorbeeld noodzakelijk om kinderen te testen, \
 of zou je de vraag ook kunnen beantwoorden door volwassen deelnemers \
-te testen?'),
+te testen?"
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
-        blank=True)
-    necessity_reason = models.TextField(
-        _('Leg uit waarom'),
-        blank=True)
+        blank=True,
+    )
+    necessity_reason = models.TextField(_("Leg uit waarom"), blank=True)
     recruitment = models.ManyToManyField(
-        Recruitment,
-        verbose_name=_('Hoe worden de deelnemers geworven?'))
+        Recruitment, verbose_name=_("Hoe worden de deelnemers geworven?")
+    )
     recruitment_details = models.TextField(
-        _('Licht toe'),
-        help_text=_('Er zijn specifieke voorbeelddocumenten voor het gebruik van \
-            Amazon Mechanical Turk/Prolific op <a href="{link}">deze pagina</a>.').format(
-                link='https://intranet.uu.nl/en/knowledgebase/documents-ethics-assessment-committee-humanities'),
-        blank=True)
+        _("Licht toe"),
+        help_text=_(
+            'Er zijn specifieke voorbeelddocumenten voor het gebruik van \
+            Amazon Mechanical Turk/Prolific op <a href="{link}">deze pagina</a>.'
+        ).format(
+            link="https://intranet.uu.nl/en/knowledgebase/documents-ethics-assessment-committee-humanities"
+        ),
+        blank=True,
+    )
     compensation = models.ForeignKey(
         Compensation,
-        verbose_name=_(
-            'Welke vergoeding krijgt de deelnemer voor hun deelname?'),
-        help_text=_('Het standaardbedrag voor vergoeding aan de deelnemers \
+        verbose_name=_("Welke vergoeding krijgt de deelnemer voor hun deelname?"),
+        help_text=_(
+            "Het standaardbedrag voor vergoeding aan de deelnemers \
 is €10,- per uur. Minderjarigen mogen geen geld ontvangen, maar wel een \
-cadeautje.'),
+cadeautje."
+        ),
         null=True,
         blank=True,
-        on_delete=models.CASCADE)
-    compensation_details = models.CharField(
-        _('Namelijk'),
-        max_length=200,
-        blank=True)
-    
+        on_delete=models.CASCADE,
+    )
+    compensation_details = models.CharField(_("Namelijk"), max_length=200, blank=True)
+
     hierarchy = models.BooleanField(
-        verbose_name=_('Bestaat een hiërarchische relatie tussen onderzoeker(s) en deelnemer(s)?'),
+        verbose_name=_(
+            "Bestaat een hiërarchische relatie tussen onderzoeker(s) en deelnemer(s)?"
+        ),
         null=True,
         blank=True,
     )
 
     hierarchy_details = models.TextField(
-        verbose_name=_('Zo ja, wat is de relatie (bijv. docent-student)?'),
+        verbose_name=_("Zo ja, wat is de relatie (bijv. docent-student)?"),
         max_length=500,
         blank=True,
     )
 
     # Fields with respect to experimental design
-    has_intervention = models.BooleanField(
-        _('Interventieonderzoek'),
-        default=False)
-    has_observation = models.BooleanField(
-        _('Observatieonderzoek'),
-        default=False)
-    has_sessions = models.BooleanField(
-        _('Taakonderzoek en interviews'),
-        default=False)
+    has_intervention = models.BooleanField(_("Interventieonderzoek"), default=False)
+    has_observation = models.BooleanField(_("Observatieonderzoek"), default=False)
+    has_sessions = models.BooleanField(_("Taakonderzoek en interviews"), default=False)
 
     # Fields with respect to Sessions
     sessions_number = models.PositiveIntegerField(
-        _('Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?'),
+        _("Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?"),
         null=True,
-        validators=[MinValueValidator(1), MaxValueValidator(100)], # Max of 100 is just a technical safeguard
-        help_text=_('Wanneer je bijvoorbeeld eerst de deelnemer een \
+        validators=[
+            MinValueValidator(1),
+            MaxValueValidator(100),
+        ],  # Max of 100 is just a technical safeguard
+        help_text=_(
+            "Wanneer je bijvoorbeeld eerst de deelnemer een \
 taak/aantal taken laat doen tijdens een eerste bezoek aan het lab en \
 je laat de deelnemer nog een keer terugkomen om dezelfde taak/taken \
 of andere taak/taken te doen, dan spreken we van twee sessies. \
 Wanneer je meerdere taken afneemt op dezelfde dag, met pauzes daartussen, \
-dan geldt dat toch als één sessie.'))
+dan geldt dat toch als één sessie."
+        ),
+    )
     deception = models.CharField(
-        _('Is er binnen bovenstaand onderzoekstraject sprake van \
-misleiding van de deelnemer?'),
-        help_text=_('Misleiding is het doelbewust verschaffen van inaccurate \
+        _(
+            "Is er binnen bovenstaand onderzoekstraject sprake van \
+misleiding van de deelnemer?"
+        ),
+        help_text=_(
+            'Misleiding is het doelbewust verschaffen van inaccurate \
 informatie over het doel en/of belangrijke aspecten van de gang van zaken \
 tijdens het onderzoek. Denk aan zaken als een bewust misleidende "cover story" \
 voor het experiment; het ten onrechte suggereren dat er met andere \
 deelnemers wordt samengewerkt; het onaangekondigd aanbieden van een cruciale \
 geheugentaak of het geven van gefingeerde feedback. Wellicht ten overvloede: \
-het gaat hierbij niet om fillers.'),
+het gaat hierbij niet om fillers.'
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
-        blank=True)
+        blank=True,
+    )
     deception_details = models.TextField(
-        _('Geef een toelichting en beschrijf hoe en wanneer de deelnemer \
-zal worden gedebrieft.'),
-        blank=True)
+        _(
+            "Geef een toelichting en beschrijf hoe en wanneer de deelnemer \
+zal worden gedebrieft."
+        ),
+        blank=True,
+    )
     negativity = models.CharField(
-        _('Bevat bovenstaand onderzoekstraject elementen die \
+        _(
+            "Bevat bovenstaand onderzoekstraject elementen die \
 <em>tijdens</em> de deelname niet-triviale negatieve emoties kunnen opwekken? \
 Denk hierbij bijvoorbeeld aan emotioneel indringende vragen, kwetsende \
 uitspraken, negatieve feedback, frustrerende, zware, (heel) lange en/of \
-(heel) saaie taken.'),
+(heel) saaie taken."
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
-        blank=True)
-    negativity_details = models.TextField(
-        _('Licht je antwoord toe.'),
-        blank=True)
+        blank=True,
+    )
+    negativity_details = models.TextField(_("Licht je antwoord toe."), blank=True)
     stressful = models.CharField(
-        _('Bevat bovenstaand onderzoekstraject elementen die tijdens de \
+        _(
+            "Bevat bovenstaand onderzoekstraject elementen die tijdens de \
 deelname zodanig belastend zijn dat deze <em>ondanks de verkregen \
 informed consent</em> vragen zou kunnen oproepen (of zelfs \
 verontwaardiging), bijvoorbeeld bij collega-onderzoekers, bij de deelnemers \
-zelf, of bij ouders of andere vertegenwoordigers?'),
-        help_text=mark_safe_lazy(_('Dit zou bijvoorbeeld het geval kunnen zijn \
-bij een \'onmenselijk\' lange en uitputtende taak, een zeer confronterende \
+zelf, of bij ouders of andere vertegenwoordigers?"
+        ),
+        help_text=mark_safe_lazy(
+            _(
+                "Dit zou bijvoorbeeld het geval kunnen zijn \
+bij een 'onmenselijk' lange en uitputtende taak, een zeer confronterende \
 vragenlijst, of voortdurend vernietigende feedback, maar ook bij een ervaren \
 inbreuk op de privacy, of een ander ervaren gebrek aan respect. \
 Let op, het gaat bij deze vraag om de door de deelnemer ervaren belasting \
 tijdens het onderzoek, niet om de opgelopen psychische of fysieke schade \
-door het onderzoek.')),
+door het onderzoek."
+            )
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
-        blank=True)
+        blank=True,
+    )
     stressful_details = models.TextField(
-        _('Licht je antwoord toe. Geef concrete voorbeelden van de relevante \
+        _(
+            "Licht je antwoord toe. Geef concrete voorbeelden van de relevante \
 aspecten van jouw onderzoek (bijv. representatieve voorbeelden van mogelijk zeer \
 kwetsende woorden of uitspraken in de taak, of van zeer confronterende \
 vragen in een vragenlijst), zodat de commissie zich een goed beeld kan \
-vormen.'),
-        blank=True)
+vormen."
+        ),
+        blank=True,
+    )
     risk = models.CharField(
-        _('Zijn de risico\'s op psychische, fysieke, of andere (bijv. \
+        _(
+            'Zijn de risico\'s op psychische, fysieke, of andere (bijv. \
 economische, juridische) schade door deelname aan bovenstaand \
 onderzoekstraject <em>meer dan</em> minimaal? \
 D.w.z. ligt de kans op en/of omvang van mogelijke schade \
-bij de deelnemers duidelijk <em>boven</em> het "achtergrondrisico"?'),
-        help_text=mark_safe_lazy(_('Achtergrondrisico is datgene dat gezonde, \
+bij de deelnemers duidelijk <em>boven</em> het "achtergrondrisico"?'
+        ),
+        help_text=mark_safe_lazy(
+            _(
+                'Achtergrondrisico is datgene dat gezonde, \
 gemiddelde burgers in de relevante leeftijdscategorie normaalgesproken \
 in het dagelijks leven ten deel valt. \
 Denk bij schade ook aan de gevolgen die het voor de deelnemer of \
@@ -342,29 +382,29 @@ class Study(models.Model):
 een rijexamen, een stressbestendigheids-<em>assessment</em>, een \
 intelligentie- of persoonlijkheidstest, of een hartslagmeting na fysieke \
 inspanning; dit alles, waar relevant, onder begeleiding van adequaat \
-geschoolde specialisten).')),
+geschoolde specialisten).'
+            )
+        ),
         max_length=1,
         choices=YesNoDoubt.choices,
-        blank=True)
-    risk_details = models.TextField(
-        _('Licht toe'),
-        max_length=200,
-        blank=True)
+        blank=True,
+    )
+    risk_details = models.TextField(_("Licht toe"), max_length=200, blank=True)
 
     # References
     proposal = models.ForeignKey(Proposal, on_delete=models.CASCADE)
 
     class Meta:
-        ordering = ['order']
-        unique_together = ('proposal', 'order')
+        ordering = ["order"]
+        unique_together = ("proposal", "order")
 
     def first_session(self):
         """Returns the first Session in this Study"""
-        return self.session_set.order_by('order')[0]
+        return self.session_set.order_by("order")[0]
 
     def last_session(self):
         """Returns the last Session in this Study"""
-        return self.session_set.order_by('-order')[0]
+        return self.session_set.order_by("-order")[0]
 
     def has_children(self):
         """Returns whether the Study contains non-adult AgeGroups"""
@@ -372,21 +412,19 @@ def has_children(self):
 
     def has_participants_below_age(self, age):
         """Returns whether the Study contains AgeGroups with ages below the specified age"""
-        return self.age_groups.filter(
-            Q(age_min__lt=age) & Q(age_max__lt=age)).exists()
+        return self.age_groups.filter(Q(age_min__lt=age) & Q(age_max__lt=age)).exists()
 
     def design_started(self):
         """Checks if the design phase has started"""
-        return any(
-            [self.has_intervention, self.has_observation, self.has_sessions])
+        return any([self.has_intervention, self.has_observation, self.has_sessions])
 
     def design_completed(self):
         """Checks if the design phase has been completed"""
         result = self.design_started()
         if self.has_intervention:
-            result &= hasattr(self, 'intervention')
+            result &= hasattr(self, "intervention")
         if self.has_observation:
-            result &= hasattr(self, 'observation')
+            result &= hasattr(self, "observation")
         if self.has_sessions:
             if self.session_set.all():
                 result &= self.last_session().tasks_duration is not None
@@ -396,7 +434,7 @@ def design_completed(self):
 
     def is_completed(self):
         """Checks if the whole Study has been completed"""
-        return self.design_completed() and self.risk != ''
+        return self.design_completed() and self.risk != ""
 
     def has_missing_forms(self):
         documents = self.get_documents_object()
@@ -404,17 +442,21 @@ def has_missing_forms(self):
 
     def has_missing_sessions(self):
         if self.has_intervention and self.intervention.extra_task:
-            return self.intervention.settings_contains_schools() and not self.has_sessions
+            return (
+                self.intervention.settings_contains_schools() and not self.has_sessions
+            )
 
         return False
 
     def research_settings_contains_schools(self):
-        """ Checks if any research track contains a school in it's setting """
+        """Checks if any research track contains a school in it's setting"""
         if self.has_intervention and self.intervention.settings_contains_schools():
             return True
 
-        if self.has_sessions and self.session_set.filter(
-                setting__is_school=True).exists():
+        if (
+            self.has_sessions
+            and self.session_set.filter(setting__is_school=True).exists()
+        ):
             return True
 
         if self.has_observation and self.observation.settings_contains_schools():
@@ -434,26 +476,33 @@ def get_documents_object(self):
         return Documents.objects.get(study=self, proposal=self.proposal)
 
     def __str__(self):
-        return _('Study details for proposal %s') % self.proposal.title
+        return _("Study details for proposal %s") % self.proposal.title
 
     # DEFUNCT: Passive consent has been removed from studies.
     # These fields are kept for posterity as to not break older proposals.
     passive_consent = models.BooleanField(
-        _('Maak je gebruik van passieve informed consent?'),
-        help_text=mark_safe_lazy(_('Wanneer je kinderen via een instelling \
+        _("Maak je gebruik van passieve informed consent?"),
+        help_text=mark_safe_lazy(
+            _(
+                'Wanneer je kinderen via een instelling \
 (dus ook school) werft en je de ouders niet laat ondertekenen, maar in \
 plaats daarvan de leiding van die instelling, dan maak je gebruik van \
 passieve informed consent. Je kan de templates vinden op \
 <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" \
-target="_blank">de FETC-GW-website</a>.')),
+target="_blank">de FETC-GW-website</a>.'
+            )
+        ),
         null=True,
         blank=True,
     )
     passive_consent_details = models.TextField(
-        _('Licht je antwoord toe. Wij willen je wijzen op het reglement, \
-sectie 3.1 \'d\' en \'e\'. Passive consent is slechts in enkele gevallen \
-toegestaan en draagt niet de voorkeur van de commissie.'),
-        blank=True)
+        _(
+            "Licht je antwoord toe. Wij willen je wijzen op het reglement, \
+sectie 3.1 'd' en 'e'. Passive consent is slechts in enkele gevallen \
+toegestaan en draagt niet de voorkeur van de commissie."
+        ),
+        blank=True,
+    )
 
 
 class Documents(models.Model):
@@ -461,12 +510,11 @@ class Documents(models.Model):
     A model to store consent forms for a study and/or a proposal
     """
 
-    study = models.OneToOneField(Study, on_delete=models.CASCADE, blank=True,
-                                 null=True)
+    study = models.OneToOneField(Study, on_delete=models.CASCADE, blank=True, null=True)
     proposal = models.ForeignKey(Proposal, on_delete=models.CASCADE)
 
     informed_consent = models.FileField(
-        _('Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)'),
+        _("Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"),
         blank=True,
         validators=[validate_pdf_or_doc],
         upload_to=INFORMED_CONSENT_FILENAME,
@@ -474,7 +522,7 @@ class Documents(models.Model):
     )
 
     briefing = models.FileField(
-        _('Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)'),
+        _("Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)"),
         blank=True,
         validators=[validate_pdf_or_doc],
         upload_to=BRIEFING_FILENAME,
@@ -483,17 +531,21 @@ class Documents(models.Model):
 
     director_consent_declaration = models.FileField(
         _(
-            'Upload hier de toestemmingsverklaring voor de leiding of het management van de instelling (in .pdf of .doc(x)-format)'),
+            "Upload hier de toestemmingsverklaring voor de leiding of het management van de instelling (in .pdf of .doc(x)-format)"
+        ),
         blank=True,
         validators=[validate_pdf_or_doc],
-        help_text=_('Upload indien mogelijk een ondertekende versie van het document. Upload als deze nog niet bestaat een blanco versie, en stuur de ondertekende versie later op naar de secretaris van de FETC-GW.'),
+        help_text=_(
+            "Upload indien mogelijk een ondertekende versie van het document. Upload als deze nog niet bestaat een blanco versie, en stuur de ondertekende versie later op naar de secretaris van de FETC-GW."
+        ),
         upload_to=DEPARTMENT_CONSENT_FILENAME,
         storage=OverwriteStorage(),
     )
 
     director_consent_information = models.FileField(
         _(
-            'Upload hier de informatiebrief voor de leiding of het management van de instelling (in .pdf of .doc(x)-formaat)'),
+            "Upload hier de informatiebrief voor de leiding of het management van de instelling (in .pdf of .doc(x)-formaat)"
+        ),
         blank=True,
         validators=[validate_pdf_or_doc],
         upload_to=DEPARTMENT_INFO_FILENAME,
@@ -502,7 +554,8 @@ class Documents(models.Model):
 
     parents_information = models.FileField(
         _(
-            'Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of .doc(x)-formaat)'),
+            "Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of .doc(x)-formaat)"
+        ),
         blank=True,
         validators=[validate_pdf_or_doc],
         upload_to=PARENTAL_INFO_FILENAME,
@@ -518,7 +571,12 @@ def save(self, *args, **kwargs):
         for these forms anyway, so we have to
 
         """
-        if not self.study and not self.informed_consent and not self.briefing and not self.pk:
+        if (
+            not self.study
+            and not self.informed_consent
+            and not self.briefing
+            and not self.pk
+        ):
             return
 
         super(Documents, self).save(*args, **kwargs)
@@ -526,6 +584,6 @@ def save(self, *args, **kwargs):
     def __str__(self):
         if self.study:
             return "Documents object for study '{}', proposal '{}'".format(
-                self.study, self.proposal)
-        return "(Extra) Documents object for proposal '{}'".format(
-            self.proposal)
+                self.study, self.proposal
+            )
+        return "(Extra) Documents object for proposal '{}'".format(self.proposal)
diff --git a/studies/signals/handlers.py b/studies/signals/handlers.py
index 14d4a0ef7..fac72af02 100644
--- a/studies/signals/handlers.py
+++ b/studies/signals/handlers.py
@@ -3,6 +3,7 @@
 from studies.models import Documents, Study
 from studies.utils import create_documents_for_study as create_document_object
 
+
 @receiver(post_save, sender=Study)
 def create_documents_for_study(sender, instance, **kwargs):
     documents = Documents.objects.filter(study=instance)
@@ -13,4 +14,4 @@ def create_documents_for_study(sender, instance, **kwargs):
 
 @receiver(pre_delete, sender=Study)
 def auto_destroy_documents(sender, instance, **kwargs):
-    instance.documents.delete()
\ No newline at end of file
+    instance.documents.delete()
diff --git a/studies/templatetags/describe_documents.py b/studies/templatetags/describe_documents.py
index 46fbafac9..59d3849f1 100644
--- a/studies/templatetags/describe_documents.py
+++ b/studies/templatetags/describe_documents.py
@@ -20,25 +20,25 @@ def describe_file(file):
 
     field_name = file.field.name
 
-    nice_name = _('bestand')
+    nice_name = _("bestand")
 
-    if field_name == 'informed_consent':
-        nice_name = _('informed consent')
+    if field_name == "informed_consent":
+        nice_name = _("informed consent")
 
-    if field_name == 'briefing':
-        nice_name = _('informatiebrief')
+    if field_name == "briefing":
+        nice_name = _("informatiebrief")
 
-    if field_name == 'director_consent_declaration':
-        nice_name = _('informed consent voor de schoolleiding of het departementshoofd')
+    if field_name == "director_consent_declaration":
+        nice_name = _("informed consent voor de schoolleiding of het departementshoofd")
 
-    if field_name == 'director_consent_information':
-        nice_name = _('informatiebrief voor de schoolleiding of het departementshoofd')
+    if field_name == "director_consent_information":
+        nice_name = _("informatiebrief voor de schoolleiding of het departementshoofd")
 
-    if field_name == 'parents_information':
-        nice_name = _('informatiebrief voor de ouders of verzorgers')
+    if field_name == "parents_information":
+        nice_name = _("informatiebrief voor de ouders of verzorgers")
 
-    if field_name == 'dmp_file':
-        nice_name = _('data management plan')
+    if field_name == "dmp_file":
+        nice_name = _("data management plan")
 
     parent = file.instance
 
@@ -56,25 +56,31 @@ def describe_file(file):
         trajectory_name = give_name(parent).lower()
 
     if has_trajectory:
-        trajectory_name = trajectory_name.replace('hoofdtraject',
-                                                  'het hoofdtraject',
-                                                  )
-        out_string = _('''
+        trajectory_name = trajectory_name.replace(
+            "hoofdtraject",
+            "het hoofdtraject",
+        )
+        out_string = _(
+            """
             {} bij {} van aanvraag {}-{}: <i>{}</i>
-            ''').format(nice_name.capitalize(),
-                         trajectory_name,
-                         proposal.reviewing_committee.name,
-                         proposal.reference_number,
-                         escape(proposal.title),
-                         )
+            """
+        ).format(
+            nice_name.capitalize(),
+            trajectory_name,
+            proposal.reviewing_committee.name,
+            proposal.reference_number,
+            escape(proposal.title),
+        )
     else:
-        out_string = _('''
+        out_string = _(
+            """
             {} van aanvraag {}-{}: <i>{}</i>
-            ''').format(nice_name.capitalize(),
-                         proposal.reviewing_committee.name,
-                         proposal.reference_number,
-                         escape(proposal.title),
-                         )
-
+            """
+        ).format(
+            nice_name.capitalize(),
+            proposal.reviewing_committee.name,
+            proposal.reference_number,
+            escape(proposal.title),
+        )
 
     return mark_safe(out_string)
diff --git a/studies/tests.py b/studies/tests.py
index 029b350a6..6b51874ff 100644
--- a/studies/tests.py
+++ b/studies/tests.py
@@ -5,7 +5,6 @@
 from .utils import STUDY_PROGRESS_START, STUDY_PROGRESS_TOTAL, get_study_progress
 
 
-
 class ProgressTestCase(MiscProposalTestCase):
     def test_progress_single(self):
         self.p1.studies_number = 1
@@ -19,7 +18,9 @@ def test_progress_double(self):
         s1 = Study.objects.create(proposal=self.p1, order=1)
         s2 = Study.objects.create(proposal=self.p1, order=2)
         self.assertEqual(STUDY_PROGRESS_START, get_study_progress(s1))
-        self.assertEqual(STUDY_PROGRESS_START + 1/2 * STUDY_PROGRESS_TOTAL, get_study_progress(s2))
+        self.assertEqual(
+            STUDY_PROGRESS_START + 1 / 2 * STUDY_PROGRESS_TOTAL, get_study_progress(s2)
+        )
 
     def test_progress_triple(self):
         self.p1.studies_number = 3
@@ -28,5 +29,11 @@ def test_progress_triple(self):
         s2 = Study.objects.create(proposal=self.p1, order=2)
         s3 = Study.objects.create(proposal=self.p1, order=3)
         self.assertEqual(int(STUDY_PROGRESS_START), get_study_progress(s1))
-        self.assertEqual(int(STUDY_PROGRESS_START + 1/3 * STUDY_PROGRESS_TOTAL), get_study_progress(s2))
-        self.assertEqual(int(STUDY_PROGRESS_START + 2/3 * STUDY_PROGRESS_TOTAL), get_study_progress(s3))
+        self.assertEqual(
+            int(STUDY_PROGRESS_START + 1 / 3 * STUDY_PROGRESS_TOTAL),
+            get_study_progress(s2),
+        )
+        self.assertEqual(
+            int(STUDY_PROGRESS_START + 2 / 3 * STUDY_PROGRESS_TOTAL),
+            get_study_progress(s3),
+        )
diff --git a/studies/translation.py b/studies/translation.py
index c4fe26238..88e250b69 100644
--- a/studies/translation.py
+++ b/studies/translation.py
@@ -5,23 +5,24 @@
 
 @register(AgeGroup)
 class AgeGroupTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(Compensation)
 class CompensationTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(Recruitment)
 class RecruitmentTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(Trait)
 class TraitTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
+
 
 @register(SpecialDetail)
 class SpecialDetailTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
diff --git a/studies/urls.py b/studies/urls.py
index c81504e02..acbc42bf5 100644
--- a/studies/urls.py
+++ b/studies/urls.py
@@ -1,24 +1,28 @@
 from django.urls import path
 
 from .views.session_views import SessionStart
-from .views.study_views import StudyUpdate, StudyDesign, StudyUpdateAttachments, StudyEnd, \
-    has_adults, necessity_required
+from .views.study_views import (
+    StudyUpdate,
+    StudyDesign,
+    StudyUpdateAttachments,
+    StudyEnd,
+    has_adults,
+    necessity_required,
+)
 
-app_name = 'studies'
+app_name = "studies"
 
 urlpatterns = [
     # Study
-    path('update/<int:pk>/', StudyUpdate.as_view(), name='update'),
-
-    path('design/<int:pk>/', StudyDesign.as_view(), name='design'),
-    path('end/<int:pk>/', StudyEnd.as_view(), name='design_end'),
-
-    path('attachments/<int:pk>/', StudyUpdateAttachments.as_view(), name='attachments'),
-
+    path("update/<int:pk>/", StudyUpdate.as_view(), name="update"),
+    path("design/<int:pk>/", StudyDesign.as_view(), name="design"),
+    path("end/<int:pk>/", StudyEnd.as_view(), name="design_end"),
+    path("attachments/<int:pk>/", StudyUpdateAttachments.as_view(), name="attachments"),
     # Session(s)
-    path('session/start/<int:pk>/', SessionStart.as_view(), name='session_start'),
-
+    path("session/start/<int:pk>/", SessionStart.as_view(), name="session_start"),
     # Checks on conditional fields
-    path('check_has_adults/', has_adults, name='check_has_adults'),
-    path('check_necessity_required/', necessity_required, name='check_necessity_required'),
+    path("check_has_adults/", has_adults, name="check_has_adults"),
+    path(
+        "check_necessity_required/", necessity_required, name="check_necessity_required"
+    ),
 ]
diff --git a/studies/utils.py b/studies/utils.py
index 6b7ab7dd3..30c3e9206 100644
--- a/studies/utils.py
+++ b/studies/utils.py
@@ -18,7 +18,9 @@ def check_has_adults(selected_age_groups):
     """
     from .models import AgeGroup
 
-    adult_age_groups = AgeGroup.objects.filter(is_adult=True).values_list('id', flat=True)
+    adult_age_groups = AgeGroup.objects.filter(is_adult=True).values_list(
+        "id", flat=True
+    )
     return bool(set(selected_age_groups).intersection(adult_age_groups))
 
 
@@ -34,7 +36,9 @@ def check_necessity_required(proposal, age_groups, legally_incapable):
     if proposal.relation and not proposal.relation.needs_supervisor:
         result = False
     else:
-        required_values = AgeGroup.objects.filter(needs_details=True).values_list('id', flat=True)
+        required_values = AgeGroup.objects.filter(needs_details=True).values_list(
+            "id", flat=True
+        )
         result = bool(set(required_values).intersection(age_groups))
         result |= bool(legally_incapable)
     return result
@@ -45,7 +49,7 @@ def get_study_progress(study, is_end=False):
         return STUDY_PROGRESS_START
     progress = STUDY_PROGRESS_TOTAL / study.proposal.studies_number
     if not is_end:
-        progress *= (study.order - 1)
+        progress *= study.order - 1
     else:
         progress *= study.order
     return int(STUDY_PROGRESS_START + progress)
@@ -60,15 +64,15 @@ def study_urls(study, prev_study_completed):
     """
     urls = list()
 
-    study_url = AvailableURL(title=_('Deelnemers'))
+    study_url = AvailableURL(title=_("Deelnemers"))
     if study:
-        study_url.url = reverse('studies:update', args=(study.pk,))
+        study_url.url = reverse("studies:update", args=(study.pk,))
 
     urls.append(study_url)
 
-    design_url = AvailableURL(title=_('Onderzoekstype(n)'))
+    design_url = AvailableURL(title=_("Onderzoekstype(n)"))
     if study.compensation:
-        design_url.url = reverse('studies:design', args=(study.pk,))
+        design_url.url = reverse("studies:design", args=(study.pk,))
     urls.append(design_url)
 
     if study.has_intervention:
@@ -81,15 +85,15 @@ def study_urls(study, prev_study_completed):
         urls.append(session_urls(study))
 
     end_url = AvailableURL(
-        title=_('Overzicht'),
+        title=_("Overzicht"),
     )
 
     if prev_study_completed:
-        end_url.url = reverse('studies:design_end', args=(study.pk,))
+        end_url.url = reverse("studies:design_end", args=(study.pk,))
     urls.append(end_url)
 
     return AvailableURL(
-        title=_('Traject {}').format(study.order),
+        title=_("Traject {}").format(study.order),
         is_title=True,
         children=urls,
     )
@@ -117,7 +121,9 @@ def copy_study_to_proposal(proposal, original_study):
     traits = original_study.traits.all()
     compensation = original_study.compensation
     recruitment = original_study.recruitment.all()
-    intervention = original_study.intervention if original_study.has_intervention else None
+    intervention = (
+        original_study.intervention if original_study.has_intervention else None
+    )
     observation = original_study.observation if original_study.has_observation else None
     sessions = original_study.session_set.all() if original_study.has_sessions else []
 
diff --git a/studies/views/session_views.py b/studies/views/session_views.py
index 7a638d13c..2583c6eef 100644
--- a/studies/views/session_views.py
+++ b/studies/views/session_views.py
@@ -16,20 +16,23 @@
 ######################
 class SessionStart(AllowErrorsOnBackbuttonMixin, UpdateView):
     """Initial creation of Sessions"""
+
     model = Study
     form_class = SessionStartForm
-    template_name = 'studies/session_start.html'
-    success_message = _('%(sessions_number)s sessie(s) voor studie %(title)s aangemaakt')
+    template_name = "studies/session_start.html"
+    success_message = _(
+        "%(sessions_number)s sessie(s) voor studie %(title)s aangemaakt"
+    )
 
     def get_context_data(self, **kwargs):
         """Setting the progress on the context"""
         context = super(SessionStart, self).get_context_data(**kwargs)
-        context['progress'] = get_study_progress(self.object) + 9
+        context["progress"] = get_study_progress(self.object) + 9
         return context
 
     def form_valid(self, form):
         """Creates or deletes Sessions on save"""
-        nr_sessions = form.cleaned_data['sessions_number']
+        nr_sessions = form.cleaned_data["sessions_number"]
         study = form.instance
         current = study.session_set.count() or 0
 
@@ -49,7 +52,7 @@ def form_valid(self, form):
 
     def get_next_url(self):
         """Continue to the addition of Tasks"""
-        return reverse('tasks:start', args=(self.object.first_session().pk,))
+        return reverse("tasks:start", args=(self.object.first_session().pk,))
 
     def get_back_url(self):
         """
@@ -57,16 +60,18 @@ def get_back_url(self):
         return to this part. Otherwise, return to the Study design overview.
         """
         study = self.object
-        next_url = 'studies:design'
+        next_url = "studies:design"
         pk = study.pk
         if study.has_observation:
-            next_url = 'observations:update'
+            next_url = "observations:update"
             pk = study.observation.pk
         elif study.has_intervention:
-            next_url = 'interventions:update'
+            next_url = "interventions:update"
             pk = study.intervention.pk
         return reverse(next_url, args=(pk,))
 
     def get_success_message(self, cleaned_data):
         """Fill the success message using the cleaned_data"""
-        return self.success_message % dict(cleaned_data, title=self.object.proposal.title)
+        return self.success_message % dict(
+            cleaned_data, title=self.object.proposal.title
+        )
diff --git a/studies/views/study_views.py b/studies/views/study_views.py
index 134434c6b..079580752 100644
--- a/studies/views/study_views.py
+++ b/studies/views/study_views.py
@@ -14,7 +14,13 @@
 from interventions.models import Intervention
 from observations.models import Observation
 
-from ..forms import StudyForm, StudyDesignForm, StudyConsentForm, StudyEndForm, StudyUpdateAttachmentsForm
+from ..forms import (
+    StudyForm,
+    StudyDesignForm,
+    StudyConsentForm,
+    StudyEndForm,
+    StudyUpdateAttachmentsForm,
+)
 from ..models import Study, Documents
 from ..utils import check_has_adults, check_necessity_required, get_study_progress
 
@@ -24,34 +30,35 @@
 #######################
 class StudyUpdate(AllowErrorsOnBackbuttonMixin, UpdateView):
     """Updates a Study from a StudyForm"""
+
     model = Study
     form_class = StudyForm
-    success_message = _('Studie opgeslagen')
+    success_message = _("Studie opgeslagen")
 
     def get_context_data(self, **kwargs):
         """Setting the progress on the context"""
         context = super(StudyUpdate, self).get_context_data(**kwargs)
-        context['progress'] = get_study_progress(self.object)
+        context["progress"] = get_study_progress(self.object)
         return context
 
     def get_form_kwargs(self):
         """Sets the Proposal as a form kwarg"""
         kwargs = super(StudyUpdate, self).get_form_kwargs()
-        kwargs['proposal'] = self.object.proposal
+        kwargs["proposal"] = self.object.proposal
         return kwargs
 
     def get_back_url(self):
         proposal = self.object.proposal
         if self.object.order == 1:
-            return reverse('proposals:study_start', args=(proposal.pk,))
+            return reverse("proposals:study_start", args=(proposal.pk,))
         else:
             prev = self.object.order - 1
             prev_study = Study.objects.get(proposal=proposal, order=prev)
-            return reverse('studies:design_end', args=(prev_study.pk,))
+            return reverse("studies:design_end", args=(prev_study.pk,))
 
     def get_next_url(self):
         """Continue to the Study design overview"""
-        return reverse('studies:design', args=(self.object.pk,))
+        return reverse("studies:design", args=(self.object.pk,))
 
 
 ###############
@@ -60,13 +67,13 @@ def get_next_url(self):
 class StudyDesign(AllowErrorsOnBackbuttonMixin, UpdateView):
     model = Study
     form_class = StudyDesignForm
-    success_message = _('Traject opgeslagen')
-    template_name = 'studies/study_design.html'
+    success_message = _("Traject opgeslagen")
+    template_name = "studies/study_design.html"
 
     def get_context_data(self, **kwargs):
         """Setting the progress on the context"""
         context = super(StudyDesign, self).get_context_data(**kwargs)
-        context['progress'] = get_study_progress(self.object) + 3
+        context["progress"] = get_study_progress(self.object) + 3
         return context
 
     def get_next_url(self):
@@ -75,48 +82,50 @@ def get_next_url(self):
         continue to this part. Otherwise, continue to the Study start overview.
         """
         study = self.object
-        next_url = 'studies:design_end'
+        next_url = "studies:design_end"
         pk = study.pk
         if study.has_intervention:
-            if hasattr(study, 'intervention'):
-                next_url = 'interventions:update'
+            if hasattr(study, "intervention"):
+                next_url = "interventions:update"
                 pk = study.intervention.pk
             else:
-                next_url = 'interventions:create'
+                next_url = "interventions:create"
         elif study.has_observation:
-            if hasattr(study, 'observation'):
-                next_url = 'observations:update'
+            if hasattr(study, "observation"):
+                next_url = "observations:update"
                 pk = study.observation.pk
             else:
-                next_url = 'observations:create'
+                next_url = "observations:create"
         elif study.has_sessions:
-            next_url = 'studies:session_start'
+            next_url = "studies:session_start"
         return reverse(next_url, args=(pk,))
 
     def get_back_url(self):
         """
         Return to the Study overview
         """
-        return reverse('studies:update', args=(self.kwargs['pk'],))
+        return reverse("studies:update", args=(self.kwargs["pk"],))
+
 
 class StudyEnd(AllowErrorsOnBackbuttonMixin, UpdateView):
     """
     Completes a Study
     """
+
     model = Study
     form_class = StudyEndForm
-    template_name = 'studies/study_end.html'
+    template_name = "studies/study_end.html"
 
     def get_context_data(self, **kwargs):
         """Setting the progress on the context"""
         context = super(StudyEnd, self).get_context_data(**kwargs)
-        context['progress'] = get_study_progress(self.object, True) - 10
+        context["progress"] = get_study_progress(self.object, True) - 10
         return context
 
     def get_form_kwargs(self):
         """Sets the Study as a form kwarg"""
         kwargs = super(StudyEnd, self).get_form_kwargs()
-        kwargs['study'] = self.object
+        kwargs["study"] = self.object
         return kwargs
 
     def get_next_url(self):
@@ -128,23 +137,23 @@ def get_next_url(self):
         if self.object.order < proposal.studies_number:
             next_order = self.object.order + 1
             next_study = Study.objects.get(proposal=proposal, order=next_order)
-            return reverse('studies:update', args=(next_study.pk,))
+            return reverse("studies:update", args=(next_study.pk,))
         else:
-            return reverse('proposals:translated', args=(proposal.pk,))
+            return reverse("proposals:translated", args=(proposal.pk,))
 
     def get_back_url(self):
         study = self.object
         if study.has_sessions:
-            next_url = 'tasks:end'
+            next_url = "tasks:end"
             pk = self.object.last_session().pk
         elif study.has_intervention:
-            next_url = 'interventions:update'
+            next_url = "interventions:update"
             pk = Intervention.objects.get(study=study).pk
         elif study.has_observation:
-            next_url = 'observations:update'
+            next_url = "observations:update"
             pk = Observation.objects.get(study=study).pk
         else:
-            next_url = 'studies:design'
+            next_url = "studies:design"
             pk = study.pk
 
         return reverse(next_url, args=(pk,))
@@ -154,14 +163,15 @@ class StudyUpdateAttachments(braces.GroupRequiredMixin, generic.UpdateView):
     """
     Allows the secretary to change the attachments on Study level
     """
+
     model = Documents
-    template_name = 'studies/study_update_attachments.html'
+    template_name = "studies/study_update_attachments.html"
     form_class = StudyUpdateAttachmentsForm
     group_required = settings.GROUP_SECRETARY
 
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
-        return self.request.POST.get('next', '/')
+        return self.request.POST.get("next", "/")
 
 
 ################
@@ -172,8 +182,8 @@ def has_adults(request):
     """
     This call checks whether the selected AgeGroups contain adult age groups.
     """
-    age_groups = map(int, request.POST.getlist('age_groups[]'))
-    return JsonResponse({'result': check_has_adults(age_groups)})
+    age_groups = map(int, request.POST.getlist("age_groups[]"))
+    return JsonResponse({"result": check_has_adults(age_groups)})
 
 
 @csrf_exempt
@@ -185,7 +195,9 @@ def necessity_required(request):
     ** Participants have been selected on certain traits.
     ** Participants are legally incapable.
     """
-    proposal = Proposal.objects.get(pk=request.POST.get('proposal_pk'))
-    age_groups = map(int, request.POST.getlist('age_groups[]'))
-    legally_incapable = string_to_bool(request.POST.get('legally_incapable'))
-    return JsonResponse({'result': check_necessity_required(proposal, age_groups, legally_incapable)})
+    proposal = Proposal.objects.get(pk=request.POST.get("proposal_pk"))
+    age_groups = map(int, request.POST.getlist("age_groups[]"))
+    legally_incapable = string_to_bool(request.POST.get("legally_incapable"))
+    return JsonResponse(
+        {"result": check_necessity_required(proposal, age_groups, legally_incapable)}
+    )
diff --git a/tasks/admin.py b/tasks/admin.py
index 0ebaec78f..6f647082d 100644
--- a/tasks/admin.py
+++ b/tasks/admin.py
@@ -5,13 +5,27 @@
 
 @admin.register(Registration)
 class RegistrationAdmin(admin.ModelAdmin):
-    list_display = ('order', 'description', 'is_local', 'needs_details', 'needs_kind', 'requires_review', 'age_min', )
-    list_display_links = ('description', )
-    ordering = ['order']
+    list_display = (
+        "order",
+        "description",
+        "is_local",
+        "needs_details",
+        "needs_kind",
+        "requires_review",
+        "age_min",
+    )
+    list_display_links = ("description",)
+    ordering = ["order"]
 
 
 @admin.register(RegistrationKind)
 class RegistrationKindAdmin(admin.ModelAdmin):
-    list_display = ('registration', 'order', 'description', 'needs_details', 'requires_review', )
-    list_display_links = ('description', )
-    ordering = ['registration', 'order']
+    list_display = (
+        "registration",
+        "order",
+        "description",
+        "needs_details",
+        "requires_review",
+    )
+    list_display_links = ("description",)
+    ordering = ["registration", "order"]
diff --git a/tasks/forms.py b/tasks/forms.py
index 1036fdf25..33f756a42 100644
--- a/tasks/forms.py
+++ b/tasks/forms.py
@@ -10,34 +10,42 @@
 
 from django.utils.safestring import mark_safe
 from django.utils.functional import lazy
+
 mark_safe_lazy = lazy(mark_safe, str)
 
+
 class TaskStartForm(SoftValidationMixin, ConditionalModelForm):
     is_copy = forms.BooleanField(
-        label=_('Is deze sessie een kopie van een voorgaande sessie?'),
-        help_text=_(u'Na het kopiëren zijn alle velden bewerkbaar.'),
+        label=_("Is deze sessie een kopie van een voorgaande sessie?"),
+        help_text=_("Na het kopiëren zijn alle velden bewerkbaar."),
         widget=forms.RadioSelect(choices=YES_NO),
         initial=False,
-        required=False)
+        required=False,
+    )
     parent_session = forms.ModelChoiceField(
-        label=_(u'Te kopiëren sessie'),
-        queryset=Session.objects.all(),
-        required=False)
+        label=_("Te kopiëren sessie"), queryset=Session.objects.all(), required=False
+    )
 
     class Meta:
         model = Session
         fields = [
-            'setting', 'setting_details', 'supervision', 'leader_has_coc',
-            'tasks_number',
+            "setting",
+            "setting_details",
+            "supervision",
+            "leader_has_coc",
+            "tasks_number",
         ]
         widgets = {
-            'setting': forms.CheckboxSelectMultiple(),
-            'supervision': forms.RadioSelect(choices=YES_NO),
-            'leader_has_coc': forms.RadioSelect(choices=YES_NO),
+            "setting": forms.CheckboxSelectMultiple(),
+            "supervision": forms.RadioSelect(choices=YES_NO),
+            "leader_has_coc": forms.RadioSelect(choices=YES_NO),
         }
 
     _soft_validation_fields = [
-        'setting', 'setting_details', 'supervision', 'leader_has_coc'
+        "setting",
+        "setting_details",
+        "supervision",
+        "leader_has_coc",
     ]
 
     def __init__(self, *args, **kwargs):
@@ -48,21 +56,22 @@ def __init__(self, *args, **kwargs):
         - Remove option to copy altogether from first Session
         - Don't ask the supervision question when there are only adult AgeGroups in this Study
         """
-        self.study = kwargs.pop('study', None)
+        self.study = kwargs.pop("study", None)
 
         super(TaskStartForm, self).__init__(*args, **kwargs)
-        self.fields['tasks_number'].required = False
-        self.fields['parent_session'].queryset = Session.objects.filter(study=self.instance.study.pk,
-                                                                        order__lt=self.instance.order)
+        self.fields["tasks_number"].required = False
+        self.fields["parent_session"].queryset = Session.objects.filter(
+            study=self.instance.study.pk, order__lt=self.instance.order
+        )
 
         if self.instance.order == 1:
-            del self.fields['is_copy']
-            del self.fields['parent_session']
+            del self.fields["is_copy"]
+            del self.fields["parent_session"]
 
         # TODO: add warning
         if not self.study.has_children():
-            del self.fields['supervision']
-            del self.fields['leader_has_coc']
+            del self.fields["supervision"]
+            del self.fields["leader_has_coc"]
 
     def clean(self):
         """
@@ -73,41 +82,58 @@ def clean(self):
         """
         cleaned_data = super(TaskStartForm, self).clean()
 
-        self.mark_soft_required(cleaned_data, 'setting')
+        self.mark_soft_required(cleaned_data, "setting")
 
-        self.check_dependency_multiple(cleaned_data, 'setting', 'needs_details', 'setting_details')
+        self.check_dependency_multiple(
+            cleaned_data, "setting", "needs_details", "setting_details"
+        )
         if self.study.has_children():
-            self.check_dependency_multiple(cleaned_data, 'setting', 'needs_supervision', 'supervision')
-            self.check_dependency(cleaned_data, 'supervision', 'leader_has_coc', f1_value=False)
-
-        self.check_dependency(cleaned_data, 'is_copy', 'parent_session')
-        if not cleaned_data.get('is_copy') and not cleaned_data.get('tasks_number'):
+            self.check_dependency_multiple(
+                cleaned_data, "setting", "needs_supervision", "supervision"
+            )
+            self.check_dependency(
+                cleaned_data, "supervision", "leader_has_coc", f1_value=False
+            )
+
+        self.check_dependency(cleaned_data, "is_copy", "parent_session")
+        if not cleaned_data.get("is_copy") and not cleaned_data.get("tasks_number"):
             # Prevent double required errors
-            if 'tasks_number' not in self.errors:
-                self.add_error('tasks_number', forms.ValidationError(_('Dit veld is verplicht.'), code='required'))
+            if "tasks_number" not in self.errors:
+                self.add_error(
+                    "tasks_number",
+                    forms.ValidationError(_("Dit veld is verplicht."), code="required"),
+                )
 
-            
 
 class TaskForm(SoftValidationMixin, ConditionalModelForm):
     class Meta:
         model = Task
         fields = [
-            'name', 'description', 'duration',
-            'registrations', 'registrations_details',
-            'registration_kinds', 'registration_kinds_details',
-            'feedback', 'feedback_details',
+            "name",
+            "description",
+            "duration",
+            "registrations",
+            "registrations_details",
+            "registration_kinds",
+            "registration_kinds_details",
+            "feedback",
+            "feedback_details",
         ]
         labels = {
-            'duration': mark_safe_lazy(_('Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, \
+            "duration": mark_safe_lazy(
+                _(
+                    "Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, \
 dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak \
 (exclusief instructie maar inclusief oefensessie)? \
 Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), \
-geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>.')),
-            }
+geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>."
+                )
+            ),
+        }
         widgets = {
-            'registrations': forms.CheckboxSelectMultiple(),
-            'registration_kinds': forms.CheckboxSelectMultiple(),
-            'feedback': forms.RadioSelect(choices=YES_NO),
+            "registrations": forms.CheckboxSelectMultiple(),
+            "registration_kinds": forms.CheckboxSelectMultiple(),
+            "feedback": forms.RadioSelect(choices=YES_NO),
         }
 
     def __init__(self, *args, **kwargs):
@@ -130,23 +156,32 @@ def clean(self):
 
         self.mark_soft_required(
             cleaned_data,
-            'name',
-            'description',
-            'duration',
+            "name",
+            "description",
+            "duration",
             #'registrations',
         )
 
-        self.check_empty(cleaned_data, 'feedback')
-        self.check_dependency_multiple(cleaned_data, 'registrations', 'needs_kind', 'registration_kinds')
-        self.check_dependency_multiple(cleaned_data, 'registrations', 'needs_details', 'registrations_details')
-        self.check_dependency_multiple(cleaned_data, 'registration_kinds', 'needs_details', 'registration_kinds_details')
-        self.check_dependency(cleaned_data, 'feedback', 'feedback_details')
+        self.check_empty(cleaned_data, "feedback")
+        self.check_dependency_multiple(
+            cleaned_data, "registrations", "needs_kind", "registration_kinds"
+        )
+        self.check_dependency_multiple(
+            cleaned_data, "registrations", "needs_details", "registrations_details"
+        )
+        self.check_dependency_multiple(
+            cleaned_data,
+            "registration_kinds",
+            "needs_details",
+            "registration_kinds_details",
+        )
+        self.check_dependency(cleaned_data, "feedback", "feedback_details")
 
 
 class TaskEndForm(SoftValidationMixin, forms.ModelForm):
     class Meta:
         model = Session
-        fields = ['tasks_duration']
+        fields = ["tasks_duration"]
 
     def __init__(self, *args, **kwargs):
         """
@@ -155,11 +190,11 @@ def __init__(self, *args, **kwargs):
         """
         super(TaskEndForm, self).__init__(*args, **kwargs)
 
-        tasks_duration = self.fields['tasks_duration']
+        tasks_duration = self.fields["tasks_duration"]
         label = tasks_duration.label % self.instance.net_duration()
         tasks_duration.label = mark_safe(label)
 
-    _soft_validation_fields = ['tasks_duration']
+    _soft_validation_fields = ["tasks_duration"]
 
     def is_initial_visit(self) -> bool:
         return True
@@ -167,7 +202,7 @@ def is_initial_visit(self) -> bool:
     def clean(self):
         cleaned_data = super(TaskEndForm, self).clean()
 
-        self.mark_soft_required(cleaned_data, 'tasks_duration')
+        self.mark_soft_required(cleaned_data, "tasks_duration")
 
         return cleaned_data
 
@@ -175,9 +210,12 @@ def clean_tasks_duration(self):
         """
         Check that the net duration is at least equal to the gross duration
         """
-        tasks_duration = self.cleaned_data.get('tasks_duration')
+        tasks_duration = self.cleaned_data.get("tasks_duration")
 
         if tasks_duration and tasks_duration < self.instance.net_duration():
-            raise forms.ValidationError(_('Totale sessieduur moet minstens gelijk zijn aan netto sessieduur.'), code='comparison')
+            raise forms.ValidationError(
+                _("Totale sessieduur moet minstens gelijk zijn aan netto sessieduur."),
+                code="comparison",
+            )
 
         return tasks_duration
diff --git a/tasks/migrations/0001_initial.py b/tasks/migrations/0001_initial.py
index 7c514c215..1f60df860 100644
--- a/tasks/migrations/0001_initial.py
+++ b/tasks/migrations/0001_initial.py
@@ -6,85 +6,207 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('studies', '0001_initial'),
-        ('main', '0001_initial'),
+        ("studies", "0001_initial"),
+        ("main", "0001_initial"),
     ]
 
     operations = [
         migrations.CreateModel(
-            name='Registration',
+            name="Registration",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('needs_kind', models.BooleanField(default=False)),
-                ('requires_review', models.BooleanField(default=False)),
-                ('age_min', models.PositiveIntegerField(null=True, blank=True)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("needs_kind", models.BooleanField(default=False)),
+                ("requires_review", models.BooleanField(default=False)),
+                ("age_min", models.PositiveIntegerField(null=True, blank=True)),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='RegistrationKind',
+            name="RegistrationKind",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField(unique=True)),
-                ('description', models.CharField(max_length=200)),
-                ('needs_details', models.BooleanField(default=False)),
-                ('requires_review', models.BooleanField(default=False)),
-                ('registration', models.ForeignKey(to='tasks.Registration', on_delete=models.CASCADE)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField(unique=True)),
+                ("description", models.CharField(max_length=200)),
+                ("needs_details", models.BooleanField(default=False)),
+                ("requires_review", models.BooleanField(default=False)),
+                (
+                    "registration",
+                    models.ForeignKey(
+                        to="tasks.Registration", on_delete=models.CASCADE
+                    ),
+                ),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Session',
+            name="Session",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('setting_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('supervision', models.NullBooleanField(verbose_name='Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?')),
-                ('order', models.PositiveIntegerField()),
-                ('tasks_number', models.PositiveIntegerField(help_text='Wanneer u bijvoorbeeld eerst de deelnemer observeert en de deelnemer vervolgens een vragenlijst afneemt, dan vult u hierboven "2" in. Electrodes plakken, sessie-debriefing en kort (< 3 minuten) exit-interview gelden niet als een taak.', null=True, verbose_name='Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?', validators=[django.core.validators.MinValueValidator(1)])),
-                ('tasks_duration', models.PositiveIntegerField(null=True, verbose_name='De totale geschatte netto taakduur van uw sessie komt op basis van uw opgave per taak uit op <strong>%d minuten</strong>. Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, instructies per taak, pauzes tussen taken, en debriefing? (bij labbezoek dus van binnenkomst tot vertrek)')),
-                ('setting', models.ManyToManyField(to='main.Setting',
-                                                   verbose_name='Geef aan waar de dataverzameling plaatsvindt')),
-                ('study', models.ForeignKey(to='studies.Study', on_delete=models.CASCADE)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                (
+                    "setting_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "supervision",
+                    models.NullBooleanField(
+                        verbose_name="Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?"
+                    ),
+                ),
+                ("order", models.PositiveIntegerField()),
+                (
+                    "tasks_number",
+                    models.PositiveIntegerField(
+                        help_text='Wanneer u bijvoorbeeld eerst de deelnemer observeert en de deelnemer vervolgens een vragenlijst afneemt, dan vult u hierboven "2" in. Electrodes plakken, sessie-debriefing en kort (< 3 minuten) exit-interview gelden niet als een taak.',
+                        null=True,
+                        verbose_name="Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?",
+                        validators=[django.core.validators.MinValueValidator(1)],
+                    ),
+                ),
+                (
+                    "tasks_duration",
+                    models.PositiveIntegerField(
+                        null=True,
+                        verbose_name="De totale geschatte netto taakduur van uw sessie komt op basis van uw opgave per taak uit op <strong>%d minuten</strong>. Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, instructies per taak, pauzes tussen taken, en debriefing? (bij labbezoek dus van binnenkomst tot vertrek)",
+                    ),
+                ),
+                (
+                    "setting",
+                    models.ManyToManyField(
+                        to="main.Setting",
+                        verbose_name="Geef aan waar de dataverzameling plaatsvindt",
+                    ),
+                ),
+                (
+                    "study",
+                    models.ForeignKey(to="studies.Study", on_delete=models.CASCADE),
+                ),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.CreateModel(
-            name='Task',
+            name="Task",
             fields=[
-                ('id', models.AutoField(verbose_name='ID', serialize=False, auto_created=True, primary_key=True)),
-                ('order', models.PositiveIntegerField()),
-                ('name', models.CharField(max_length=200, verbose_name='Wat is de naam van de taak?')),
-                ('description', models.TextField(verbose_name='Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van uw onderzoeksvragen bijdraagt.')),
-                ('duration', models.PositiveIntegerField(default=0, verbose_name='Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak (exclusief instructie maar inclusief oefensessie)? Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), geef dan het redelijkerwijs te verwachten maximum op.', validators=[django.core.validators.MinValueValidator(1)])),
-                ('registrations_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('registration_kinds_details', models.CharField(max_length=200, verbose_name='Namelijk', blank=True)),
-                ('feedback', models.NullBooleanField(verbose_name='Krijgt de deelnemer tijdens of na deze taak feedback op zijn/haar gedrag of toestand?')),
-                ('feedback_details', models.TextField(verbose_name='Beschrijf hoe de feedback wordt gegeven.', blank=True)),
-                ('registration_kinds', models.ManyToManyField(to='tasks.RegistrationKind', verbose_name='Kies het soort meting', blank=True)),
-                ('registrations', models.ManyToManyField(to='tasks.Registration', verbose_name='Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?')),
-                ('session', models.ForeignKey(to='tasks.Session', on_delete=models.CASCADE)),
+                (
+                    "id",
+                    models.AutoField(
+                        verbose_name="ID",
+                        serialize=False,
+                        auto_created=True,
+                        primary_key=True,
+                    ),
+                ),
+                ("order", models.PositiveIntegerField()),
+                (
+                    "name",
+                    models.CharField(
+                        max_length=200, verbose_name="Wat is de naam van de taak?"
+                    ),
+                ),
+                (
+                    "description",
+                    models.TextField(
+                        verbose_name="Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van uw onderzoeksvragen bijdraagt."
+                    ),
+                ),
+                (
+                    "duration",
+                    models.PositiveIntegerField(
+                        default=0,
+                        verbose_name="Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak (exclusief instructie maar inclusief oefensessie)? Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), geef dan het redelijkerwijs te verwachten maximum op.",
+                        validators=[django.core.validators.MinValueValidator(1)],
+                    ),
+                ),
+                (
+                    "registrations_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "registration_kinds_details",
+                    models.CharField(
+                        max_length=200, verbose_name="Namelijk", blank=True
+                    ),
+                ),
+                (
+                    "feedback",
+                    models.NullBooleanField(
+                        verbose_name="Krijgt de deelnemer tijdens of na deze taak feedback op zijn/haar gedrag of toestand?"
+                    ),
+                ),
+                (
+                    "feedback_details",
+                    models.TextField(
+                        verbose_name="Beschrijf hoe de feedback wordt gegeven.",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "registration_kinds",
+                    models.ManyToManyField(
+                        to="tasks.RegistrationKind",
+                        verbose_name="Kies het soort meting",
+                        blank=True,
+                    ),
+                ),
+                (
+                    "registrations",
+                    models.ManyToManyField(
+                        to="tasks.Registration",
+                        verbose_name="Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?",
+                    ),
+                ),
+                (
+                    "session",
+                    models.ForeignKey(to="tasks.Session", on_delete=models.CASCADE),
+                ),
             ],
             options={
-                'ordering': ['order'],
+                "ordering": ["order"],
             },
         ),
         migrations.AlterUniqueTogether(
-            name='task',
-            unique_together=set([('session', 'order')]),
+            name="task",
+            unique_together=set([("session", "order")]),
         ),
         migrations.AlterUniqueTogether(
-            name='session',
-            unique_together=set([('study', 'order')]),
+            name="session",
+            unique_together=set([("study", "order")]),
         ),
     ]
diff --git a/tasks/migrations/0002_auto_20160927_2106.py b/tasks/migrations/0002_auto_20160927_2106.py
index 6f6ec63b7..01d4f3fe2 100644
--- a/tasks/migrations/0002_auto_20160927_2106.py
+++ b/tasks/migrations/0002_auto_20160927_2106.py
@@ -6,20 +6,25 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0001_initial'),
+        ("tasks", "0001_initial"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='task',
-            name='description',
-            field=models.TextField(verbose_name='Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van uw onderzoeksvragen bijdraagt. Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli dat u van plan bent aan de deelnemer aan te bieden. Het moet voor de commissieleden duidelijk zijn wat u precies gaat doen.'),
+            model_name="task",
+            name="description",
+            field=models.TextField(
+                verbose_name="Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van uw onderzoeksvragen bijdraagt. Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli dat u van plan bent aan de deelnemer aan te bieden. Het moet voor de commissieleden duidelijk zijn wat u precies gaat doen."
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='duration',
-            field=models.PositiveIntegerField(default=0, verbose_name='Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak (exclusief instructie maar inclusief oefensessie)? Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>.', validators=[django.core.validators.MinValueValidator(1)]),
+            model_name="task",
+            name="duration",
+            field=models.PositiveIntegerField(
+                default=0,
+                verbose_name="Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak (exclusief instructie maar inclusief oefensessie)? Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>.",
+                validators=[django.core.validators.MinValueValidator(1)],
+            ),
         ),
     ]
diff --git a/tasks/migrations/0003_auto_20161013_1959.py b/tasks/migrations/0003_auto_20161013_1959.py
index 2611dae59..2b112c733 100644
--- a/tasks/migrations/0003_auto_20161013_1959.py
+++ b/tasks/migrations/0003_auto_20161013_1959.py
@@ -5,30 +5,29 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0002_auto_20160927_2106'),
+        ("tasks", "0002_auto_20160927_2106"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='registration',
-            name='description_en',
+            model_name="registration",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='registration',
-            name='description_nl',
+            model_name="registration",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='registrationkind',
-            name='description_en',
+            model_name="registrationkind",
+            name="description_en",
             field=models.CharField(max_length=200, null=True),
         ),
         migrations.AddField(
-            model_name='registrationkind',
-            name='description_nl',
+            model_name="registrationkind",
+            name="description_nl",
             field=models.CharField(max_length=200, null=True),
         ),
     ]
diff --git a/tasks/migrations/0004_auto_20170601_0816.py b/tasks/migrations/0004_auto_20170601_0816.py
index fc4bd1a9d..e3272efbd 100644
--- a/tasks/migrations/0004_auto_20170601_0816.py
+++ b/tasks/migrations/0004_auto_20170601_0816.py
@@ -5,19 +5,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0003_auto_20161013_1959'),
+        ("tasks", "0003_auto_20161013_1959"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='registration',
-            options={'ordering': ['order'], 'verbose_name': 'Vastlegging gedrag'},
+            name="registration",
+            options={"ordering": ["order"], "verbose_name": "Vastlegging gedrag"},
         ),
         migrations.AddField(
-            model_name='registration',
-            name='is_local',
+            model_name="registration",
+            name="is_local",
             field=models.BooleanField(default=False),
         ),
     ]
diff --git a/tasks/migrations/0005_session_leader_has_coc.py b/tasks/migrations/0005_session_leader_has_coc.py
index 3ad3c71f7..90d51d7a0 100644
--- a/tasks/migrations/0005_session_leader_has_coc.py
+++ b/tasks/migrations/0005_session_leader_has_coc.py
@@ -5,15 +5,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0004_auto_20170601_0816'),
+        ("tasks", "0004_auto_20170601_0816"),
     ]
 
     operations = [
         migrations.AddField(
-            model_name='session',
-            name='leader_has_coc',
-            field=models.NullBooleanField(help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De ETCL neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="session",
+            name="leader_has_coc",
+            field=models.NullBooleanField(
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De ETCL neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
     ]
diff --git a/tasks/migrations/0006_auto_20190206_1452.py b/tasks/migrations/0006_auto_20190206_1452.py
index 3120dda0e..8e93d3058 100644
--- a/tasks/migrations/0006_auto_20190206_1452.py
+++ b/tasks/migrations/0006_auto_20190206_1452.py
@@ -7,35 +7,52 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0005_session_leader_has_coc'),
+        ("tasks", "0005_session_leader_has_coc"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='session',
-            name='setting',
-            field=models.ManyToManyField(blank=True, to='main.Setting', verbose_name='Geef aan waar de dataverzameling plaatsvindt'),
+            model_name="session",
+            name="setting",
+            field=models.ManyToManyField(
+                blank=True,
+                to="main.Setting",
+                verbose_name="Geef aan waar de dataverzameling plaatsvindt",
+            ),
         ),
         migrations.AlterField(
-            model_name='session',
-            name='tasks_duration',
-            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='De totale geschatte netto taakduur van uw sessie komt op basis van uw opgave per taak uit op <strong>%d minuten</strong>. Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, instructies per taak, pauzes tussen taken, en debriefing? (bij labbezoek dus van binnenkomst tot vertrek)'),
+            model_name="session",
+            name="tasks_duration",
+            field=models.PositiveIntegerField(
+                blank=True,
+                null=True,
+                verbose_name="De totale geschatte netto taakduur van uw sessie komt op basis van uw opgave per taak uit op <strong>%d minuten</strong>. Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, instructies per taak, pauzes tussen taken, en debriefing? (bij labbezoek dus van binnenkomst tot vertrek)",
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van uw onderzoeksvragen bijdraagt. Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli dat u van plan bent aan de deelnemer aan te bieden. Het moet voor de commissieleden duidelijk zijn wat u precies gaat doen.'),
+            model_name="task",
+            name="description",
+            field=models.TextField(
+                blank=True,
+                verbose_name="Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van uw onderzoeksvragen bijdraagt. Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli dat u van plan bent aan de deelnemer aan te bieden. Het moet voor de commissieleden duidelijk zijn wat u precies gaat doen.",
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='duration',
-            field=models.PositiveIntegerField(blank=True, default=0, validators=[django.core.validators.MinValueValidator(1)], verbose_name='Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak (exclusief instructie maar inclusief oefensessie)? Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>.'),
+            model_name="task",
+            name="duration",
+            field=models.PositiveIntegerField(
+                blank=True,
+                default=0,
+                validators=[django.core.validators.MinValueValidator(1)],
+                verbose_name="Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak (exclusief instructie maar inclusief oefensessie)? Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>.",
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='name',
-            field=models.CharField(blank=True, max_length=200, verbose_name='Wat is de naam van de taak?'),
+            model_name="task",
+            name="name",
+            field=models.CharField(
+                blank=True, max_length=200, verbose_name="Wat is de naam van de taak?"
+            ),
         ),
     ]
diff --git a/tasks/migrations/0007_auto_20190401_1343.py b/tasks/migrations/0007_auto_20190401_1343.py
index 97fb938cd..6b78c9266 100644
--- a/tasks/migrations/0007_auto_20190401_1343.py
+++ b/tasks/migrations/0007_auto_20190401_1343.py
@@ -6,15 +6,17 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0006_auto_20190206_1452'),
+        ("tasks", "0006_auto_20190206_1452"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='session',
-            name='leader_has_coc',
-            field=models.NullBooleanField(help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="session",
+            name="leader_has_coc",
+            field=models.NullBooleanField(
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
     ]
diff --git a/tasks/migrations/0008_auto_20200428_1337.py b/tasks/migrations/0008_auto_20200428_1337.py
index fffe371b6..bb500c031 100644
--- a/tasks/migrations/0008_auto_20200428_1337.py
+++ b/tasks/migrations/0008_auto_20200428_1337.py
@@ -4,25 +4,37 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0007_auto_20190401_1343'),
+        ("tasks", "0007_auto_20190401_1343"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='session',
-            name='leader_has_coc',
-            field=models.BooleanField(blank=True, help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.', null=True, verbose_name='Is de testleider in het bezit van een VOG?'),
+            model_name="session",
+            name="leader_has_coc",
+            field=models.BooleanField(
+                blank=True,
+                help_text='Iedereen die op een school werkt moet in het bezit         zijn van een Verklaring Omtrent Gedrag (VOG, zie         <a href="https://www.justis.nl/producten/vog/"         target="_blank">https://www.justis.nl/producten/vog/</a>).         Het is de verantwoordelijkheid van de school om hierom te vragen.         De FETC-GW neemt hierin een adviserende rol en wil de onderzoekers         waarschuwen dat de school om een VOG kan vragen.',
+                null=True,
+                verbose_name="Is de testleider in het bezit van een VOG?",
+            ),
         ),
         migrations.AlterField(
-            model_name='session',
-            name='supervision',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?'),
+            model_name="session",
+            name="supervision",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of een ander persoon die bevoegd is?",
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='feedback',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Krijgt de deelnemer tijdens of na deze taak feedback op zijn/haar gedrag of toestand?'),
+            model_name="task",
+            name="feedback",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Krijgt de deelnemer tijdens of na deze taak feedback op zijn/haar gedrag of toestand?",
+            ),
         ),
     ]
diff --git a/tasks/migrations/0009_auto_20210301_1626.py b/tasks/migrations/0009_auto_20210301_1626.py
index a0393656b..a093ffde7 100644
--- a/tasks/migrations/0009_auto_20210301_1626.py
+++ b/tasks/migrations/0009_auto_20210301_1626.py
@@ -5,15 +5,22 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0008_auto_20200428_1337'),
+        ("tasks", "0008_auto_20200428_1337"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='session',
-            name='tasks_number',
-            field=models.PositiveIntegerField(help_text='Wanneer u bijvoorbeeld eerst de deelnemer observeert en de deelnemer vervolgens een vragenlijst afneemt, dan vult u hierboven "2" in. Electrodes plakken, sessie-debriefing en kort (< 3 minuten) exit-interview gelden niet als een taak.', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?'),
+            model_name="session",
+            name="tasks_number",
+            field=models.PositiveIntegerField(
+                help_text='Wanneer u bijvoorbeeld eerst de deelnemer observeert en de deelnemer vervolgens een vragenlijst afneemt, dan vult u hierboven "2" in. Electrodes plakken, sessie-debriefing en kort (< 3 minuten) exit-interview gelden niet als een taak.',
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(100),
+                ],
+                verbose_name="Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?",
+            ),
         ),
     ]
diff --git a/tasks/migrations/0010_auto_20211213_1503.py b/tasks/migrations/0010_auto_20211213_1503.py
index 39d558e5b..e5d9b8da1 100644
--- a/tasks/migrations/0010_auto_20211213_1503.py
+++ b/tasks/migrations/0010_auto_20211213_1503.py
@@ -5,30 +5,48 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0009_auto_20210301_1626'),
+        ("tasks", "0009_auto_20210301_1626"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='session',
-            name='tasks_duration',
-            field=models.PositiveIntegerField(blank=True, null=True, verbose_name='De totale geschatte netto taakduur van je sessie komt op basis van je opgave per taak uit op <strong>%d minuten</strong>. Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, instructies per taak, pauzes tussen taken, en debriefing? (bij labbezoek dus van binnenkomst tot vertrek)'),
+            model_name="session",
+            name="tasks_duration",
+            field=models.PositiveIntegerField(
+                blank=True,
+                null=True,
+                verbose_name="De totale geschatte netto taakduur van je sessie komt op basis van je opgave per taak uit op <strong>%d minuten</strong>. Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, instructies per taak, pauzes tussen taken, en debriefing? (bij labbezoek dus van binnenkomst tot vertrek)",
+            ),
         ),
         migrations.AlterField(
-            model_name='session',
-            name='tasks_number',
-            field=models.PositiveIntegerField(help_text='Wanneer je bijvoorbeeld eerst de deelnemer observeert en de deelnemer vervolgens een vragenlijst afneemt, dan vul je hierboven "2" in. Electrodes plakken, sessie-debriefing en kort (< 3 minuten) exit-interview gelden niet als een taak.', null=True, validators=[django.core.validators.MinValueValidator(1), django.core.validators.MaxValueValidator(100)], verbose_name='Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?'),
+            model_name="session",
+            name="tasks_number",
+            field=models.PositiveIntegerField(
+                help_text='Wanneer je bijvoorbeeld eerst de deelnemer observeert en de deelnemer vervolgens een vragenlijst afneemt, dan vul je hierboven "2" in. Electrodes plakken, sessie-debriefing en kort (< 3 minuten) exit-interview gelden niet als een taak.',
+                null=True,
+                validators=[
+                    django.core.validators.MinValueValidator(1),
+                    django.core.validators.MaxValueValidator(100),
+                ],
+                verbose_name="Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?",
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='description',
-            field=models.TextField(blank=True, verbose_name='Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van jouw onderzoeksvragen bijdraagt. Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli dat je van plan bent aan de deelnemer aan te bieden. Het moet voor de commissieleden duidelijk zijn wat je precies gaat doen.'),
+            model_name="task",
+            name="description",
+            field=models.TextField(
+                blank=True,
+                verbose_name="Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van jouw onderzoeksvragen bijdraagt. Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli dat je van plan bent aan de deelnemer aan te bieden. Het moet voor de commissieleden duidelijk zijn wat je precies gaat doen.",
+            ),
         ),
         migrations.AlterField(
-            model_name='task',
-            name='feedback',
-            field=models.BooleanField(blank=True, null=True, verbose_name='Krijgt de deelnemer tijdens of na deze taak feedback op hun gedrag of toestand?'),
+            model_name="task",
+            name="feedback",
+            field=models.BooleanField(
+                blank=True,
+                null=True,
+                verbose_name="Krijgt de deelnemer tijdens of na deze taak feedback op hun gedrag of toestand?",
+            ),
         ),
     ]
diff --git a/tasks/migrations/0011_alter_task_registrations.py b/tasks/migrations/0011_alter_task_registrations.py
index 0248812e4..2262f2527 100644
--- a/tasks/migrations/0011_alter_task_registrations.py
+++ b/tasks/migrations/0011_alter_task_registrations.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0010_auto_20211213_1503'),
+        ("tasks", "0010_auto_20211213_1503"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='task',
-            name='registrations',
-            field=models.ManyToManyField(help_text='Help!', to='tasks.Registration', verbose_name='Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?'),
+            model_name="task",
+            name="registrations",
+            field=models.ManyToManyField(
+                help_text="Help!",
+                to="tasks.Registration",
+                verbose_name="Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?",
+            ),
         ),
     ]
diff --git a/tasks/migrations/0012_alter_task_registrations.py b/tasks/migrations/0012_alter_task_registrations.py
index f08b9fcf7..5ad7e4174 100644
--- a/tasks/migrations/0012_alter_task_registrations.py
+++ b/tasks/migrations/0012_alter_task_registrations.py
@@ -4,15 +4,18 @@
 
 
 class Migration(migrations.Migration):
-
     dependencies = [
-        ('tasks', '0011_alter_task_registrations'),
+        ("tasks", "0011_alter_task_registrations"),
     ]
 
     operations = [
         migrations.AlterField(
-            model_name='task',
-            name='registrations',
-            field=models.ManyToManyField(help_text="Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term         ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de         <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf'>         Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>.", to='tasks.Registration', verbose_name='Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?'),
+            model_name="task",
+            name="registrations",
+            field=models.ManyToManyField(
+                help_text="Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term         ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de         <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf'>         Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>.",
+                to="tasks.Registration",
+                verbose_name="Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?",
+            ),
         ),
     ]
diff --git a/tasks/models.py b/tasks/models.py
index b616d0bfe..cc4297b1f 100644
--- a/tasks/models.py
+++ b/tasks/models.py
@@ -11,21 +11,28 @@ class Session(SettingModel):
 
     # Fields with respect to Tasks
     tasks_number = models.PositiveIntegerField(
-        _('Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?'),
+        _("Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?"),
         null=True,
-        validators=[MinValueValidator(1), MaxValueValidator(100)], # Max of 100 is a technical safeguard
-        help_text=_('Wanneer je bijvoorbeeld eerst de deelnemer observeert \
+        validators=[
+            MinValueValidator(1),
+            MaxValueValidator(100),
+        ],  # Max of 100 is a technical safeguard
+        help_text=_(
+            'Wanneer je bijvoorbeeld eerst de deelnemer observeert \
 en de deelnemer vervolgens een vragenlijst afneemt, dan vul je hierboven "2" '
-                    'in. Electrodes plakken, sessie-debriefing en kort '
-                    '(< 3 minuten) exit-interview gelden niet als een taak.')
+            "in. Electrodes plakken, sessie-debriefing en kort "
+            "(< 3 minuten) exit-interview gelden niet als een taak."
+        ),
     )
 
     tasks_duration = models.PositiveIntegerField(
-        _('De totale geschatte netto taakduur van je sessie komt \
+        _(
+            "De totale geschatte netto taakduur van je sessie komt \
 op basis van je opgave per taak uit op <strong>%d minuten</strong>. \
 Hoe lang duurt <em>de totale sessie</em>, inclusief ontvangst, \
 instructies per taak, pauzes tussen taken, en debriefing? \
-(bij labbezoek dus van binnenkomst tot vertrek)'),
+(bij labbezoek dus van binnenkomst tot vertrek)"
+        ),
         null=True,
         blank=True,
     )
@@ -34,24 +41,21 @@ class Session(SettingModel):
     study = models.ForeignKey(Study, on_delete=models.CASCADE)
 
     class Meta:
-        ordering = ['order']
-        unique_together = ('study', 'order')
+        ordering = ["order"]
+        unique_together = ("study", "order")
 
     def net_duration(self):
-        if duration := self.task_set.aggregate(models.Sum('duration'))[
-            'duration__sum'
-        ]:
+        if duration := self.task_set.aggregate(models.Sum("duration"))["duration__sum"]:
             return duration
 
         return 0
 
-
     def first_task(self):
-        tasks = self.task_set.order_by('order')
+        tasks = self.task_set.order_by("order")
         return tasks[0] if tasks else None
 
     def last_task(self):
-        tasks = self.task_set.order_by('-order')
+        tasks = self.task_set.order_by("-order")
         return tasks[0] if tasks else None
 
     def current_task(self):
@@ -81,7 +85,7 @@ def is_completed(self):
         return result
 
     def __str__(self):
-        return _('Sessie {}').format(self.order)
+        return _("Sessie {}").format(self.order)
 
 
 class Registration(models.Model):
@@ -94,8 +98,8 @@ class Registration(models.Model):
     age_min = models.PositiveIntegerField(blank=True, null=True)
 
     class Meta:
-        ordering = ['order']
-        verbose_name = _('Vastlegging gedrag')
+        ordering = ["order"]
+        verbose_name = _("Vastlegging gedrag")
 
     def __str__(self):
         return self.description
@@ -109,7 +113,7 @@ class RegistrationKind(models.Model):
     registration = models.ForeignKey(Registration, on_delete=models.CASCADE)
 
     class Meta:
-        ordering = ['order']
+        ordering = ["order"]
 
     def __str__(self):
         return self.description
@@ -118,27 +122,31 @@ def __str__(self):
 class Task(models.Model):
     order = models.PositiveIntegerField()
     name = models.CharField(
-        _('Wat is de naam van de taak?'),
+        _("Wat is de naam van de taak?"),
         max_length=200,
         blank=True,
     )
 
     description = models.TextField(
-        _('Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort \
+        _(
+            "Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort \
 uit hoe deze taak (en de eventuele manipulaties daarbinnen) aan de \
 beantwoording van jouw onderzoeksvragen bijdraagt. \
 Geef, kort, een paar voorbeelden (of beschrijvingen) van het type stimuli \
 dat je van plan bent aan de deelnemer aan te bieden. \
-Het moet voor de commissieleden duidelijk zijn wat je precies gaat doen.'),
+Het moet voor de commissieleden duidelijk zijn wat je precies gaat doen."
+        ),
         blank=True,
     )
 
     duration = models.PositiveIntegerField(
-        _('Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, \
+        _(
+            "Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, \
 dus vanaf het moment dat de taak van start gaat tot en met het einde van de taak \
 (exclusief instructie maar inclusief oefensessie)? \
 Indien de taakduur per deelnemer varieert (self-paced taak of task-to-criterion), \
-geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>.'),
+geef dan <strong>het redelijkerwijs te verwachten maximum op</strong>."
+        ),
         default=0,
         validators=[MinValueValidator(1)],
         blank=True,
@@ -146,40 +154,46 @@ class Task(models.Model):
 
     registrations = models.ManyToManyField(
         Registration,
-        verbose_name=_('Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?'),
-        help_text = _("Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term \
+        verbose_name=_(
+            "Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak vastgelegd?"
+        ),
+        help_text=_(
+            "Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het gebruik van de term \
         ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor deelnemers. Voor meer informatie, zie de \
         <a href='https://fetc-gw.wp.hum.uu.nl/wp-content/uploads/sites/336/2021/12/FETC-GW-Richtlijnen-voor-geinformeerde-toestemming-bij-wetenschappelijk-onderzoek-versie-1.1_21dec2021.pdf'> \
-        Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>.")
+        Richtlijnen voor geïnformeerde toestemming, ‘Beeld en geluid’</a>."
+        ),
     )
 
     registrations_details = models.CharField(
-        _('Namelijk'),
+        _("Namelijk"),
         max_length=200,
         blank=True,
     )
 
     registration_kinds = models.ManyToManyField(
         RegistrationKind,
-        verbose_name=_('Kies het soort meting'),
+        verbose_name=_("Kies het soort meting"),
         blank=True,
     )
 
     registration_kinds_details = models.CharField(
-        _('Namelijk'),
+        _("Namelijk"),
         max_length=200,
         blank=True,
     )
 
     feedback = models.BooleanField(
-        _('Krijgt de deelnemer tijdens of na deze taak feedback op hun '
-          'gedrag of toestand?'),
+        _(
+            "Krijgt de deelnemer tijdens of na deze taak feedback op hun "
+            "gedrag of toestand?"
+        ),
         null=True,
         blank=True,
     )
 
     feedback_details = models.TextField(
-        _('Beschrijf hoe de feedback wordt gegeven.'),
+        _("Beschrijf hoe de feedback wordt gegeven."),
         blank=True,
     )
 
@@ -187,11 +201,11 @@ class Task(models.Model):
     session = models.ForeignKey(Session, on_delete=models.CASCADE)
 
     class Meta:
-        ordering = ['order']
-        unique_together = ('session', 'order')
+        ordering = ["order"]
+        unique_together = ("session", "order")
 
     def is_completed(self):
-        return self.name != ''
+        return self.name != ""
 
     def delete(self, *args, **kwargs):
         """
@@ -203,4 +217,4 @@ def delete(self, *args, **kwargs):
         session.save()
 
     def __str__(self):
-        return _('Taak {} in sessie {}').format(self.order, self.session.order)
+        return _("Taak {} in sessie {}").format(self.order, self.session.order)
diff --git a/tasks/translation.py b/tasks/translation.py
index e8de002d9..447307d08 100644
--- a/tasks/translation.py
+++ b/tasks/translation.py
@@ -5,9 +5,9 @@
 
 @register(Registration)
 class RegistrationTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
 
 
 @register(RegistrationKind)
 class RegistrationKindTranslationOptions(TranslationOptions):
-    fields = ('description',)
+    fields = ("description",)
diff --git a/tasks/urls.py b/tasks/urls.py
index 3816c065a..739b0320e 100644
--- a/tasks/urls.py
+++ b/tasks/urls.py
@@ -3,15 +3,14 @@
 from .views.session_views import TaskStart, TaskEnd, SessionDelete
 from .views.task_views import TaskUpdate, TaskDelete
 
-app_name = 'tasks'
+app_name = "tasks"
 
 urlpatterns = [
     # Session(s)
-    path('session/delete/<int:pk>/', SessionDelete.as_view(), name='session_delete'),
-    path('start/<int:pk>/', TaskStart.as_view(), name='start'),
-    path('end/<int:pk>/', TaskEnd.as_view(), name='end'),
-
+    path("session/delete/<int:pk>/", SessionDelete.as_view(), name="session_delete"),
+    path("start/<int:pk>/", TaskStart.as_view(), name="start"),
+    path("end/<int:pk>/", TaskEnd.as_view(), name="end"),
     # Task(s)
-    path('update/<int:pk>/', TaskUpdate.as_view(), name='update'),
-    path('delete/<int:pk>/', TaskDelete.as_view(), name='delete'),
+    path("update/<int:pk>/", TaskUpdate.as_view(), name="update"),
+    path("delete/<int:pk>/", TaskDelete.as_view(), name="delete"),
 ]
diff --git a/tasks/utils.py b/tasks/utils.py
index 74758e473..3742292fa 100644
--- a/tasks/utils.py
+++ b/tasks/utils.py
@@ -12,9 +12,10 @@
 
 def get_session_progress(session, is_end=False):
     from studies.utils import get_study_progress
+
     progress = SESSION_PROGRESS_TOTAL / session.study.sessions_number
     if not is_end:
-        progress *= (session.order - 1)
+        progress *= session.order - 1
     else:
         progress *= session.order
     return int(get_study_progress(session.study) + SESSION_PROGRESS_START + progress)
@@ -24,29 +25,36 @@ def get_task_progress(task):
     session = task.session
     session_progress = get_session_progress(session)
     task_progress = task.order / session.tasks_number
-    return int(session_progress + (SESSION_PROGRESS_TOTAL / session.study.sessions_number) * task_progress - SESSION_PROGRESS_EPSILON)
+    return int(
+        session_progress
+        + (SESSION_PROGRESS_TOTAL / session.study.sessions_number) * task_progress
+        - SESSION_PROGRESS_EPSILON
+    )
 
 
 def session_urls(study):
-
-    tasks_url = AvailableURL(title=_('Takenonderzoek'))
+    tasks_url = AvailableURL(title=_("Takenonderzoek"))
 
     if study.has_sessions:
-        tasks_url.url = reverse('studies:session_start', args=(study.pk,))
+        tasks_url.url = reverse("studies:session_start", args=(study.pk,))
 
     if study.has_sessions:
         prev_session_completed = True
         for session in study.session_set.all():
-            task_start_url = AvailableURL(title=_('Het takenonderzoek: sessie {}').format(session.order))
+            task_start_url = AvailableURL(
+                title=_("Het takenonderzoek: sessie {}").format(session.order)
+            )
             if prev_session_completed:
-                task_start_url.url = reverse('tasks:start', args=(session.pk,))
+                task_start_url.url = reverse("tasks:start", args=(session.pk,))
             tasks_url.children.append(task_start_url)
 
             tasks_url.children.extend(tasks_urls(session))
 
-            task_end_url = AvailableURL(title=_('Overzicht van takenonderzoek: sessie {}').format(session.order))
+            task_end_url = AvailableURL(
+                title=_("Overzicht van takenonderzoek: sessie {}").format(session.order)
+            )
             if session.tasks_completed():
-                task_end_url.url = reverse('tasks:end', args=(session.pk,))
+                task_end_url.url = reverse("tasks:end", args=(session.pk,))
             tasks_url.children.append(task_end_url)
 
             prev_session_completed = session.is_completed()
@@ -59,9 +67,13 @@ def tasks_urls(session):
 
     prev_task_completed = True
     for task in session.task_set.all():
-        task_url = AvailableURL(title=_('Het takenonderzoek: sessie {} taak {}').format(session.order, task.order))
+        task_url = AvailableURL(
+            title=_("Het takenonderzoek: sessie {} taak {}").format(
+                session.order, task.order
+            )
+        )
         if prev_task_completed:
-            task_url.url = reverse('tasks:update', args=(task.pk,))
+            task_url.url = reverse("tasks:update", args=(task.pk,))
         result.append(task_url)
 
         prev_task_completed = task.is_completed()
@@ -78,9 +90,7 @@ def copy_task_to_session(session, original_task):
     t.save()
 
     t.registrations.set(original_task.registrations.all())
-    t.registration_kinds.set(
-        original_task.registration_kinds.all()
-    )
+    t.registration_kinds.set(original_task.registration_kinds.all())
     t.save()
 
 
diff --git a/tasks/views/session_views.py b/tasks/views/session_views.py
index d07ae197a..dd079898b 100644
--- a/tasks/views/session_views.py
+++ b/tasks/views/session_views.py
@@ -16,10 +16,10 @@
 ######################
 class SessionDelete(DeletionAllowedMixin, DeleteView):
     model = Session
-    success_message = _('Sessie verwijderd')
+    success_message = _("Sessie verwijderd")
 
     def get_success_url(self):
-        return reverse('studies:design_end', args=(self.object.study.pk,))
+        return reverse("studies:design_end", args=(self.object.study.pk,))
 
     def delete(self, request, *args, **kwargs):
         """
@@ -49,25 +49,26 @@ def delete(self, request, *args, **kwargs):
 ##################
 class TaskStart(AllowErrorsOnBackbuttonMixin, UpdateView):
     """Initial creation of Tasks for a Session"""
+
     model = Session
     form_class = TaskStartForm
-    template_name = 'tasks/task_start.html'
-    success_message = _('%(tasks_number)s ta(a)k(en) aangemaakt')
+    template_name = "tasks/task_start.html"
+    success_message = _("%(tasks_number)s ta(a)k(en) aangemaakt")
 
     def get_form_kwargs(self):
         """Sets the Study as a form kwarg"""
         kwargs = super(TaskStart, self).get_form_kwargs()
-        kwargs['study'] = self.object.study
+        kwargs["study"] = self.object.study
         return kwargs
 
     def get_context_data(self, **kwargs):
         context = super(TaskStart, self).get_context_data(**kwargs)
-        context['progress'] = get_session_progress(self.object)
+        context["progress"] = get_session_progress(self.object)
         return context
 
     def form_valid(self, form):
         """Copies, creates or deletes Tasks on save"""
-        if 'is_copy' in form.cleaned_data and form.cleaned_data['is_copy']:
+        if "is_copy" in form.cleaned_data and form.cleaned_data["is_copy"]:
             session = form.instance
 
             # Delete all existing Tasks
@@ -75,19 +76,19 @@ def form_valid(self, form):
                 task.delete()
 
             # Copy fields from the parent Session
-            s = form.cleaned_data['parent_session']
+            s = form.cleaned_data["parent_session"]
             session.tasks_number = s.tasks_number
             session.tasks_duration = s.tasks_duration
             session.save()
 
             # Update cleaned_data as well, to make sure this isn't overridden on the super call below
-            form.cleaned_data['tasks_number'] = s.tasks_number
+            form.cleaned_data["tasks_number"] = s.tasks_number
 
             # Copy Tasks from the parent Session
             for task in s.task_set.all():
                 copy_task_to_session(session, task)
         else:
-            nr_tasks = form.cleaned_data['tasks_number']
+            nr_tasks = form.cleaned_data["tasks_number"]
             session = form.instance
             current = session.task_set.count() or 0
 
@@ -111,34 +112,37 @@ def form_valid(self, form):
         return super(TaskStart, self).form_valid(form)
 
     def get_next_url(self):
-        return reverse('tasks:update', args=(self.object.first_task().pk,))
+        return reverse("tasks:update", args=(self.object.first_task().pk,))
 
     def get_back_url(self):
         try:
             # Try to return to task_end of the previous Session
-            prev_session = Session.objects.get(study=self.object.study, order=self.object.order - 1)
-            return reverse('tasks:end', args=(prev_session.pk,))
+            prev_session = Session.objects.get(
+                study=self.object.study, order=self.object.order - 1
+            )
+            return reverse("tasks:end", args=(prev_session.pk,))
         except Session.DoesNotExist:
             # If this is the first Session, return to session_start
-            return reverse('studies:session_start', args=(self.object.study.pk,))
+            return reverse("studies:session_start", args=(self.object.study.pk,))
 
 
 class TaskEnd(AllowErrorsOnBackbuttonMixin, UpdateView):
     """Completes a Session"""
+
     model = Session
     form_class = TaskEndForm
-    template_name = 'tasks/task_end.html'
-    success_message = _(u'Taken toevoegen beëindigd')
+    template_name = "tasks/task_end.html"
+    success_message = _("Taken toevoegen beëindigd")
 
     def get_context_data(self, **kwargs):
         context = super(TaskEnd, self).get_context_data(**kwargs)
-        context['progress'] = get_session_progress(self.object, True)
+        context["progress"] = get_session_progress(self.object, True)
         return context
 
     def get_form_kwargs(self):
         kwargs = super().get_form_kwargs()
 
-        referrer = self.request.META.get('HTTP_REFERRER')
+        referrer = self.request.META.get("HTTP_REFERRER")
         if referrer:
             pass
 
@@ -147,11 +151,13 @@ def get_form_kwargs(self):
     def get_next_url(self):
         try:
             # Try to continue to next Session
-            next_session = Session.objects.get(study=self.object.study, order=self.object.order + 1)
-            return reverse('tasks:start', args=(next_session.pk,))
+            next_session = Session.objects.get(
+                study=self.object.study, order=self.object.order + 1
+            )
+            return reverse("tasks:start", args=(next_session.pk,))
         except Session.DoesNotExist:
             # If this is the last Session, continue to design_end
-            return reverse('studies:design_end', args=(self.object.study.pk,))
+            return reverse("studies:design_end", args=(self.object.study.pk,))
 
     def get_back_url(self):
-        return reverse('tasks:update', args=(self.object.last_task().pk,))
+        return reverse("tasks:update", args=(self.object.last_task().pk,))
diff --git a/tasks/views/task_views.py b/tasks/views/task_views.py
index 97f5add5a..3ed3975ef 100644
--- a/tasks/views/task_views.py
+++ b/tasks/views/task_views.py
@@ -16,41 +16,47 @@
 ######################
 class TaskUpdate(AllowErrorsOnBackbuttonMixin, UpdateView):
     """Updates a Task"""
+
     model = Task
     form_class = TaskForm
-    success_message = _('Taak bewerkt')
+    success_message = _("Taak bewerkt")
 
     def get_context_data(self, **kwargs):
         context = super(TaskUpdate, self).get_context_data(**kwargs)
-        context['progress'] = get_task_progress(self.object)
+        context["progress"] = get_task_progress(self.object)
         return context
 
     def get_next_url(self):
         try:
             # Try to continue to next Task
-            next_task = Task.objects.get(session=self.object.session, order=self.object.order + 1)
-            return reverse('tasks:update', args=(next_task.pk,))
+            next_task = Task.objects.get(
+                session=self.object.session, order=self.object.order + 1
+            )
+            return reverse("tasks:update", args=(next_task.pk,))
         except Task.DoesNotExist:
             # If this is the last Task, continue to task_end
-            return reverse('tasks:end', args=(self.object.session.pk,))
+            return reverse("tasks:end", args=(self.object.session.pk,))
 
     def get_back_url(self):
         try:
             # Try to return to previous Task
-            prev_task = Task.objects.get(session=self.object.session, order=self.object.order - 1)
-            return reverse('tasks:update', args=(prev_task.pk,))
+            prev_task = Task.objects.get(
+                session=self.object.session, order=self.object.order - 1
+            )
+            return reverse("tasks:update", args=(prev_task.pk,))
         except Task.DoesNotExist:
             # If this is the first Task, return to task_start
-            return reverse('tasks:start', args=(self.object.session.pk,))
+            return reverse("tasks:start", args=(self.object.session.pk,))
 
 
 class TaskDelete(DeletionAllowedMixin, DeleteView):
     """Deletes a Task"""
+
     model = Task
-    success_message = _('Taak verwijderd')
+    success_message = _("Taak verwijderd")
 
     def get_success_url(self):
-        return reverse('tasks:end', args=(self.object.session.pk,))
+        return reverse("tasks:end", args=(self.object.session.pk,))
 
     def delete(self, request, *args, **kwargs):
         """

From f95645217d513c2ba75bfe0b3ff7dcb5f96f6bfa Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 14:33:30 +0100
Subject: [PATCH 116/148] style: add djlint config file

---
 pyproject.toml | 7 +++++++
 1 file changed, 7 insertions(+)
 create mode 100644 pyproject.toml

diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..4af4e6e3a
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,7 @@
+[tool.djlint]
+profile="django"
+extend_exclude="docs,reviews/templates/reviews/vue_templates/,proposals/templates/proposals/vue_templates/"
+max-blank-lines=3
+blank_line_after_tag="load,extends"
+format_css=true
+format_js=false # Disabled till we can solve our django-in-js situation

From 3555e2daede3af5c44874080003b49eb9e989cb0 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 14:39:46 +0100
Subject: [PATCH 117/148] style: also add a newline after endblock tags

---
 pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pyproject.toml b/pyproject.toml
index 4af4e6e3a..2ca0d1293 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -2,6 +2,6 @@
 profile="django"
 extend_exclude="docs,reviews/templates/reviews/vue_templates/,proposals/templates/proposals/vue_templates/"
 max-blank-lines=3
-blank_line_after_tag="load,extends"
+blank_line_after_tag="load,extends,endblock"
 format_css=true
 format_js=false # Disabled till we can solve our django-in-js situation

From 664077453c8fe393cdd8db692a33d515e5db6f69 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 15:36:14 +0100
Subject: [PATCH 118/148] style: format all templates using djlint

Also, add trimmed to all blocktrans blocks
---
 faqs/templates/faqs/faq_list.html             |   9 +-
 .../interventions/intervention_form.html      |  15 +-
 main/templates/auth/user_detail.html          | 151 +++++++--------
 main/templates/base/form_buttons.html         |  40 ++--
 main/templates/base/login_header.html         |   2 +-
 main/templates/base/navigation.html           |  64 +++----
 main/templates/base/sidebar.html              |  82 ++++----
 main/templates/base/site_header.html          |   1 +
 main/templates/base/site_html_head.html       |  12 +-
 main/templates/base/site_title.html           |   3 +-
 main/templates/error/400.html                 |   6 +-
 main/templates/error/403.html                 |  22 +--
 main/templates/error/403_csrf.html            |  24 +--
 main/templates/error/404.html                 |   8 +-
 main/templates/error/500.html                 |   4 +-
 main/templates/main/index.html                |  90 ++++-----
 main/templates/main/landing.html              |  22 ++-
 main/templates/main/setting_checks.html       |   2 +-
 main/templates/registration/logged_out.html   |  12 +-
 main/templates/registration/login.html        |  29 +--
 .../observations/observation_form.html        |  18 +-
 .../observation_update_attachments.html       |  26 +--
 proposals/templates/easy_pdf/base.html        | 109 ++++++-----
 .../proposals/compare_documents.html          |  66 +++----
 .../proposals/proposal_confirm_delete.html    |  11 +-
 .../proposals/proposal_confirmation.html      |  17 +-
 .../templates/proposals/proposal_copy.html    |  23 +--
 .../proposals/proposal_data_management.html   | 132 ++++++-------
 .../templates/proposals/proposal_diff.html    |  17 +-
 .../proposals/proposal_export_list.html       |  18 +-
 .../templates/proposals/proposal_form.html    |  81 ++++----
 .../proposals/proposal_form_pre_approved.html |  14 +-
 .../templates/proposals/proposal_list.html    |  54 +++---
 .../templates/proposals/proposal_pdf.html     |  75 ++++----
 .../proposals/proposal_private_archive.html   |  47 ++---
 .../proposals/proposal_public_archive.html    |  12 +-
 .../templates/proposals/proposal_start.html   | 102 +++++-----
 .../proposals/proposal_start_practice.html    | 110 +++++------
 .../proposal_start_pre_approved.html          |  28 ++-
 .../proposal_start_pre_assessment.html        |  49 +++--
 .../templates/proposals/proposal_submit.html  | 113 ++++++-----
 .../proposals/proposal_submitted.html         |   1 -
 .../proposal_update_attachments.html          |  24 ++-
 .../proposals/proposal_update_date_start.html |  28 +--
 .../templates/proposals/study_consent.html    | 177 +++++++++---------
 .../templates/proposals/study_start.html      |  60 +++---
 .../proposals/table_with_header.html          |  18 +-
 .../proposals/table_with_header_diff.html     |  77 ++++----
 .../proposals/translated_consent_forms.html   |  29 ++-
 .../templates/proposals/wmo_application.html  |  11 +-
 proposals/templates/proposals/wmo_check.html  |  24 ++-
 proposals/templates/proposals/wmo_form.html   |  17 +-
 reviews/templates/mail/base-internal.html     |  14 +-
 reviews/templates/mail/base.html              |  53 +++---
 reviews/templates/mail/concept_creator.html   |  36 ++--
 .../mail/concept_other_applicants.html        |  42 +++--
 .../templates/mail/concept_supervisor.html    |  72 +++----
 .../mail/pre_assessment_secretary.html        |   9 +-
 reviews/templates/mail/reminder.html          |  22 ++-
 .../templates/mail/submitted_longroute.html   |  66 ++++---
 .../submitted_longroute_other_applicants.html |  76 +++++---
 .../templates/mail/submitted_shortroute.html  |  76 ++++----
 ...submitted_shortroute_other_applicants.html |  81 ++++----
 .../reviews/action_explaination.html          |  65 ++++---
 reviews/templates/reviews/auto_review.html    |  14 +-
 .../reviews/change_chamber_form.html          |  18 +-
 .../reviews/committee_members_workload.html   | 100 +++++-----
 reviews/templates/reviews/decision_form.html  |  41 ++--
 reviews/templates/reviews/documents_list.html |  69 +++----
 .../templates/reviews/review_assign_form.html |  34 ++--
 .../templates/reviews/review_close_form.html  |  23 +--
 reviews/templates/reviews/review_detail.html  |  30 +--
 .../reviews/review_detail_sidebar.html        |  92 ++++-----
 .../reviews/review_discontinue_form.html      |  78 ++++----
 reviews/templates/reviews/review_table.html   |  12 +-
 .../reviews/simple_compare_link.html          |   9 +-
 reviews/templates/reviews/ufl_list.html       |  13 +-
 studies/templates/studies/session_start.html  |  29 ++-
 studies/templates/studies/study_design.html   |  65 ++++---
 studies/templates/studies/study_end.html      | 104 +++++-----
 studies/templates/studies/study_form.html     |  22 +--
 studies/templates/studies/study_title.html    |  22 +--
 .../studies/study_update_attachments.html     |  22 ++-
 .../tasks/session_confirm_delete.html         |  19 +-
 tasks/templates/tasks/session_title.html      |  38 ++--
 .../templates/tasks/task_confirm_delete.html  |  18 +-
 tasks/templates/tasks/task_end.html           |  15 +-
 tasks/templates/tasks/task_form.html          |  19 +-
 tasks/templates/tasks/task_list.html          |  39 ++--
 tasks/templates/tasks/task_start.html         |  22 +--
 tasks/templates/tasks/task_title.html         |  26 +--
 91 files changed, 1923 insertions(+), 1868 deletions(-)

diff --git a/faqs/templates/faqs/faq_list.html b/faqs/templates/faqs/faq_list.html
index deccc7ad3..c86f6d1f8 100644
--- a/faqs/templates/faqs/faq_list.html
+++ b/faqs/templates/faqs/faq_list.html
@@ -9,15 +9,14 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Frequently Asked Questions" %}
-            </h2>
+            <h2>{% trans "Frequently Asked Questions" %}</h2>
             {% for faq in faqs %}
                 <ul>
-                    <li><a href="#{{ faq.order }}">{{ faq.question }}</a></li>
+                    <li>
+                        <a href="#{{ faq.order }}">{{ faq.question }}</a>
+                    </li>
                 </ul>
             {% endfor %}
-
             {% for faq in faqs %}
                 <a name="{{ faq.order }}"></a>
                 <h4>{{ faq.question }}</h4>
diff --git a/interventions/templates/interventions/intervention_form.html b/interventions/templates/interventions/intervention_form.html
index bb0bddae0..a28285223 100644
--- a/interventions/templates/interventions/intervention_form.html
+++ b/interventions/templates/interventions/intervention_form.html
@@ -45,12 +45,11 @@
             {% with nav_items=study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Het interventieonderzoek" %}
-            </h2>
+            <h2>{% trans "Het interventieonderzoek" %}</h2>
             {% include "main/setting_checks.html" %}
             {% include "studies/study_title.html" %}
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
                 <table>
                     {{ form.as_table }}
                     <tr>
@@ -58,10 +57,10 @@ <h2>
                             <label for="id_extra_info"></label>
                         </th>
                         <td id="id_extra_info">
-                          {% blocktrans trimmed %}
-			  Als je dit nog niet gedaan hebt, zul je op de vorige pagina naast "interventie"
-			  ook "takenonderzoek" moeten aanvinken, om je aanvraag volledig in te vullen.
-			  {% endblocktrans %}
+                            {% blocktrans trimmed %}
+                                Als je dit nog niet gedaan hebt, zul je op de vorige pagina naast "interventie"
+                                ook "takenonderzoek" moeten aanvinken, om je aanvraag volledig in te vullen.
+                            {% endblocktrans %}
                         </td>
                     </tr>
                 </table>
diff --git a/main/templates/auth/user_detail.html b/main/templates/auth/user_detail.html
index 922bf06f4..6da2e6410 100644
--- a/main/templates/auth/user_detail.html
+++ b/main/templates/auth/user_detail.html
@@ -6,111 +6,102 @@
 {% load i18n %}
 {% load datatables %}
 
-{% block header_title %}
-    {{ user_object.get_full_name }} - {{ block.super }}
-{% endblock %}
+{% block header_title %}{{ user_object.get_full_name }} - {{ block.super }}{% endblock %}
 
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {{ user_object.get_full_name }}
-            </h2>
+            <h2>{{ user_object.get_full_name }}</h2>
             <table class="exportTable mb-2">
                 <tr>
-                    <th>
-                        {% trans 'Gebruiksersnaam' %}
-                    </th>
-                    <td>
-                        {{ user_object.username }}
-                    </td>
+                    <th>{% trans 'Gebruiksersnaam' %}</th>
+                    <td>{{ user_object.username }}</td>
                 </tr>
                 <tr>
-                    <th>
-                        {% trans 'E-mail' %}
-                    </th>
-                    <td>
-                        {{ user_object.email }}
-                    </td>
+                    <th>{% trans 'E-mail' %}</th>
+                    <td>{{ user_object.email }}</td>
                 </tr>
                 <tr>
                     <th>
                         {% get_verbose_field_name "auth" "user" "date_joined" as date_joined_trans %}
                         {{ date_joined_trans|capfirst }}
                     </th>
-                    <td>
-                        {{ user_object.date_joined }}
-                    </td>
+                    <td>{{ user_object.date_joined }}</td>
                 </tr>
             </table>
             <h3>{% trans 'Ingediende aanvragen' %}</h3>
-
             <table class="dt" data-language="{% datatables_lang %}">
                 <thead>
-                <tr>
-                    <th>{% trans "Referentienummer" %}</th>
-                    <th>{% trans "Eindverantwoordelijke" %}</th>
-                    <th>{% trans "Titel aanvraag" %}</th>
-                    <th>{% trans "Fase" %}</th>
-                    <th>{% trans "Datum ingediend" %}</th>
-                    <th>{% trans "Gewenste einddatum" %}</th>
-                    <th>{% trans "Mijn besluit" %}</th>
-                    <th>{% trans "Afhandeling" %}</th>
-                    <th>{% trans "Acties" %}</th>
-                </tr>
+                    <tr>
+                        <th>{% trans "Referentienummer" %}</th>
+                        <th>{% trans "Eindverantwoordelijke" %}</th>
+                        <th>{% trans "Titel aanvraag" %}</th>
+                        <th>{% trans "Fase" %}</th>
+                        <th>{% trans "Datum ingediend" %}</th>
+                        <th>{% trans "Gewenste einddatum" %}</th>
+                        <th>{% trans "Mijn besluit" %}</th>
+                        <th>{% trans "Afhandeling" %}</th>
+                        <th>{% trans "Acties" %}</th>
+                    </tr>
                 </thead>
                 <tbody>
-                {% for review in reviews %}
-                    <tr>
-                        <td>{{ review.proposal.reference_number }}</td>
-                        <td>{{ review.accountable_user.get_full_name }}</td>
-                        <td>{{ review.proposal.title }}</td>
-                        <td>{{ review.get_stage_display }}</td>
-                        <td data-order="{{ review.date_start|date:'c' }}">{{ review.date_start|date:"j M Y" }}</td>
-                        <td data-order="{{ review.date_start|date:'c' }}">{{ review.date_should_end|date:"j M Y" }}</td>
-                        <td>{{ decision.get_go_display|default:"" }}</td>
-                        <td>
-                            {% if review.stage == review.Stages.CLOSED %}
-                                {% if review.proposal.has_minor_revision %}
-                                    {{ review.get_continuation_display }}{% trans ', met revisie' %}
-                                {% else %}
-                                    {{ review.get_continuation_display }}
+                    {% for review in reviews %}
+                        <tr>
+                            <td>{{ review.proposal.reference_number }}</td>
+                            <td>{{ review.accountable_user.get_full_name }}</td>
+                            <td>{{ review.proposal.title }}</td>
+                            <td>{{ review.get_stage_display }}</td>
+                            <td data-order="{{ review.date_start|date:'c' }}">{{ review.date_start|date:"j M Y" }}</td>
+                            <td data-order="{{ review.date_start|date:'c' }}">{{ review.date_should_end|date:"j M Y" }}</td>
+                            <td>{{ decision.get_go_display|default:"" }}</td>
+                            <td>
+                                {% if review.stage == review.Stages.CLOSED %}
+                                    {% if review.proposal.has_minor_revision %}
+                                        {{ review.get_continuation_display }}{% trans ', met revisie' %}
+                                    {% else %}
+                                        {{ review.get_continuation_display }}
+                                    {% endif %}
                                 {% endif %}
-                            {% endif %}
-                        </td>
-                        <td>
-                            <a href="{% url 'proposals:pdf' review.proposal.pk %}" target="_blank"><img
-                                    src="{% static 'main/images/page_white_acrobat.png' %}"
-                                    title="{% trans 'Aanvraag inzien' %}"></a>
-                            <a href="{% url 'reviews:detail' review.pk %}"><img
-                                    src="{% static 'main/images/zoom.png' %}" title="{% trans 'Details' %}"></a>
-                            {% if user|is_secretary and review.stage == review.Stages.ASSIGNMENT %}
-                                <a href="{% url 'reviews:assign' review.pk %}"><img
-                                        src="{% static 'reviews/images/user_add.png' %}"
-                                        title="{% trans 'Aanstellen' %}"></a>
-                            {% elif user|is_secretary and review.stage == review.Stages.CLOSING %}
-                                <a href="{% url 'reviews:close' review.pk %}"><img
-                                        src="{% static 'reviews/images/accept.png' %}" title="{% trans 'Afsluiten' %}"></a>
-                            {% elif user|is_secretary and review.stage == review.Stages.CLOSED %}
-                                {% if review.continuation == review.Continuations.GO or review.continuation == review.Continuations.GO_POST_HOC %}
-                                    <a href="{% url 'proposals:archive_export' review.proposal.pk %}">
-                                        <img src="{% static 'reviews/images/website.png' %}"
-                                             title="{% trans 'Website export tekst' %}">
+                            </td>
+                            <td>
+                                <a href="{% url 'proposals:pdf' review.proposal.pk %}" target="_blank">
+                                    <img src="{% static 'main/images/page_white_acrobat.png' %}"
+                                         title="{% trans 'Aanvraag inzien' %}">
+                                </a>
+                                <a href="{% url 'reviews:detail' review.pk %}">
+                                    <img src="{% static 'main/images/zoom.png' %}"
+                                         title="{% trans 'Details' %}">
+                                </a>
+                                {% if user|is_secretary and review.stage == review.Stages.ASSIGNMENT %}
+                                    <a href="{% url 'reviews:assign' review.pk %}">
+                                        <img src="{% static 'reviews/images/user_add.png' %}"
+                                             title="{% trans 'Aanstellen' %}">
                                     </a>
-                                    <a href="{% url 'proposals:confirmation' review.proposal.pk %}">
-                                        {% if not review.proposal.date_confirmed %}
-                                            <img src="{% static 'reviews/images/report_go.png' %}"
-                                                 title="{% trans 'Bevestigingsbrief versturen' %}">
-                                        {% else %}
-                                            <img src="{% static 'reviews/images/tick.png' %}"
-                                                 title="{% trans 'Bevestigingsbrief verstuurd' %}">
-                                        {% endif %}
+                                {% elif user|is_secretary and review.stage == review.Stages.CLOSING %}
+                                    <a href="{% url 'reviews:close' review.pk %}">
+                                        <img src="{% static 'reviews/images/accept.png' %}"
+                                             title="{% trans 'Afsluiten' %}">
                                     </a>
+                                {% elif user|is_secretary and review.stage == review.Stages.CLOSED %}
+                                    {% if review.continuation == review.Continuations.GO or review.continuation == review.Continuations.GO_POST_HOC %}
+                                        <a href="{% url 'proposals:archive_export' review.proposal.pk %}">
+                                            <img src="{% static 'reviews/images/website.png' %}"
+                                                 title="{% trans 'Website export tekst' %}">
+                                        </a>
+                                        <a href="{% url 'proposals:confirmation' review.proposal.pk %}">
+                                            {% if not review.proposal.date_confirmed %}
+                                                <img src="{% static 'reviews/images/report_go.png' %}"
+                                                     title="{% trans 'Bevestigingsbrief versturen' %}">
+                                            {% else %}
+                                                <img src="{% static 'reviews/images/tick.png' %}"
+                                                     title="{% trans 'Bevestigingsbrief verstuurd' %}">
+                                            {% endif %}
+                                        </a>
+                                    {% endif %}
                                 {% endif %}
-                            {% endif %}
-                        </td>
-                    </tr>
-                {% endfor %}
+                            </td>
+                        </tr>
+                    {% endfor %}
                 </tbody>
             </table>
         </div>
diff --git a/main/templates/base/form_buttons.html b/main/templates/base/form_buttons.html
index 52d989c66..b0dd91b59 100644
--- a/main/templates/base/form_buttons.html
+++ b/main/templates/base/form_buttons.html
@@ -3,37 +3,43 @@
 <div class="mt-3 mb-3 form-buttons">
     <div class="button-grid">
         {% if not no_back %}
-            <input class="button" type="submit" name="save_back" value="{% trans '<< Opslaan en vorige stap' %}"/>
+            <input class="button"
+                   type="submit"
+                   name="save_back"
+                   value="{% trans '<< Opslaan en vorige stap' %}" />
             {% if proposal %}
                 {% if proposal.is_pre_assessment %}
-                    <a class="button js-submit-redirect" href="{% url 'proposals:update_pre' proposal.pk %}">
-                        {% trans "Terug naar begin aanvraag" %}
-                    </a>
+                    <a class="button js-submit-redirect"
+                       href="{% url 'proposals:update_pre' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
                 {% elif proposal.is_practice %}
-                    <a class="button js-submit-redirect" href="{% url 'proposals:update_practice' proposal.pk %}">
+                    <a class="button js-submit-redirect"
+                       href="{% url 'proposals:update_practice' proposal.pk %}">
                         {% trans "Terug naar begin aanvraag" %}
                     </a>
                 {% else %}
-                    <a class="button js-submit-redirect" href="{% url 'proposals:update' proposal.pk %}">
-                        {% trans "Terug naar begin aanvraag" %}
-                    </a>
+                    <a class="button js-submit-redirect"
+                       href="{% url 'proposals:update' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
                 {% endif %}
             {% endif %}
             {% if study %}
-                <a class="button js-submit-redirect" href="{% url 'studies:update' study.pk %}">
-                    {% trans "Terug naar begin traject" %}
-                </a>
+                <a class="button js-submit-redirect"
+                   href="{% url 'studies:update' study.pk %}">{% trans "Terug naar begin traject" %}</a>
             {% endif %}
             {% if session %}
-                <a class="button js-submit-redirect" href="{% url 'tasks:start' session.pk %}">
-                    {% trans "Terug naar begin sessie" %}
-                </a>
+                <a class="button js-submit-redirect"
+                   href="{% url 'tasks:start' session.pk %}">{% trans "Terug naar begin sessie" %}</a>
             {% endif %}
         {% endif %}
         {% if not no_forward %}
-            <input class="button button-colored continue-button" type="submit" name="save_continue"
-                   value="{{ next_text|default:_('Opslaan en volgende stap >>') }}"/>
+            <input class="button button-colored continue-button"
+                   type="submit"
+                   name="save_continue"
+                   value="{{ next_text|default:_("
+                   Opslaan
+                   en
+                   volgende
+                   stap>
+            >") }}" />
         {% endif %}
     </div>
-
 </div>
diff --git a/main/templates/base/login_header.html b/main/templates/base/login_header.html
index 49290366d..ed081a8b3 100644
--- a/main/templates/base/login_header.html
+++ b/main/templates/base/login_header.html
@@ -6,6 +6,6 @@
         {% transformat "Welkom {}" user.get_full_name %}
         <a href="{% url 'logout' %}">({% trans 'Log uit' %})</a>
     {% endwith %}
-    {% else %}
+{% else %}
     &nbsp; {# UI requires a line here #}
 {% endif %}
diff --git a/main/templates/base/navigation.html b/main/templates/base/navigation.html
index c89922521..caecae092 100644
--- a/main/templates/base/navigation.html
+++ b/main/templates/base/navigation.html
@@ -2,7 +2,6 @@
 {% load uil_filters %}
 
 {% include 'base/sidebar.html' %}
-
 <div class="navigation-bar hide-xs">
     <ul>
         {% counter main_counter create 1 %}
@@ -11,61 +10,45 @@
                 {# First layer, the bar itself #}
                 <li>
                     {% counter main_counter store %}
-                    <div
-                            class="navigation-content
-                            {% if not item.url %}inactive{% endif %}
-                            {% if main_counter == active %}active{% endif %}
-                        "
-                    >
-                        {% if item.url %}
-                            <a class="js-submit-redirect" href="{{ item.url }}">
-                        {% endif %}
-                        <div class="navigation-bubble">
-                            {% counter main_counter value %}
-                        </div>
-                        {% if item.url %}
-                            </a>
-                        {% endif %}
+                    <div class="navigation-content {% if not item.url %}inactive{% endif %} {% if main_counter == active %}active{% endif %} ">
+                        {% if item.url %}<a class="js-submit-redirect" href="{{ item.url }}">{% endif %}
+                            <div class="navigation-bubble">{% counter main_counter value %}</div>
+                            {% if item.url %}</a>{% endif %}
                         <div class="navigation-text">
                             {% if not item.children %}
                                 {{ item.title }}
                             {% else %}
                                 {# If it has children, create a dropdown instead  #}
                                 <div class="dropdown">
-                                    <span
-                                        class="dropdown-toggle"
-                                        type="button"
-                                        id="dropdownMenuButton"
-                                        data-toggle="dropdown"
-                                        aria-haspopup="true"
-                                        aria-expanded="false"
-                                    >
-                                        {{ item.title }}
-                                    </span>
-                                    <div class="dropdown-menu multi-level" aria-labelledby="dropdownMenuButton">
+                                    <span class="dropdown-toggle"
+                                          type="button"
+                                          id="dropdownMenuButton"
+                                          data-toggle="dropdown"
+                                          aria-haspopup="true"
+                                          aria-expanded="false">{{ item.title }}</span>
+                                    <div class="dropdown-menu multi-level"
+                                         aria-labelledby="dropdownMenuButton">
                                         {# Second layer (first dropdown) #}
                                         {% for child in item.children %}
                                             {% if not child.children %}
-                                                <a href="{{ child.url|default_if_none:"#" }}" class="dropdown-item js-submit-redirect {% if not child.url %}disabled{% endif %}">
+                                                <a href="{{ child.url|default_if_none:"#" }}"
+                                                   class="dropdown-item js-submit-redirect {% if not child.url %}disabled{% endif %}">
                                                     {{ child.title }}
                                                 </a>
                                             {% else %}
                                                 {# Third layer (second dropdown) #}
                                                 <div class="dropdown-submenu dropdown-item">
-                                                    <span
-                                                        class="dropdown-toggle"
-                                                        type="button"
-                                                        id="dropdownMenuButton"
-                                                        data-toggle="dropdown"
-                                                        aria-haspopup="true"
-                                                        aria-expanded="false"
-                                                    >
-                                                        {{ child.title }}
-                                                    </span>
+                                                    <span class="dropdown-toggle"
+                                                          type="button"
+                                                          id="dropdownMenuButton"
+                                                          data-toggle="dropdown"
+                                                          aria-haspopup="true"
+                                                          aria-expanded="false">{{ child.title }}</span>
                                                     <div class="dropdown-menu" aria-labelledby="dropdownMenuButton">
                                                         {#  Don't support more than 3 layers. This should be enough #}
                                                         {% for subchild in child.children %}
-                                                            <a href="{{ subchild.url|default_if_none:"#" }}" class="dropdown-item js-submit-redirect {% if not subchild.url %}disabled{% endif %}">
+                                                            <a href="{{ subchild.url|default_if_none:"#" }}"
+                                                               class="dropdown-item js-submit-redirect {% if not subchild.url %}disabled{% endif %}">
                                                                 {{ subchild.title }}
                                                             </a>
                                                         {% endfor %}
@@ -77,11 +60,10 @@
                                 </div>
                             {% endif %}
                         </div>
-
                     </div>
                 </li>
                 {% counter main_counter increment %}
             {% endif %}
         {% endfor %}
     </ul>
-</div>
\ No newline at end of file
+</div>
diff --git a/main/templates/base/sidebar.html b/main/templates/base/sidebar.html
index fe8ecde4d..f4c0bc086 100644
--- a/main/templates/base/sidebar.html
+++ b/main/templates/base/sidebar.html
@@ -1,9 +1,12 @@
 {% load static %}
 {% load i18n %}
 
-<script type="text/javascript" charset="utf8" src="//cdnjs.cloudflare.com/ajax/libs/jquery-sidebar/3.3.2/jquery.sidebar.min.js"></script>
-<link rel="stylesheet" type="text/css" href="{% static 'main/progress.css' %}">
-
+<script type="text/javascript"
+        charset="utf8"
+        src="//cdnjs.cloudflare.com/ajax/libs/jquery-sidebar/3.3.2/jquery.sidebar.min.js"></script>
+<link rel="stylesheet"
+      type="text/css"
+      href="{% static 'main/progress.css' %}">
 <script>
 $(function() {
     // Add dividers
@@ -23,48 +26,55 @@
     });
 });
 </script>
-
 <button class="pure-button open-progress show-xs">{% trans "Toon voortgang" %}</button>
-<br/>
+<br />
 <div class="progress">
     <button class="pure-button close-progress">{% trans "Sluiten" %}</button>
     <h2>{% trans "Voortgang" %}</h2>
     <ul>
-    {% for item in nav_items %}
-        {% if not item.is_title %}
-        <li>
-            {% if item.url %}
-            <a class="sideBarLink js-submit-redirect {% if item.is_title %}title{% endif %}" href="{{ item.url }}">{{ item.title }}</a>
-            {% else %}
-            <span class="{% if item.is_title %}title{% endif %}">{{ item.title }}</span>
-            {% endif %}
-        </li>
-        <li><div class="divider"></div></li>
-        {% for child in item.children %}
-            <li>
-                {% if child.url %}
-                <a class="ml-3 js-submit-redirect sideBarLink {% if child.is_title %}title{% endif %}" href="{{ child.url }}">{{ child.title }}</a>
-                {% else %}
-                <span class="ml-3 {% if child.is_title %}title{% endif %}">{{ child.title }}</span>
-                {% endif %}
-            </li>
-            <li><div class="divider"></div></li>
-            {% for subchild in child.children %}
+        {% for item in nav_items %}
+            {% if not item.is_title %}
                 <li>
-                    {% if subchild.url %}
-                    <a class="ml-5 js-submit-redirect sideBarLink" href="{{ subchild.url }}">{{ subchild.title }}</a>
+                    {% if item.url %}
+                        <a class="sideBarLink js-submit-redirect {% if item.is_title %}title{% endif %}"
+                           href="{{ item.url }}">{{ item.title }}</a>
                     {% else %}
-                    <span class="ml-5">{{ subchild.title }}</span>
+                        <span class="{% if item.is_title %}title{% endif %}">{{ item.title }}</span>
                     {% endif %}
                 </li>
-                <li><div class="divider"></div></li>
-            {% endfor %}
+                <li>
+                    <div class="divider"></div>
+                </li>
+                {% for child in item.children %}
+                    <li>
+                        {% if child.url %}
+                            <a class="ml-3 js-submit-redirect sideBarLink {% if child.is_title %}title{% endif %}"
+                               href="{{ child.url }}">{{ child.title }}</a>
+                        {% else %}
+                            <span class="ml-3 {% if child.is_title %}title{% endif %}">{{ child.title }}</span>
+                        {% endif %}
+                    </li>
+                    <li>
+                        <div class="divider"></div>
+                    </li>
+                    {% for subchild in child.children %}
+                        <li>
+                            {% if subchild.url %}
+                                <a class="ml-5 js-submit-redirect sideBarLink" href="{{ subchild.url }}">{{ subchild.title }}</a>
+                            {% else %}
+                                <span class="ml-5">{{ subchild.title }}</span>
+                            {% endif %}
+                        </li>
+                        <li>
+                            <div class="divider"></div>
+                        </li>
+                    {% endfor %}
+                {% endfor %}
+            {% else %}
+            </ul>
+            <strong>{{ item.title }}</strong>
+            <ul>
+            {% endif %}
         {% endfor %}
-        {% else %}
-    </ul>
-        <strong>{{ item.title }}</strong>
-    <ul>
-        {% endif %}
-    {% endfor %}
     </ul>
 </div>
diff --git a/main/templates/base/site_header.html b/main/templates/base/site_header.html
index ece9f41a6..aac33d38d 100644
--- a/main/templates/base/site_header.html
+++ b/main/templates/base/site_header.html
@@ -1,2 +1,3 @@
 {% load i18n %}
+
 {% trans "Portal FETC - Geesteswetenschappen" %}
diff --git a/main/templates/base/site_html_head.html b/main/templates/base/site_html_head.html
index 3fe174739..60501b7c9 100644
--- a/main/templates/base/site_html_head.html
+++ b/main/templates/base/site_html_head.html
@@ -1,6 +1,10 @@
 {% load static %}
-<link rel="stylesheet" type="text/css" href="{% static 'main/style.css' %}">
 
-<script type="text/javascript" charset="utf8" src="{% static 'main/js/datepicker-nl.js' %}"></script>
-<script type="text/javascript" charset="utf8" src="{% static 'main/js/redirect-submit.js' %}"></script>
-{% include "base/form_styling.html" %}
\ No newline at end of file
+<link rel="stylesheet" type="text/css" href="{% static 'main/style.css' %}">
+<script type="text/javascript"
+        charset="utf8"
+        src="{% static 'main/js/datepicker-nl.js' %}"></script>
+<script type="text/javascript"
+        charset="utf8"
+        src="{% static 'main/js/redirect-submit.js' %}"></script>
+{% include "base/form_styling.html" %}
diff --git a/main/templates/base/site_title.html b/main/templates/base/site_title.html
index 1cabe3998..53157f48e 100644
--- a/main/templates/base/site_title.html
+++ b/main/templates/base/site_title.html
@@ -1,2 +1,3 @@
 {% load i18n %}
-{% trans "FETC-GW" %}
\ No newline at end of file
+
+{% trans "FETC-GW" %}
diff --git a/main/templates/error/400.html b/main/templates/error/400.html
index 411a66c16..8c24478a5 100644
--- a/main/templates/error/400.html
+++ b/main/templates/error/400.html
@@ -10,9 +10,9 @@ <h2>
                 {% trans 'Server error' %}
             </h2>
             <p>
-            {% blocktrans trimmed %}
-                Er is een fout opgetreden tijdens het opvragen van deze pagina.
-            {% endblocktrans %}
+                {% blocktrans trimmed %}
+                    Er is een fout opgetreden tijdens het opvragen van deze pagina.
+                {% endblocktrans %}
             </p>
             <p>
                 {% blocktrans trimmed %}
diff --git a/main/templates/error/403.html b/main/templates/error/403.html
index 98556bca1..e680da6c4 100644
--- a/main/templates/error/403.html
+++ b/main/templates/error/403.html
@@ -5,23 +5,13 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans 'Geen toegang' %}
-            </h2>
-            <p>
-                {% trans 'Je hebt geen toegang tot de opgevraagde pagina.' %}
-            </p>
+            <h2>{% trans 'Geen toegang' %}</h2>
+            <p>{% trans 'Je hebt geen toegang tot de opgevraagde pagina.' %}</p>
             {% if request.user.is_authenticated %}
-                <p>
-                    {% trans 'Dit kan meerdere oorzaken hebben:' %}
-                </p>
+                <p>{% trans 'Dit kan meerdere oorzaken hebben:' %}</p>
                 <ul>
-                    <li>
-                        {% trans 'Je hebt niet de benodigde rechten om deze pagina te bekijken;' %}
-                    </li>
-                    <li>
-                        {% trans 'Je bent niet als mede-onderzoeker opgegeven voor deze aanvraag;' %}
-                    </li>
+                    <li>{% trans 'Je hebt niet de benodigde rechten om deze pagina te bekijken;' %}</li>
+                    <li>{% trans 'Je bent niet als mede-onderzoeker opgegeven voor deze aanvraag;' %}</li>
                     <li>
                         {% trans 'Je probeert een door jou eerder genomen beslissing aan te passen, maar de beoordelingsperiode is verstreken.' %}
                     </li>
@@ -30,7 +20,7 @@ <h2>
                 <p>
                     {% url 'login' as login_url %}
                     {% blocktrans trimmed %}
-                        Je bent niet ingelogd, probeer <a href="{{ login_url }}"> in te loggen</a>.
+                        Je bent niet ingelogd, probeer <a href="{{ login_url }}">in te loggen</a>.
                     {% endblocktrans %}
                 </p>
             {% endif %}
diff --git a/main/templates/error/403_csrf.html b/main/templates/error/403_csrf.html
index a4188bb55..0afd99004 100644
--- a/main/templates/error/403_csrf.html
+++ b/main/templates/error/403_csrf.html
@@ -9,28 +9,16 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans 'Verzoek kon niet geverifieerd worden' %}
-            </h2>
-            <p>
-                {% trans 'Er is iets fout gegaan met het verifiëren van je browser.' %}
-            </p>
+            <h2>{% trans 'Verzoek kon niet geverifieerd worden' %}</h2>
+            <p>{% trans 'Er is iets fout gegaan met het verifiëren van je browser.' %}</p>
             <p>
                 {% trans 'Dit kan meerdere oorzaken hebben, zoals het gebruik van een script- of ad-blocker, of je cookie-instellingen. Probeer eerst een <em>volledige verversing</em> van de pagina:' %}
             </p>
             <ul>
-                <li>
-                    {% trans 'Voor Chrome: ctrl + F5 (Windows) of cmd + shift + R (Mac)' %}
-                </li>
-                <li>
-                    {% trans 'Voor Firefox: ctrl + shift + R (Windows) of cmd + shift + R (Mac)' %}
-                </li>
-                <li>
-                    {% trans 'Voor Edge: ctrl + F5' %}
-                </li>
-                <li>
-                    {% trans 'Voor Safari: option + cmnd + E' %}
-                </li>
+                <li>{% trans 'Voor Chrome: ctrl + F5 (Windows) of cmd + shift + R (Mac)' %}</li>
+                <li>{% trans 'Voor Firefox: ctrl + shift + R (Windows) of cmd + shift + R (Mac)' %}</li>
+                <li>{% trans 'Voor Edge: ctrl + F5' %}</li>
+                <li>{% trans 'Voor Safari: option + cmnd + E' %}</li>
             </ul>
             <p>
                 {% blocktrans trimmed %}
diff --git a/main/templates/error/404.html b/main/templates/error/404.html
index 907a31191..58af97167 100644
--- a/main/templates/error/404.html
+++ b/main/templates/error/404.html
@@ -5,12 +5,8 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans 'Pagina niet gevonden' %}
-            </h2>
-            <p>
-                {% trans 'Sorry, deze pagina is helaas niet (meer) beschikbaar.' %}
-            </p>
+            <h2>{% trans 'Pagina niet gevonden' %}</h2>
+            <p>{% trans 'Sorry, deze pagina is helaas niet (meer) beschikbaar.' %}</p>
             <p>
                 {% blocktrans trimmed %}
                     Mogelijk ben je hier terechtgekomen via een verouderde of foutieve link. Graag vernemen wij welke
diff --git a/main/templates/error/500.html b/main/templates/error/500.html
index da7446a24..c28084678 100644
--- a/main/templates/error/500.html
+++ b/main/templates/error/500.html
@@ -5,9 +5,7 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans 'Server error' %}
-            </h2>
+            <h2>{% trans 'Server error' %}</h2>
             <p>
                 {% blocktrans trimmed %}
                     Er is een fout opgetreden tijdens het opvragen van deze pagina.
diff --git a/main/templates/main/index.html b/main/templates/main/index.html
index 7744adbeb..10f923f63 100644
--- a/main/templates/main/index.html
+++ b/main/templates/main/index.html
@@ -18,7 +18,6 @@
                     {% blocktrans trimmed %}
                         Deze portal is bedoeld voor medewerkers (en studenten) van de Faculteit Geesteswetenschappen.
                     {% endblocktrans %}
-
                     {% if user.faculties.all %}
                         {# Filters do not like blocktrans, so that value is just outside... #}
                         {% blocktrans trimmed %}
@@ -30,7 +29,6 @@
                             Volgens onze gegevens werk/studeer je bij een andere faculteit of dienst.
                         {% endblocktrans %}
                     {% endif %}
-
                     {% blocktrans trimmed %}
                         Controleer of je inderdaad een aanvraag wilt indienen bij de Facultaire Ethische Toetsingscommissie van Geesteswetenschappen.
                     {% endblocktrans %}
@@ -52,44 +50,34 @@
                     {% endautoescape %}
                 </div>
             {% endfor %}
-            <h3>
-                {% trans "Startpagina" %} - {{ user.get_full_name }}
-            </h3>
+            <h3>{% trans "Startpagina" %} - {{ user.get_full_name }}</h3>
         </div>
     </div>
     <div class="uu-inner-container">
         <div class="col-12">
-
             <p>
                 {% blocktrans trimmed %}
-
-
                     Formele goedkeuring door één van beide kamers van de FETC-GW (middels een formele goedkeuringsbrief) is vereist voor mensgebonden onderzoek binnen de Faculteit Geesteswetenschappen. Voorafgaand aan het onderzoek, maar ook voorafgaand aan het rekruteren van deelnemers, moet de aanvraag zijn goedgekeurd. Het is dus van belang om te wachten met de aanvang van het onderzoek tot deze brief ontvangen is.
-
                 {% endblocktrans %}
-            </p><p>
+            </p>
+            <p>
                 {% blocktrans trimmed %}
-
-
-
                     NB: Goedgekeurde aanvragen komen in het archief van deze portal te staan, zie het menu hierboven. Dit archief is toegankelijk voor iedereen met een Solis-ID die bij de Faculteit Geesteswetenschappen werkt of studeert.
-
                 {% endblocktrans %}
-            </p><p>
+            </p>
+            <p>
                 {% blocktrans trimmed %}
-
                     Heb je een vraag over de werking van de portal, ontdek je een foutje, missende functionaliteit, of verkeerde vertaling? Neem dan contact op met  <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.
                 {% endblocktrans %}
-
             </p>
             <ul>
-                <li>{% trans "Check voor het indienen:" %}
+                <li>
+                    {% trans "Check voor het indienen:" %}
                     <ul>
                         <li>
                             {% blocktrans trimmed %}
                                 De
-                                <a href="https://fetc-gw.wp.hum.uu.nl/" target="_blank">
-                                    UU-webpagina van de FETC-GW</a> voor nieuws en de agenda.
+                                <a href="https://fetc-gw.wp.hum.uu.nl/" target="_blank">UU-webpagina van de FETC-GW</a> voor nieuws en de agenda.
                             {% endblocktrans %}
                         </li>
                         <li>
@@ -100,29 +88,36 @@ <h3>
                     </ul>
                     <li>
                         {% blocktrans trimmed %}
-                            Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="blank">voorbeelddocumenten</a> voor de <em>informed consent</em>. (de laatstse versie is van <u>december 2021</u>)</li>
-                        {% endblocktrans %}
+                            Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw"
+    target="blank">voorbeelddocumenten</a> voor de <em>informed consent</em>. (de laatstse versie is van <u>december 2021</u>)
+                        </li>
+                    {% endblocktrans %}
                 </li>
                 {% blocktrans trimmed %}
-                    <li>Voor advies over data management (plannen): <a href="mailto:datamanagement.gw@uu.nl">datamanagement.gw@uu.nl</a>.</li>
-                    <li>Voor advies over privacy zaken: <a href="mailto:privacy.gw@uu.nl">privacy.gw@uu.nl</a>.</li>
-                    <li>Voor vragen over de procedure: <a href="mailto:fetc-gw@uu.nl">Desiree Capel</a>.</li>
-                    <li>Voor vragen over de portal zelf: <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.</li>
+                    <li>
+                        Voor advies over data management (plannen): <a href="mailto:datamanagement.gw@uu.nl">datamanagement.gw@uu.nl</a>.
+                    </li>
+                    <li>
+                        Voor advies over privacy zaken: <a href="mailto:privacy.gw@uu.nl">privacy.gw@uu.nl</a>.
+                    </li>
+                    <li>
+                        Voor vragen over de procedure: <a href="mailto:fetc-gw@uu.nl">Desiree Capel</a>.
+                    </li>
+                    <li>
+                        Voor vragen over de portal zelf: <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.
+                    </li>
                 {% endblocktrans %}
             </ul>
-
             <p>
                 {% blocktrans trimmed %}
                     In deze portal kan je het volgende doen:
                 {% endblocktrans %}
             </p>
         </div>
-</div>
+    </div>
     <div class="uu-inner-container">
         <div class="col-md-6 col-12">
-            <h5>
-                {% trans "Dien een nieuwe aanvraag in" %}
-            </h5>
+            <h5>{% trans "Dien een nieuwe aanvraag in" %}</h5>
             {#                {% trans '(check de meest recente voorbeelddocumenten op <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">intranet</a>)' %}#}
             <ul class="startpage-ul">
                 <li>
@@ -140,9 +135,7 @@ <h5>
             </ul>
         </div>
         <div class="col-md-6 col-12">
-            <h5>
-                {% trans "Een aanvraag reviseren" %}
-            </h5>
+            <h5>{% trans "Een aanvraag reviseren" %}</h5>
             {#                {% trans '(check de meest recente voorbeelddocumenten op <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="_blank">intranet</a>)' %}#}
             <ul class="startpage-ul">
                 <li>
@@ -156,9 +149,7 @@ <h5>
     </div>
     <div class="uu-inner-container mt-2 mb-2">
         <div class="col-md-6 col-12">
-            <h6>
-                {% trans "Bekijk" %}
-            </h6>
+            <h6>{% trans "Bekijk" %}</h6>
             <ul class="startpage-ul">
                 <li>
                     <a href="{% url 'proposals:my_concepts' %}">{% trans "mijn conceptaanvragen;" %}</a>
@@ -179,9 +170,7 @@ <h6>
                     <a href="{% url 'proposals:my_archive' %}">{% trans "al mijn aanvragen." %}</a>
                 </li>
             </ul>
-            <h6 class="mt-2 d-inline-block">
-                {% trans 'FETC-GW archief' %}
-            </h6>
+            <h6 class="mt-2 d-inline-block">{% trans 'FETC-GW archief' %}</h6>
             <ul class="startpage-ul">
                 <li>
                     <a href="{% url 'proposals:archive' 'AK' %}">{% trans "Alle goedgekeurde aanvragen bekijken van de Algemene Kamer" %}</a>
@@ -191,18 +180,14 @@ <h6 class="mt-2 d-inline-block">
                 </li>
             </ul>
         </div>
-
         <div class="col-md-6 col-12">
-            <h6>
-                Help
-            </h6>
+            <h6>Help</h6>
             <ul class="startpage-ul">
                 <li>
                     <a href="http://fetc-gw.wp.hum.uu.nl/" target="_blank">{% trans "FETC-GW website" %}</a>
                 </li>
                 <li>
-                    <a href="{% trans "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/" %}"
-                       target="_blank">{% trans "Reglement van de FETC-GW" %}</a>
+                    <a href="{% trans "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/" %}" target="_blank">{% trans "Reglement van de FETC-GW" %}</a>
                 </li>
                 <li>
                     <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw"
@@ -212,14 +197,11 @@ <h6>
                     <a href="{% url 'faqs:list' %}">{% trans "Veelgestelde vragen m.b.t. dit portal" %}</a>
                 </li>
             </ul>
-
-
         </div>
-
-        <hr> </hr>
-
-
-        <div class="col-12 mt-4">            <p>{% trans "Bannerfoto door Kim O'leary" %}</p></div>
-
+        <hr>
+    </hr>
+    <div class="col-12 mt-4">
+        <p>{% trans "Bannerfoto door Kim O'leary" %}</p>
     </div>
+</div>
 {% endblock %}
diff --git a/main/templates/main/landing.html b/main/templates/main/landing.html
index 1a5420bf7..3a61585ee 100644
--- a/main/templates/main/landing.html
+++ b/main/templates/main/landing.html
@@ -30,9 +30,7 @@
     {# Very ugly imitation of uu-hero #}
     <div style="background: #FFCD00; margin: -10px -15px; padding:1rem;">
         <div class="uu-inner-container" style="padding-left: 15px">
-            <h2 style="font-weight: 500">
-                {% trans "Startpagina" %}
-            </h2>
+            <h2 style="font-weight: 500">{% trans "Startpagina" %}</h2>
         </div>
     </div>
     <div class="uu-inner-container mt-1">
@@ -61,13 +59,15 @@ <h2 style="font-weight: 500">
             </p>
             <h4>{% trans 'Contact' %}</h4>
             <p>
-                <strong>{% trans 'Secretaris FETC-GW' %}</strong><br/>
+                <strong>{% trans 'Secretaris FETC-GW' %}</strong>
+                <br />
                 <span class="email" data-email="fetc-gw">
                     <i>{% trans "Om hier een e-mail adres te zien moet Javascript aan staan" %}</i>
                 </span>
             </p>
             <p>
-                <strong>{% trans 'Technische ondersteuning' %}</strong><br/>
+                <strong>{% trans 'Technische ondersteuning' %}</strong>
+                <br />
                 <span class="email" data-email="portalsupport.gw">
                     <i>{% trans "Om hier een e-mail adres te zien moet Javascript aan staan" %}</i>
                 </span>
@@ -82,15 +82,19 @@ <h3>{% trans "Inloggen" %}</h3>
                 {% endblocktrans %}
             </p>
             {% if show_saml %}
-                <a href="{% url 'saml-login' %}?next={{ next }}" class="button button-colored">
-                    {% trans 'Log in met je Solis-ID' %}{% if login_descriptors %} (SAML){% endif %}
+                <a href="{% url 'saml-login' %}?next={{ next }}"
+                   class="button button-colored">
+                    {% trans 'Log in met je Solis-ID' %}
+                    {% if login_descriptors %}(SAML){% endif %}
                 </a>
             {% endif %}
             {# Unnecessary layout hack #}
             {% if show_saml and show_django %}<div class="mt-1"></div>{% endif %}
             {% if show_django %}
-                <a href="{% url 'login' %}?next={{ next }}" class="button button-colored">
-                    {% trans 'Log in met je Solis-ID' %}{% if login_descriptors %} (Non-SAML){% endif %}
+                <a href="{% url 'login' %}?next={{ next }}"
+                   class="button button-colored">
+                    {% trans 'Log in met je Solis-ID' %}
+                    {% if login_descriptors %}(Non-SAML){% endif %}
                 </a>
             {% endif %}
         </div>
diff --git a/main/templates/main/setting_checks.html b/main/templates/main/setting_checks.html
index 2527c0bfc..6035230a7 100644
--- a/main/templates/main/setting_checks.html
+++ b/main/templates/main/setting_checks.html
@@ -12,4 +12,4 @@
         }
     });
 });
-</script>
\ No newline at end of file
+</script>
diff --git a/main/templates/registration/logged_out.html b/main/templates/registration/logged_out.html
index 724347283..f67b94eca 100644
--- a/main/templates/registration/logged_out.html
+++ b/main/templates/registration/logged_out.html
@@ -5,22 +5,18 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Uitloggen" %}
-            </h2>
-            <p>
-                {% trans "Je bent succesvol uitgelogd." %}
-            </p>
+            <h2>{% trans "Uitloggen" %}</h2>
+            <p>{% trans "Je bent succesvol uitgelogd." %}</p>
             <ul>
                 <li>
                     {% url 'main:landing' as landing_url %}
                     {% blocktrans trimmed %}
-                    Klik  <a href="{{ landing_url }}">hier</a> om naar de startpagina te gaan.
+                        Klik  <a href="{{ landing_url }}">hier</a> om naar de startpagina te gaan.
                     {% endblocktrans %}
                 </li>
                 <li>
                     {% blocktrans trimmed %}
-                    Klik <a href="http://fetc-gw.wp.hum.uu.nl">hier</a> om terug te keren naar de FETC-GW-website.
+                        Klik <a href="http://fetc-gw.wp.hum.uu.nl">hier</a> om terug te keren naar de FETC-GW-website.
                     {% endblocktrans %}
                 </li>
             </ul>
diff --git a/main/templates/registration/login.html b/main/templates/registration/login.html
index 6fe005bcb..846aa2fb0 100644
--- a/main/templates/registration/login.html
+++ b/main/templates/registration/login.html
@@ -11,24 +11,29 @@
     {# Very ugly imitation of uu-hero #}
     <div style="background: #FFCD00; margin: -10px -15px; padding:1rem;">
         <div class="uu-inner-container" style="padding-left: 15px">
-            <h2 style="font-weight: 500">
-                {% trans "Inloggen" %}
-            </h2>
+            <h2 style="font-weight: 500">{% trans "Inloggen" %}</h2>
         </div>
     </div>
     <div class="uu-inner-container mt-4">
         <div class="col-12 col-md-4">
             {% if form.errors %}
-                <p class="form-errors">
-                    {% trans "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw." %}
-                </p>
+                <p class="form-errors">{% trans "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw." %}</p>
             {% endif %}
-            <p>
-                {% trans "Je kan hier inloggen met je Solis-ID en wachtwoord." %}
-            </p>
-            <form class="" method="post" action="{% url 'login' %}">{% csrf_token %}
-                <input id="id_username" maxlength="254" name="username" type="text" placeholder="{% trans 'Gebruikersnaam' %}"><br/>
-                <input class="mt-1" id="id_password" name="password" type="password" placeholder="{% trans 'Wachtwoord' %}"><br/>
+            <p>{% trans "Je kan hier inloggen met je Solis-ID en wachtwoord." %}</p>
+            <form class="" method="post" action="{% url 'login' %}">
+                {% csrf_token %}
+                <input id="id_username"
+                       maxlength="254"
+                       name="username"
+                       type="text"
+                       placeholder="{% trans 'Gebruikersnaam' %}">
+                <br />
+                <input class="mt-1"
+                       id="id_password"
+                       name="password"
+                       type="password"
+                       placeholder="{% trans 'Wachtwoord' %}">
+                <br />
                 <input class="mt-3 mb-3" type="submit" value="{% trans 'Inloggen' %}" />
                 <input type="hidden" name="next" value="{{ next }}" />
             </form>
diff --git a/observations/templates/observations/observation_form.html b/observations/templates/observations/observation_form.html
index fc5738207..61eb3fa57 100644
--- a/observations/templates/observations/observation_form.html
+++ b/observations/templates/observations/observation_form.html
@@ -7,7 +7,6 @@
     {% trans "Het observatieonderzoek" %} - {{ block.super }}
 {% endblock %}
 
-
 {% block html_head %}
     <script>
 $(function() {
@@ -30,8 +29,8 @@
     add_title('needs_approval', "{% trans 'Toestemming' %}");
     add_title('registrations', "{% trans 'Registratie gedrag' %}");
 });
-</script>
-{% include "main/setting_checks.html" %}
+    </script>
+    {% include "main/setting_checks.html" %}
 {% endblock %}
 
 {% block content %}
@@ -40,14 +39,15 @@
             {% with nav_items=study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Het observatieonderzoek" %}
-            </h2>
+            <h2>{% trans "Het observatieonderzoek" %}</h2>
             {% include "studies/study_title.html" %}
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% with proposal=observation.study.proposal %}
-                {% include "base/form_buttons.html" %}
+                    {% include "base/form_buttons.html" %}
                 {% endwith %}
             </form>
         </div>
diff --git a/observations/templates/observations/observation_update_attachments.html b/observations/templates/observations/observation_update_attachments.html
index 543375f44..d01e80e15 100644
--- a/observations/templates/observations/observation_update_attachments.html
+++ b/observations/templates/observations/observation_update_attachments.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block html_head %}
-<script>
+    <script>
 $(function() {
     depends_on_hidden_value('passive_consent', 'True', 'passive_consent_details');
     depends_on_hidden_value('passive_consent', 'True', 'director_consent_declaration');
@@ -17,26 +17,30 @@
     depends_on_hidden_value('passive_consent', 'False', 'informed_consent');
     depends_on_hidden_value('passive_consent', 'False', 'briefing');
 });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Formulieren aanpassen" %}
-            </h2>
+            <h2>{% trans "Formulieren aanpassen" %}</h2>
             <p>
                 {% blocktrans trimmed with title=study.proposal.title ref_number=study.proposal.reference_number order=study.order %}
-                Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag {{ title }}
-                (referentienummer <em>{{ ref_number }}</em>), traject {{ order }}.
+                    Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag {{ title }}
+                    (referentienummer <em>{{ ref_number }}</em>), traject {{ order }}.
                 {% endblocktrans %}
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <input type="hidden" name="next" value="{{ request.META.HTTP_REFERER }}">
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Formulieren aanpassen' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'Formulieren aanpassen' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>
diff --git a/proposals/templates/easy_pdf/base.html b/proposals/templates/easy_pdf/base.html
index d888592f0..669599076 100644
--- a/proposals/templates/easy_pdf/base.html
+++ b/proposals/templates/easy_pdf/base.html
@@ -1,59 +1,64 @@
 <!DOCTYPE html>
 <html>
-<head>
-    <title>{{ title|default:"" }}</title>
-
-    {% block style_base %}
-        {% comment %}
+    <head>
+        <title>{{ title|default:"" }}</title>
+        {% block style_base %}
+            {% comment %}
             See DEFAULT_CSS in https://github.com/chrisglass/xhtml2pdf/blob/master/xhtml2pdf/default.py
             for base style.
-        {% endcomment %}
-
-        {% block layout_style %}
-            <style type="text/css">
-                @page {
-                    size: {{ pagesize|default:"A4" }};
-                    margin-left: 2.5cm;
-                    margin-right: 2.5cm;
-                    margin-top: 2.5cm;
-                    margin-bottom: 2cm;
-
-                    @frame header {
-                        -pdf-frame-content: page-header;
-                        margin-top: 0.7cm;
-                        margin-right: 2mm;
-                        margin-bottom: 0cm;
-                        margin-left: 1.2cm;
-                    }
+            {% endcomment %}
+            {% block layout_style %}
+                <style type="text/css">
+                    @page {
+                        size: {
+                                {
+                                pagesize|default: "A4"
+                            }
+                        }
 
-                    @frame footer {
-                        -pdf-frame-content: page-footer;
-                        bottom: 0cm;
-                        margin-left: 1cm;
-                        margin-right: 1cm;
-                        height: 1cm;
+                        ;
+                        margin-left: 2.5cm;
+                        margin-right: 2.5cm;
+                        margin-top: 2.5cm;
+                        margin-bottom: 2cm;
+
+                        @frame header {
+                            -pdf-frame-content: page-header;
+                            margin-top: 0.7cm;
+                            margin-right: 2mm;
+                            margin-bottom: 0cm;
+                            margin-left: 1.2cm;
+                        }
+
+                        @frame footer {
+                            -pdf-frame-content: page-footer;
+                            bottom: 0cm;
+                            margin-left: 1cm;
+                            margin-right: 1cm;
+                            height: 1cm;
+                        }
                     }
-                }
-            </style>
-        {%endblock%}
-        {% block extra_style %}{% endblock %}
-    {% endblock %}
-</head>
-<body>
-    <div>
-        {%block page_header%}
-        {%endblock%}
-
-        {%block content%}
-        {%endblock%}
-    </div>
-
-    <div id="page-footer">
-        {%block page_foot%}
-            {% comment %}
+                </style>
+            {% endblock %}
+
+            {% block extra_style %}{% endblock %}
+        {% endblock %}
+
+    </head>
+    <body>
+        <div>
+            {% block page_header %}{% endblock %}
+
+            {% block content %}{% endblock %}
+
+        </div>
+        <div id="page-footer">
+            {% block page_foot %}
+                {% comment %}
                 <pdf:pagenumber />
-            {% endcomment %}
-        {%endblock%}
-    </div>
-</body>
-</html>
\ No newline at end of file
+                {% endcomment %}
+            {% endblock %}
+
+        </div>
+    </body>
+</html>
diff --git a/proposals/templates/proposals/compare_documents.html b/proposals/templates/proposals/compare_documents.html
index 058749a64..146114de3 100644
--- a/proposals/templates/proposals/compare_documents.html
+++ b/proposals/templates/proposals/compare_documents.html
@@ -1,7 +1,7 @@
 {% extends 'base/base.html' %}
+
 {% load static %}
 {% load i18n %}
-
 {% load describe_documents %}
 
 {% block header_title %}
@@ -48,17 +48,17 @@
         <div class="col-12">
             <h2>{% trans 'Vergelijk documenten' %}</h2>
             <p>
-                {% blocktrans %}
-                Hier kan je twee versies van een document vergelijken. Standaard
-                geeft hij een <i>gecombineerde</i> versie weer, waarbij tekst
-                die verwijderd is in het rood is gemarkeerd en nieuwe tekst
-                in het groen is gemarkeerd.
+                {% blocktrans trimmed %}
+                    Hier kan je twee versies van een document vergelijken. Standaard
+                    geeft hij een <i>gecombineerde</i> versie weer, waarbij tekst
+                    die verwijderd is in het rood is gemarkeerd en nieuwe tekst
+                    in het groen is gemarkeerd.
                 {% endblocktrans %}
             </p>
             <p>
-                {% blocktrans %}
-                Je kan ook de bestanden naast elkaar bekijken, met dezelfde
-                markeringen. Klik hiervoor op 'Bekijk apart'.
+                {% blocktrans trimmed %}
+                    Je kan ook de bestanden naast elkaar bekijken, met dezelfde
+                    markeringen. Klik hiervoor op 'Bekijk apart'.
                 {% endblocktrans %}
             </p>
             <h4>
@@ -68,40 +68,30 @@ <h4>
             <div class="warning" style="display: none; clear: both;">
                 {% trans 'Er zijn geen wijzigingen gevonden in dit document!' %}
             </div>
-            <button id="button-split" class="float-right">
-                {% trans 'Bekijk apart' %}
-            </button>
-            <button id="button-combined" style="display: none" class="float-right">
-                {% trans 'Bekijk gecombineerd' %}
-            </button>
+            <button id="button-split" class="float-right">{% trans 'Bekijk apart' %}</button>
+            <button id="button-combined" style="display: none" class="float-right">{% trans 'Bekijk gecombineerd' %}</button>
         </div>
     </div>
-        <div class="uu-inner-container document-compare">
-            <div class="col-6">
-                <p>
-                    <strong>{% trans "Oud" %}: </strong>
-                    <a href="{{ old_file.url }}" download="{{ old_file.name }}">{{ old_name }}</a>
-                </p>
-            </div>
-            <div class="col-6">
-                <p>
-                    <strong>{% trans "Nieuw" %}: </strong>
-                    <a href="{{ new_file.url }}" download="{{ new_file.name }}">{{ new_name }}</a>
-                </p>
-            </div>
+    <div class="uu-inner-container document-compare">
+        <div class="col-6">
+            <p>
+                <strong>{% trans "Oud" %}:</strong>
+                <a href="{{ old_file.url }}" download="{{ old_file.name }}">{{ old_name }}</a>
+            </p>
+        </div>
+        <div class="col-6">
+            <p>
+                <strong>{% trans "Nieuw" %}:</strong>
+                <a href="{{ new_file.url }}" download="{{ new_file.name }}">{{ new_name }}</a>
+            </p>
         </div>
+    </div>
     <div class="uu-inner-container compare">
         <div class="col-12 text-center mt-5 mb-5" id="loading-icon">
-            <img src="{% static 'main/images/loading.gif' %}"/>
-        </div>
-        <div style="display: none" class="col-6 split_view" id="old_text">
-            {{ old_text|linebreaks }}
-        </div>
-        <div style="display: none" class="col-6 split_view" id="new_text">
-            {{ new_text|linebreaks }}
-        </div>
-        <div class="col-12" id="combined_text">
-
+            <img src="{% static 'main/images/loading.gif' %}" />
         </div>
+        <div style="display: none" class="col-6 split_view" id="old_text">{{ old_text|linebreaks }}</div>
+        <div style="display: none" class="col-6 split_view" id="new_text">{{ new_text|linebreaks }}</div>
+        <div class="col-12" id="combined_text"></div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_confirm_delete.html b/proposals/templates/proposals/proposal_confirm_delete.html
index a5b86a9cb..43b9246ae 100644
--- a/proposals/templates/proposals/proposal_confirm_delete.html
+++ b/proposals/templates/proposals/proposal_confirm_delete.html
@@ -15,11 +15,12 @@ <h2>{% trans "Aanvraag verwijderen" %}</h2>
                     Weet je zeker dat je de aanvraag <em>{{ title }}</em> wilt verwijderen?
                 {% endblocktrans %}
             </p>
-            <form action="" method="post">{% csrf_token %}
-                <input class="button" type="submit" value="{% trans 'Verwijderen' %}"/>
-                <a class="button"
-                   href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
+            <form action="" method="post">
+                {% csrf_token %}
+                <input class="button" type="submit" value="{% trans 'Verwijderen' %}" />
+                <a class="button" href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>
-    </div>x
+    </div>
+    x
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_confirmation.html b/proposals/templates/proposals/proposal_confirmation.html
index 574c4a7da..915614cd8 100644
--- a/proposals/templates/proposals/proposal_confirmation.html
+++ b/proposals/templates/proposals/proposal_confirmation.html
@@ -24,16 +24,19 @@
         <div class="col-12">
             <h2>{% trans "Bevestigingsbrief versturen" %}</h2>
             <p>
-                {% blocktrans with title=review.proposal.title %}
+                {% blocktrans trimmed with title=review.proposal.title %}
                     Geef hieronder aan wanneer de bevestigingsbrief voor de aanvraag <em>{{ title }}</em> is verstuurd.
                 {% endblocktrans %}
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                <input class="button" type="submit"
-                       value="{% trans 'Bevestigingsbrief verstuurd' %}"/>
-                <a class="button"
-                   href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
+                <input class="button"
+                       type="submit"
+                       value="{% trans 'Bevestigingsbrief verstuurd' %}" />
+                <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>
diff --git a/proposals/templates/proposals/proposal_copy.html b/proposals/templates/proposals/proposal_copy.html
index deffbfe14..f4c92e10d 100644
--- a/proposals/templates/proposals/proposal_copy.html
+++ b/proposals/templates/proposals/proposal_copy.html
@@ -43,7 +43,7 @@ <h2>
                 <p>
                     {% blocktrans trimmed %}
                         Let op! Er kan maar één revisie tegelijk bestaan. Mocht je jouw aanvraag hier niet zien
-                        als optie om te reviseren, bekijk dan of je aanvraag niet al tussen je concept aanvragen 
+                        als optie om te reviseren, bekijk dan of je aanvraag niet al tussen je concept aanvragen
                         staat.
                     {% endblocktrans %}
                 </p>
@@ -57,16 +57,14 @@ <h2>
                 <p>
                     {% blocktrans trimmed %}
                         Let op! Er kan maar één amendement tegelijk bestaan. Mocht je jouw aanvraag hier niet zien
-                        als optie om te reviseren, bekijk dan of je aanvraag niet al tussen je concept aanvragen 
+                        als optie om te reviseren, bekijk dan of je aanvraag niet al tussen je concept aanvragen
                         staat.
                     {% endblocktrans %}
                 </p>
             {% else %}
                 {% url 'proposals:copy_revision' as revision_url %}
                 {% url 'proposals:copy_amendment' as amendment_url %}
-                <p>
-                    {% trans "Je kan hier een aanvraag kopiëren. Alle velden kunnen na het kopiëren aangepast worden." %}
-                </p>
+                <p>{% trans "Je kan hier een aanvraag kopiëren. Alle velden kunnen na het kopiëren aangepast worden." %}</p>
                 <p>
                     {% blocktrans trimmed %}
                         Deze pagina is alleen bedoeld voor het geval je een geheel nieuwe aanvraag gaat doen op basis van
@@ -86,17 +84,16 @@ <h2>
                     {% endblocktrans %}
                 </p>
             {% endif %}
-            <form action="" method="post">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <div class="float-right mt-2 mb-3">
-                    <a class="button" href="javascript:history.go(-1)">
-                        {% trans "Annuleren" %}
-                    </a>
-                    <input class="button" type="submit" value="{% trans 'Kopiëren' %}"/>
+                    <a class="button" href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
+                    <input class="button" type="submit" value="{% trans 'Kopiëren' %}" />
                 </div>
-
             </form>
         </div>
     </div>
-
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_data_management.html b/proposals/templates/proposals/proposal_data_management.html
index 65de386ca..0dde106bd 100644
--- a/proposals/templates/proposals/proposal_data_management.html
+++ b/proposals/templates/proposals/proposal_data_management.html
@@ -13,91 +13,95 @@
             {% with nav_items=proposal.available_urls active=5 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h1>
-                {% trans "Datamanagement en Privacy" %}
-            </h1>
+            <h1>{% trans "Datamanagement en Privacy" %}</h1>
             <p>
                 {% blocktrans trimmed %}
-                De Universiteit Utrecht streeft naar integriteit, duurzaamheid, en transparantie in de omgang met onderzoeksdata, waaronder persoonsgegevens. Sinds de introductie van de AVG zijn er duidelijke regels die onderzoekers moeten volgen met betrekking tot deze data.
+                    De Universiteit Utrecht streeft naar integriteit, duurzaamheid, en transparantie in de omgang met onderzoeksdata, waaronder persoonsgegevens. Sinds de introductie van de AVG zijn er duidelijke regels die onderzoekers moeten volgen met betrekking tot deze data.
                 {% endblocktrans %}
             </p>
             <h2>{% trans "Data Management Plan" %}</h2>
             <ul>
-            <li>
-                {% blocktrans trimmed %}
-                Een data management plan is sinds 2020 <a href="https://intranet.uu.nl/actueel/nieuws/nieuw-facultair-datamanagementbeleid" target="_blank">verplicht</a> bij de faculteit geesteswetenschappen, zowel als bij de instanties
-NWO en ERC als zij subsidie voor een onderzoek bieden.
-                {% endblocktrans %}
-            </li>
-            <li>
-                {% blocktrans trimmed %}
-                De faculteit biedt uitgebreide informatie op het gebied van data management, waaronder ook <a href="https://www.uu.nl/en/research/research-data-management/guides/data-management-planning" target="_blank">hoe deze te schrijven</a>. <br/> Je kunt bij de faculteit ook je DMP laten nakijken door <a href="https://www.uu.nl/en/research/research-data-management/tools-services/data-management-plan-review" target="_blank">Research Data Management Support</a> of de facultaire <a href="mailto:datamanagement.gw@uu.nl" target="_blank">datamanager</a>.
-                {% endblocktrans %}
-            </li>
-            <li>
-                {% blocktrans trimmed %}
-                Op de website <a href="https://dmponline.dcc.ac.uk/" target="_blank">DMP-online</a> vind je na het inloggen met je Solis-ID templates voor een DMP. Dit is waar je de templates die NWO en ERC vereisen kunt terugvinden, aangeboden door de UU.
-                {% endblocktrans %}
-            </li>
-            </ul>
-            <h3>{% trans "Nuttige workshops:" %}</h3>
-            <p>
-                {% blocktrans trimmed %}
-                Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop te volgen:
-                {% endblocktrans %}
-            </p>
-            <ul>{% blocktrans trimmed %}
                 <li>
-                    de workshop <a href="https://www.uu.nl/en/node/75859" target="_blank">Quick
-start to Research Data Management</a>
+                    {% blocktrans trimmed %}
+                        Een data management plan is sinds 2020 <a href="https://intranet.uu.nl/actueel/nieuws/nieuw-facultair-datamanagementbeleid"
+    target="_blank">verplicht</a> bij de faculteit geesteswetenschappen, zowel als bij de instanties
+                        NWO en ERC als zij subsidie voor een onderzoek bieden.
+                    {% endblocktrans %}
+                </li>
+                <li>
+                    {% blocktrans trimmed %}
+                        De faculteit biedt uitgebreide informatie op het gebied van data management, waaronder ook <a href="https://www.uu.nl/en/research/research-data-management/guides/data-management-planning"
+    target="_blank">hoe deze te schrijven</a>.
+                        <br />
+                        Je kunt bij de faculteit ook je DMP laten nakijken door <a href="https://www.uu.nl/en/research/research-data-management/tools-services/data-management-plan-review"
+    target="_blank">Research Data Management Support</a> of de facultaire <a href="mailto:datamanagement.gw@uu.nl" target="_blank">datamanager</a>.
+                    {% endblocktrans %}
+                </li>
+                <li>
+                    {% blocktrans trimmed %}
+                        Op de website <a href="https://dmponline.dcc.ac.uk/" target="_blank">DMP-online</a> vind je na het inloggen met je Solis-ID templates voor een DMP. Dit is waar je de templates die NWO en ERC vereisen kunt terugvinden, aangeboden door de UU.
+                    {% endblocktrans %}
                 </li>
-
-                {% endblocktrans %}
             </ul>
+            <h3>{% trans "Nuttige workshops:" %}</h3>
             <p>
                 {% blocktrans trimmed %}
-                Voor advies op het gebied van data management planning kun je contact opnemen met de datamanager GW, Frans de Liagre Böhl via <a href="mailto:datamanagement.gw@uu.nl" target="_blank">datamanagement.gw@uu.nl</a>.
+                    Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop te volgen:
                 {% endblocktrans %}
             </p>
-            <h2>{% trans "Privacy: AVG en GDPR" %}</h2>
-            <p>
+            <ul>
                 {% blocktrans trimmed %}
+                    <li>
+                        de workshop <a href="https://www.uu.nl/en/node/75859" target="_blank">Quick
+                    start to Research Data Management</a>
+                </li>
+            {% endblocktrans %}
+        </ul>
+        <p>
+            {% blocktrans trimmed %}
+                Voor advies op het gebied van data management planning kun je contact opnemen met de datamanager GW, Frans de Liagre Böhl via <a href="mailto:datamanagement.gw@uu.nl" target="_blank">datamanagement.gw@uu.nl</a>.
+            {% endblocktrans %}
+        </p>
+        <h2>{% trans "Privacy: AVG en GDPR" %}</h2>
+        <p>
+            {% blocktrans trimmed %}
                 Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de Nederlandse implementatie van het Europese <a href="https://gdpr.eu/" target="_blank">GDPR</a>.
-                {% endblocktrans %}
-            </p>
-            <ul>
+            {% endblocktrans %}
+        </p>
+        <ul>
             <li>
                 {% blocktrans trimmed %}
-                De autoriteit persoonsgegevens heeft <a href="https://www.autoriteitpersoonsgegevens.nl/nl/onderwerpen/algemene-informatie-avg/algemene-informatie-avg" target="_blank">uitgebreide informatie</a> in het Nederlands over hoe de AVG dataverzameling beïnvloedt.
+                    De autoriteit persoonsgegevens heeft <a href="https://www.autoriteitpersoonsgegevens.nl/nl/onderwerpen/algemene-informatie-avg/algemene-informatie-avg"
+    target="_blank">uitgebreide informatie</a> in het Nederlands over hoe de AVG dataverzameling beïnvloedt.
                 {% endblocktrans %}
             </li>
-            </ul>
-            <h3>{% trans "Nuttige workshops:" %}</h3>
-            <p>
-                {% blocktrans trimmed %}
+        </ul>
+        <h3>{% trans "Nuttige workshops:" %}</h3>
+        <p>
+            {% blocktrans trimmed %}
                 Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop te volgen:
-                {% endblocktrans %}
-            </p>
-            <ul>{% blocktrans trimmed %}
+            {% endblocktrans %}
+        </p>
+        <ul>
+            {% blocktrans trimmed %}
                 <li>
                     de workshop <a href="https://www.uu.nl/en/node/81799" target="_blank">Handling
-personal data in research</a>
-                </li>
-
-                {% endblocktrans %}
-            </ul>
-            <p>{% blocktrans trimmed %}
-                Voor advies op het gebied van privacy en de AVG kun je contact opnemen met de privacy officer van GW via <a href="mailto:privacy.gw@uu.nl">privacy.gw@uu.nl</a>.
-                {% endblocktrans %}
-            </p>
-
-
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-            <table>
+                personal data in research</a>
+            </li>
+        {% endblocktrans %}
+    </ul>
+    <p>
+        {% blocktrans trimmed %}
+            Voor advies op het gebied van privacy en de AVG kun je contact opnemen met de privacy officer van GW via <a href="mailto:privacy.gw@uu.nl">privacy.gw@uu.nl</a>.
+        {% endblocktrans %}
+    </p>
+    <form action="" method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        <table>
             {{ form.as_table }}
-            </table>
-                {% include "base/form_buttons.html" %}
-            </form>
-        </div>
-    </div>
+        </table>
+        {% include "base/form_buttons.html" %}
+    </form>
+</div>
+</div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html
index d5cd970a1..739fb6d7b 100644
--- a/proposals/templates/proposals/proposal_diff.html
+++ b/proposals/templates/proposals/proposal_diff.html
@@ -36,7 +36,7 @@
         <div class="col-12">
             <h2>
                 {% trans "Overzicht van wijzigingen bij aanmelding " %}
-                <em>{{proposal.title}}</em> - {{proposal.reference_number}}
+                <em>{{ proposal.title }}</em> - {{ proposal.reference_number }}
             </h2>
             <p>
                 {% trans "Dit overzicht toont de gemaakte wijzigingen in de revisie/het amendement ten opzichte van de originele aanvraag." %}
@@ -46,19 +46,14 @@ <h2>
     <div class="uu-inner-container">
         <div class="col-12 compare document-compare">
             <div class="col-12 text-center mt-5 mb-5" id="loading-icon">
-                <img src="{% static 'main/images/loading.gif' %}"/>
+                <img src="{% static 'main/images/loading.gif' %}" />
             </div>
-
-                {% for section in sections %}
-                    {% include section %}
-                {% endfor %}
-
+            {% for section in sections %}
+                {% include section %}
+            {% endfor %}
             <p class="mt-5 float-right">
-                <button class="button" onclick="window.history.back();">
-                    {% trans "Terug naar de vorige pagina" %}
-                </button>
+                <button class="button" onclick="window.history.back();">{% trans "Terug naar de vorige pagina" %}</button>
             </p>
-
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_export_list.html b/proposals/templates/proposals/proposal_export_list.html
index 55a158af8..f6c6efd83 100644
--- a/proposals/templates/proposals/proposal_export_list.html
+++ b/proposals/templates/proposals/proposal_export_list.html
@@ -3,9 +3,7 @@
 {% load static %}
 {% load i18n %}
 
-{% block header_title %}
-    Goedgekeurde aanvragen - {{ block.super }}
-{% endblock %}
+{% block header_title %}Goedgekeurde aanvragen - {{ block.super }}{% endblock %}
 
 {% block content %}
     <div class="uu-inner-container">
@@ -27,25 +25,21 @@ <h2>Approved proposals</h2>
                         <td>{{ proposal.title }}</td>
                         <td>{{ proposal.created_by.get_full_name }}</td>
                         <td>
-                            {% if proposal.supervisor %}
-                                {{ proposal.supervisor.get_full_name }}
-                            {% endif %}
-                        </td>
-                        <td>
-                            {{ proposal.date_confirmed|date:"d M Y" }}
+                            {% if proposal.supervisor %}{{ proposal.supervisor.get_full_name }}{% endif %}
                         </td>
+                        <td>{{ proposal.date_confirmed|date:"d M Y" }}</td>
                         <td>
                             {# Bad translation hack #}
                             {% if proposal.reviewing_committee.name == "AK" %}
-                            GC
+                                GC
                             {% else %}
-                            LC
+                                LC
                             {% endif %}
                         </td>
                     </tr>
                 {% endfor %}
             </table>
-            <br/>
+            <br />
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_form.html b/proposals/templates/proposals/proposal_form.html
index 7a67cfd7e..02b196253 100644
--- a/proposals/templates/proposals/proposal_form.html
+++ b/proposals/templates/proposals/proposal_form.html
@@ -4,11 +4,13 @@
 {% load i18n %}
 
 {% block header_title %}
-  {% trans "Algemene informatie over de aanvraag" %} - {{ block.super }}
+    {% trans "Algemene informatie over de aanvraag" %} - {{ block.super }}
 {% endblock %}
 
 {% block html_head %}
-  <script type="text/javascript" charset="utf8" src="{% static 'proposals/js/word_counter.js' %}"></script>
+    <script type="text/javascript"
+            charset="utf8"
+            src="{% static 'proposals/js/word_counter.js' %}"></script>
     <script>
         $(function () {
             check_field_required('relation', 'needs_supervisor', 'supervisor', 'proposals');
@@ -57,45 +59,48 @@
     wordCounter("summary", translated_string)
     wordCounter("self_assessment", translated_string)
   });
-  </script>
+    </script>
 {% endblock %}
 
 {% block content %}
-  <div class="uu-inner-container">
-    <div class="col-12">
-      {% if not create %}
-        {% with nav_items=proposal.available_urls active=1 %}
-          {% include 'base/navigation.html' %}
-        {% endwith %}
-      {% endif %}
-      {% if is_practice %}
-        <div class="info">
-          {% trans "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling door de FETC-GW worden ingediend." %}
+    <div class="uu-inner-container">
+        <div class="col-12">
+            {% if not create %}
+                {% with nav_items=proposal.available_urls active=1 %}
+                    {% include 'base/navigation.html' %}
+                {% endwith %}
+            {% endif %}
+            {% if is_practice %}
+                <div class="info">
+                    {% trans "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling door de FETC-GW worden ingediend." %}
+                </div>
+            {% endif %}
+            <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
+            {% if not create and is_supervisor %}
+                {% blocktrans trimmed %}
+                    Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw supervisie. Let er op dat je het
+                    formulier
+                    invult alsof jij die student/PhD kandidaat bent.
+                {% endblocktrans %}
+                <br />
+                <br />
+            {% endif %}
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
+                {% include "base/form_buttons.html" %}
+            </form>
         </div>
-      {% endif %}
-      <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
-      {% if not create and is_supervisor %}
-        {% blocktrans trimmed %}
-          Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw supervisie. Let er op dat je het
-          formulier
-          invult alsof jij die student/PhD kandidaat bent.
-        {% endblocktrans %}
-        <br/>
-        <br/>
-      {% endif %}
-      <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-        <table>{{ form.as_table }}</table>
-        {% include "base/form_buttons.html" %}
-      </form>
     </div>
-  </div>
-  <!-- Code for intended start date warning -->
-  <style>
-  #date_start_warning {
-    line-height: 1.5;
-  }
-  </style>
-  <script>
+    <!-- Code for intended start date warning -->
+    <style>
+        #date_start_warning {
+            line-height: 1.5;
+        }
+    </style>
+    <script>
   /* Find date start input */
   let date_start_input = $("#id_date_start")
 
@@ -137,7 +142,5 @@ <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
   /* Give the update function a warmup run */
   updateWarning();
 
-  </script>
-
-
+    </script>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_form_pre_approved.html b/proposals/templates/proposals/proposal_form_pre_approved.html
index 9acfb000d..396a86f6b 100644
--- a/proposals/templates/proposals/proposal_form_pre_approved.html
+++ b/proposals/templates/proposals/proposal_form_pre_approved.html
@@ -8,8 +8,10 @@
 {% endblock %}
 
 {% block html_head %}
-<script type="text/javascript" charset="utf8" src="{% static 'proposals/js/word_counter.js' %}"></script>
-<script>
+    <script type="text/javascript"
+            charset="utf8"
+            src="{% static 'proposals/js/word_counter.js' %}"></script>
+    <script>
 $(function() {
 
     // Default for proposals
@@ -72,20 +74,20 @@
     let translated_string = " {% trans 'Aantal woorden:' %} "
     wordCounter("summary", translated_string)
 });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
             <h2>{% trans "Algemene informatie over de aanvraag" %}</h2>
-            {% if not create and is_supervisor  %}
+            {% if not create and is_supervisor %}
                 {% blocktrans trimmed %}
                     Je past nu een aanvraag aan van een student/PhD kandidaat onder je supervisie. Let er op dat je het formulier
                     invult alsof jij die student/PhD kandidaat bent.
                 {% endblocktrans %}
-                <br/>
-                <br/>
+                <br />
+                <br />
             {% endif %}
             <form action="" method="post" enctype="multipart/form-data">
                 {% csrf_token %}
diff --git a/proposals/templates/proposals/proposal_list.html b/proposals/templates/proposals/proposal_list.html
index ed621d985..0b97279d1 100644
--- a/proposals/templates/proposals/proposal_list.html
+++ b/proposals/templates/proposals/proposal_list.html
@@ -1,24 +1,18 @@
 {% extends "base/base.html" %}
-{% load vue_tags %}
 
+{% load vue_tags %}
 {% load static %}
 {% load i18n %}
 
 {% get_current_language as LANGUAGE_CODE %}
-
-{% block header_title %}
-    {{ title }} - {{ block.super }}
-{% endblock %}
+{% block header_title %}{{ title }} - {{ block.super }}{% endblock %}
 
 {% block html_head %}
-
     {# This template loads in either the dev or prod Vue library, depending on settings.DEBUG #}
     {% include 'uil.vue/vueloader.html' %}
     {# Load in the base component FancyList #}
     {% load_vue_component 'FancyList' %}
-
     {% include 'proposals/vue_templates/proposal_list.html' %}
-
     <script>
         // Needs to be wrapped into an onload to ensure all dependencies are loaded
         window.onload = _ => {
@@ -26,6 +20,7 @@
         }
     </script>
 {% endblock %}
+
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
@@ -38,70 +33,81 @@ <h2>{{ title }}</h2>
             {% static "proposals/images/folder_add.png" as img_add %}
             {% static 'reviews/images/scale.png' as img_decide %}
             {% static 'proposals/images/edit-undo.png' as img_revise %}
-
-            <p>
-                {{ body }}
-            </p>
+            <p>{{ body }}</p>
             <h3>{% trans "Uitleg" %}</h3>
             <ul>
                 {% if modifiable %}
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_next }}" title="Naar volgende stap"> om naar de volgende stap in
+                            Klik op
+                            <img src="{{ img_next }}" title="Naar volgende stap">
+                            om naar de volgende stap in
                             het proces
                             te gaan.
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_diff }}" title="Toon verschillen"> om de verschillen met de
+                            Klik op
+                            <img src="{{ img_diff }}" title="Toon verschillen">
+                            om de verschillen met de
                             voorgaande
                             versie te zien (alleen beschikbaar voor revisies/amendementen).
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_delete }}" title="Verwijderen"> om je aanvraag te verwijderen.
+                            Klik op
+                            <img src="{{ img_delete }}" title="Verwijderen">
+                            om je aanvraag te verwijderen.
                         {% endblocktrans %}
                     </li>
-                    {% endif %}
-                    {% if submitted %}
+                {% endif %}
+                {% if submitted %}
                     <li>
                         {% blocktrans trimmed %}
-                        Klik op <img src="{{ img_pdf }}" title="Inzien"> om een ingediende aanvraag in te zien.
+                            Klik op
+                            <img src="{{ img_pdf }}" title="Inzien">
+                            om een ingediende aanvraag in te zien.
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_revise }}" title="Maak revisie"> om een revisie aan te maken van je aanvraag.
+                            Klik op
+                            <img src="{{ img_revise }}" title="Maak revisie">
+                            om een revisie aan te maken van je aanvraag.
                         {% endblocktrans %}
                     </li>
                 {% endif %}
                 {% if supervised %}
                     <li>
                         {% blocktrans trimmed %}
-                        Klik op <img src="{{ img_decide }}" title="Beslissen"> om je beslissing door te geven (als eindverantwoordelijke).
+                            Klik op
+                            <img src="{{ img_decide }}" title="Beslissen">
+                            om je beslissing door te geven (als eindverantwoordelijke).
                         {% endblocktrans %}
                     </li>
                 {% endif %}
                 {% if is_secretary %}
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_hide }}" title="Verbergen"> om een ingediende aanvraag te verbergen
+                            Klik op
+                            <img src="{{ img_hide }}" title="Verbergen">
+                            om een ingediende aanvraag te verbergen
                             uit het archief.
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_add }}" title="Toevoegen"> om een ingediende aanvraag toe te voegen
+                            Klik op
+                            <img src="{{ img_add }}" title="Toevoegen">
+                            om een ingediende aanvraag toe te voegen
                             aan het archief.
                         {% endblocktrans %}
                     </li>
                 {% endif %}
             </ul>
-
             <div id="list"></div>
-
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 9d1d10631..3239d54d2 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -8,7 +8,6 @@
 
 {% block extra_style %}
     <style type="text/css">
-
         @font-face {
             font-family: "Open Sans";
             src: url('proposals/static/proposals/pdf_font/OpenSans-Regular.ttf');
@@ -54,7 +53,8 @@
             border-left-color: #cbcbcb;
         }
 
-        .question, .answer {
+        .question,
+        .answer {
             display: block;
             width: 500px !important;
             font-weight: normal;
@@ -78,51 +78,48 @@
             margin-top: 2rem;
             font-size: 150%;
         }
-
     </style>
 {% endblock %}
 
 {% block page_header %}
-  <div id="page-header">
-    {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name reviewing_committee=proposal.reviewing_committee.name trimmed %}
-      FETC-GW - <em>{{ title }}</em> (referentienummer {{reviewing_committee}}-{{ reference_number }}, ingediend door {{ submitter }})
-    {% endblocktrans %}
-    {% if proposal.is_revision %}
-      <br>
-      <strong>
-        {% blocktrans with type=proposal.type reference_number=proposal.parent.reference_number trimmed %}
-          {{ type }} van referentienummer {{ reference_number }}
+    <div id="page-header">
+        {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name reviewing_committee=proposal.reviewing_committee.name trimmed %}
+            FETC-GW - <em>{{ title }}</em> (referentienummer {{ reviewing_committee }}-{{ reference_number }}, ingediend door {{ submitter }})
         {% endblocktrans %}
-      </strong>
-    {% endif %}
-  </div>
+        {% if proposal.is_revision %}
+            <br>
+            <strong>
+                {% blocktrans with type=proposal.type reference_number=proposal.parent.reference_number trimmed %}
+                    {{ type }} van referentienummer {{ reference_number }}
+                {% endblocktrans %}
+            </strong>
+        {% endif %}
+    </div>
 {% endblock %}
 
-{% block page_foot %}
-  Page <pdf:pagenumber /> of <pdf:pagecount />
-{% endblock %}
+{% block page_foot %}Page <pdf:pagenumber /> of <pdf:pagecount />{% endblock %}
 
 {% block content %}
-  <div id="content">
-    <div class="main">
-      <h1>
-        {% blocktrans with reference_number=proposal.reference_number trimmed %}
-          Referentienummer {{ reference_number }}
-        {% endblocktrans %}
-      </h1>
-      <p>{% trans 'Huidige staat van de aanvraag' %}: <em>{{proposal.get_status_display}}</em>
-      </p>
-
-      <h2>{% trans 'Indiener' %}</h2>
-      <div class="table">
-        <div class="question">{% trans 'Naam' %}</div><div class="answer">{{ proposal.created_by.get_full_name }}</div>
-        <div class="question">{% trans 'E-mail' %}</div><div class="answer">{{ proposal.created_by.email }}</div>
-      </div>
-
-        {% for section in sections %}
-          {% include section %}
-        {% endfor %}
-
+    <div id="content">
+        <div class="main">
+            <h1>
+                {% blocktrans with reference_number=proposal.reference_number trimmed %}
+                    Referentienummer {{ reference_number }}
+                {% endblocktrans %}
+            </h1>
+            <p>
+                {% trans 'Huidige staat van de aanvraag' %}: <em>{{ proposal.get_status_display }}</em>
+            </p>
+            <h2>{% trans 'Indiener' %}</h2>
+            <div class="table">
+                <div class="question">{% trans 'Naam' %}</div>
+                <div class="answer">{{ proposal.created_by.get_full_name }}</div>
+                <div class="question">{% trans 'E-mail' %}</div>
+                <div class="answer">{{ proposal.created_by.email }}</div>
+            </div>
+            {% for section in sections %}
+                {% include section %}
+            {% endfor %}
+        </div>
     </div>
-  </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_private_archive.html b/proposals/templates/proposals/proposal_private_archive.html
index 49a2fd430..d5e32d94b 100644
--- a/proposals/templates/proposals/proposal_private_archive.html
+++ b/proposals/templates/proposals/proposal_private_archive.html
@@ -1,24 +1,18 @@
 {% extends "base/base.html" %}
-{% load vue_tags %}
 
+{% load vue_tags %}
 {% load static %}
 {% load i18n %}
 
 {% get_current_language as LANGUAGE_CODE %}
-
-{% block header_title %}
-    {{ title }} - {{ block.super }}
-{% endblock %}
+{% block header_title %}{{ title }} - {{ block.super }}{% endblock %}
 
 {% block html_head %}
-
     {# This template loads in either the dev or prod Vue library, depending on settings.DEBUG #}
     {% include 'uil.vue/vueloader.html' %}
     {# Load in the base component FancyList #}
     {% load_vue_component 'FancyList' %}
-
     {% include 'proposals/vue_templates/proposal_archive_list.html' %}
-
     <script>
         // Needs to be wrapped into an onload to ensure all dependencies are loaded
         window.onload = _ => {
@@ -26,6 +20,7 @@
         }
     </script>
 {% endblock %}
+
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
@@ -35,66 +30,76 @@ <h2>{{ title }}</h2>
             {% static "proposals/images/delete.png" as img_delete %}
             {% static "main/images/page_white_acrobat.png" as img_pdf %}
             {% static "proposals/images/folder_delete.png" as img_hide %}
-            {% static "proposals/images/folder_add.png" as img_add%}
+            {% static "proposals/images/folder_add.png" as img_add %}
             {% static 'reviews/images/scale.png' as img_decide %}
-            <p>
-                {{ body }}
-            </p>
+            <p>{{ body }}</p>
             <h3>{% trans "Uitleg" %}</h3>
             <ul>
                 {% if modifiable %}
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_next }}" title="Naar volgende stap"> om naar de volgende stap in
+                            Klik op
+                            <img src="{{ img_next }}" title="Naar volgende stap">
+                            om naar de volgende stap in
                             het proces
                             te gaan.
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_diff }}" title="Toon verschillen"> om de verschillen met de
+                            Klik op
+                            <img src="{{ img_diff }}" title="Toon verschillen">
+                            om de verschillen met de
                             voorgaande
                             versie te zien (alleen beschikbaar voor revisies/amendementen).
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_delete }}" title="Verwijderen"> om je aanvraag te verwijderen.
+                            Klik op
+                            <img src="{{ img_delete }}" title="Verwijderen">
+                            om je aanvraag te verwijderen.
                         {% endblocktrans %}
                     </li>
                 {% endif %}
                 {% if submitted %}
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_pdf }}" title="Inzien"> om een ingediende aanvraag in te zien.
+                            Klik op
+                            <img src="{{ img_pdf }}" title="Inzien">
+                            om een ingediende aanvraag in te zien.
                         {% endblocktrans %}
                     </li>
                 {% endif %}
                 {% if supervised %}
                     <li>
                         {% blocktrans trimmed %}
-                        Klik op <img src="{{ img_decide }}" title="Beslissen"> om je beslissing door te geven (als eindverantwoordelijke).
+                            Klik op
+                            <img src="{{ img_decide }}" title="Beslissen">
+                            om je beslissing door te geven (als eindverantwoordelijke).
                         {% endblocktrans %}
                     </li>
                 {% endif %}
                 {% if is_secretary %}
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_hide }}" title="Verbergen"> om een ingediende aanvraag te verbergen
+                            Klik op
+                            <img src="{{ img_hide }}" title="Verbergen">
+                            om een ingediende aanvraag te verbergen
                             uit het archief.
                         {% endblocktrans %}
                     </li>
                     <li>
                         {% blocktrans trimmed %}
-                            Klik op <img src="{{ img_add }}" title="Toevoegen"> om een ingediende aanvraag toe te voegen
+                            Klik op
+                            <img src="{{ img_add }}" title="Toevoegen">
+                            om een ingediende aanvraag toe te voegen
                             aan het archief.
                         {% endblocktrans %}
                     </li>
                 {% endif %}
             </ul>
-
             <div id="list"></div>
-
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_public_archive.html b/proposals/templates/proposals/proposal_public_archive.html
index 79e27b4eb..f9ce6ced1 100644
--- a/proposals/templates/proposals/proposal_public_archive.html
+++ b/proposals/templates/proposals/proposal_public_archive.html
@@ -2,8 +2,8 @@
 
 {% load static %}
 {% load i18n %}
-{% get_current_language as language_code %}
 
+{% get_current_language as language_code %}
 {% block header_title %}
     {% trans 'Goedgekeurde aanvragen' %} - {{ block.super }}
 {% endblock %}
@@ -26,21 +26,19 @@ <h2>{% trans 'Goedgekeurde aanvragen' %}</h2>
                         <tr>
                             <td>{{ proposal.reference_number }}</td>
                             <td>{{ proposal.title }}</td>
-                            <td>
-                                {{ proposal.date_confirmed|date:"d M Y" }}
-                            </td>
+                            <td>{{ proposal.date_confirmed|date:"d M Y" }}</td>
                             <td>
                                 {% if proposal.reviewing_committee.name == "AK" %}
-                                {% trans 'AK' %}
+                                    {% trans 'AK' %}
                                 {% else %}
-                                {% trans 'LK' %}
+                                    {% trans 'LK' %}
                                 {% endif %}
                             </td>
                         </tr>
                     {% endfor %}
                 </tbody>
             </table>
-            <br/>
+            <br />
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_start.html b/proposals/templates/proposals/proposal_start.html
index 332b7f4dd..3661002e5 100644
--- a/proposals/templates/proposals/proposal_start.html
+++ b/proposals/templates/proposals/proposal_start.html
@@ -11,74 +11,72 @@
     <div class="uu-inner-container">
         <div class="col-12">
             <h2>{% trans "Een nieuwe aanvraag aanmelden" %}</h2>
-
-                <ul>
-                <li>{% trans "Check voor het indienen:" %}
+            <ul>
+                <li>
+                    {% trans "Check voor het indienen:" %}
                     <ul>
+                        <li>
+                            {% blocktrans trimmed %}
+                                De
+                                <a href="https://fetc-gw.wp.hum.uu.nl/" target="_blank">UU-webpagina van de FETC-GW</a> voor nieuws en de agenda.
+                            {% endblocktrans %}
+                        </li>
+                        <li>
+                            {% blocktrans trimmed %}
+                                Het reglement van de
+                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-algemene-kamer/">Algemene Kamer (AK)</a>
+                                of dat van de
+                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/">Linguïstiek Kamer (LK)</a>.
+                            {% endblocktrans %}
+                        </li>
+                    </ul>
                     <li>
                         {% blocktrans trimmed %}
-                            De
-                            <a href="https://fetc-gw.wp.hum.uu.nl/" target="_blank">
-                            UU-webpagina van de FETC-GW</a> voor nieuws en de agenda.
+                            Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw">voorbeelddocumenten</a> voor de <em>informed consent</em>.
                         {% endblocktrans %}
                     </li>
-                    <li>
+                    <p>
                         {% blocktrans trimmed %}
-                            Het reglement van de
-                            <a href="https://fetc-gw.wp.hum.uu.nl/reglement-algemene-kamer/">Algemene Kamer (AK)</a>
-                            of dat van de
-                            <a href="https://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/">Linguïstiek Kamer (LK)</a>.
+                            Studenten moeten hun begeleider vragen om deze formulieren; dezelfde voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a href="https://fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/">deze pagina</a>.
                         {% endblocktrans %}
-                    </li>
-                    </ul>
-                <li>
-                {% blocktrans trimmed %}
-                    Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw">voorbeelddocumenten</a> voor de <em>informed consent</em>.
-                {% endblocktrans %}
-                </li>
-                <p>
-                {% blocktrans trimmed %}
-                Studenten moeten hun begeleider vragen om deze formulieren; dezelfde voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a href="https://fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/">deze pagina</a>.
-                {% endblocktrans %}
-                </p>
+                    </p>
                 </li>
-                </ul>
+            </ul>
             <p>
-                {% blocktrans %}
+                {% blocktrans trimmed %}
                     Een voorstel is opgebouwd uit (van groot naar klein) (i) trajecten, (ii) sessies, (iii) taken.
                 {% endblocktrans %}
             </p>
             <ul>
-            <p>
-                <li><strong>{% trans "Traject" %}</strong>:
+                <li>
+                    <strong>{% trans "Traject" %}</strong>:
                     {% blocktrans trimmed %}
-                    Als je met verschillende deelnemersgroepen werkt die een verschillend onderzoekstraject doorlopen waarvoor verschillende informed consent documenten nodig zijn.{% endblocktrans %}
-                    <p>{% blocktrans trimmed %}
-                        <u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een controlegroep en een experimentele groep die verschillende taken krijgen.
+                        Als je met verschillende deelnemersgroepen werkt die een verschillend onderzoekstraject doorlopen waarvoor verschillende informed consent documenten nodig zijn.
+                    {% endblocktrans %}
+                    <p>
+                        {% blocktrans trimmed %}
+                            <u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een controlegroep en een experimentele groep die verschillende taken krijgen.
                         {% endblocktrans %}
-                </p>
-            </p>
-            <p>
-            <li><strong>{% trans "Sessie" %}</strong>:
-                {% blocktrans trimmed %}
-                    Alle taken/onderdelen die iemand op één dag uitvoert.
-                {% endblocktrans %}
-            </li>
-            </p>
-            <p>
-            <li><strong>{% trans "Taak" %}</strong>:
-                {% blocktrans trimmed %}
-                    Een taak of onderdeel van je onderzoek.
-                <p>
-                    <u>Bijvoorbeeld</u>: het invullen van een vragenlijst, een interview, of een taaltest.
-                </p>
-                {% endblocktrans %}
-            </li>
-            </p>
+                    </p>
+                </li>
+                <li>
+                    <strong>{% trans "Sessie" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Alle taken/onderdelen die iemand op één dag uitvoert.
+                    {% endblocktrans %}
+                </li>
+                <li>
+                    <strong>{% trans "Taak" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Een taak of onderdeel van je onderzoek.
+                        <p>
+                            <u>Bijvoorbeeld</u>: het invullen van een vragenlijst, een interview, of een taaltest.
+                        </p>
+                    {% endblocktrans %}
+                </li>
             </ul>
-            <a class="button button-colored float-right mb-4" href="{% url 'proposals:create' %}">
-                {% trans "Volgende stap >>" %}
-            </a>
+            <a class="button button-colored float-right mb-4"
+               href="{% url 'proposals:create' %}">{% trans "Volgende stap >>" %}</a>
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_start_practice.html b/proposals/templates/proposals/proposal_start_practice.html
index 091b688c0..a1ccefd10 100644
--- a/proposals/templates/proposals/proposal_start_practice.html
+++ b/proposals/templates/proposals/proposal_start_practice.html
@@ -10,79 +10,79 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Een nieuwe aanvraag aanmelden (oefenportaal)" %}
-            </h2>
-
-                <ul>
-                <li>{% trans "Check voor het indienen:" %}
+            <h2>{% trans "Een nieuwe aanvraag aanmelden (oefenportaal)" %}</h2>
+            <ul>
+                <li>
+                    {% trans "Check voor het indienen:" %}
                     <ul>
+                        <li>
+                            {% blocktrans trimmed %}
+                                De
+                                <a href="https://fetc-gw.wp.hum.uu.nl/" target="_blank">UU-webpagina van de FETC-GW</a> voor nieuws en de agenda.
+                            {% endblocktrans %}
+                        </li>
+                        <li>
+                            {% blocktrans trimmed %}
+                                Het reglement van de
+                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-algemene-kamer/">Algemene Kamer (AK)</a>
+                                of dat van de
+                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/">Linguïstiek Kamer (LK)</a>.
+                            {% endblocktrans %}
+                        </li>
+                    </ul>
                     <li>
                         {% blocktrans trimmed %}
-                            De
-                            <a href="https://fetc-gw.wp.hum.uu.nl/" target="_blank">
-                            UU-webpagina van de FETC-GW</a> voor nieuws en de agenda.
+                            Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw">voorbeelddocumenten</a> voor de <em>informed consent</em>.
                         {% endblocktrans %}
                     </li>
-                    <li>
+                    <p>
                         {% blocktrans trimmed %}
-                            Het reglement van de
-                            <a href="https://fetc-gw.wp.hum.uu.nl/reglement-algemene-kamer/">Algemene Kamer (AK)</a>
-                            of dat van de
-                            <a href="https://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/">Linguïstiek Kamer (LK)</a>.
+                            Studenten moeten hun begeleider vragen om deze formulieren; dezelfde voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a href="https://fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/">deze pagina</a>.
                         {% endblocktrans %}
-                    </li>
-                    </ul>
-                <li>
-                {% blocktrans trimmed %}
-                    Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw">voorbeelddocumenten</a> voor de <em>informed consent</em>.
-                {% endblocktrans %}
+                    </p>
                 </li>
-                <p>
-                {% blocktrans trimmed %}
-                Studenten moeten hun begeleider vragen om deze formulieren; dezelfde voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a href="https://fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/">deze pagina</a>.
-                {% endblocktrans %}
-                </p>
-                </li>
-                </ul>
+            </ul>
             <p>
-                {% blocktrans %}
+                {% blocktrans trimmed %}
                     Een voorstel is opgebouwd uit (van groot naar klein) (i) trajecten, (ii) sessies, (iii) taken.
                 {% endblocktrans %}
             </p>
             <ul>
-            <p>
-            <li><strong>{% trans "Traject" %}</strong>:
-                {% blocktrans trimmed %}
-                    Als je met verschillende deelnemersgroepen werkt die een verschillend onderzoekstraject doorlopen waarvoor verschillende informed consent documenten nodig zijn.{% endblocktrans %}
-                <p>{% blocktrans trimmed %}
-                    <u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een controlegroep en een experimentele groep die verschillende taken krijgen.
+                <li>
+                    <strong>{% trans "Traject" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Als je met verschillende deelnemersgroepen werkt die een verschillend onderzoekstraject doorlopen waarvoor verschillende informed consent documenten nodig zijn.
                     {% endblocktrans %}
-            </p>
-            <p>
-            <li><strong>{% trans "Sessie" %}</strong>:
-                {% blocktrans trimmed %}
-                    Alle taken/onderdelen die iemand op één dag uitvoert.
-                {% endblocktrans %}
-            </li>
-            </p>
-            <p>
-            <li><strong>{% trans "Taak" %}</strong>:
-                {% blocktrans trimmed %}
-                    Een taak of onderdeel van je onderzoek.
-                <p>
-                    <u>Bijvoorbeeld</u>: het invullen van een vragenlijst, een interview, of een taaltest.
-                </p>
-                {% endblocktrans %}
-            </li>
-            </p>
+                    <p>
+                        {% blocktrans trimmed %}
+                            <u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een controlegroep en een experimentele groep die verschillende taken krijgen.
+                        {% endblocktrans %}
+                    </p>
+                </li>
+                <li>
+                    <strong>{% trans "Sessie" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Alle taken/onderdelen die iemand op één dag uitvoert.
+                    {% endblocktrans %}
+                </li>
+                <li>
+                    <strong>{% trans "Taak" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Een taak of onderdeel van je onderzoek.
+                        <p>
+                            <u>Bijvoorbeeld</u>: het invullen van een vragenlijst, een interview, of een taaltest.
+                        </p>
+                    {% endblocktrans %}
+                </li>
             </ul>
             <p>{% trans "Houd er rekening mee dat een oefenaanvraag niet ingediend kan worden." %}</p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% include "base/form_buttons.html" %}
             </form>
         </div>
     </div>
-
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_start_pre_approved.html b/proposals/templates/proposals/proposal_start_pre_approved.html
index f9b8c79cf..4417f9b9c 100644
--- a/proposals/templates/proposals/proposal_start_pre_approved.html
+++ b/proposals/templates/proposals/proposal_start_pre_approved.html
@@ -3,28 +3,23 @@
 {% load static %}
 {% load i18n %}
 
-
-
 {% block header_title %}
     {% trans "Een nieuwe aanvraag aanmelden (die al goedgekeurd is door een andere ethische toetsingscomissie)" %} - {{ block.super }}
 {% endblock %}
 
 {% block content %}
-
     {% trans "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/" as reg_url %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Een nieuwe aanvraag aanmelden (die al goedgekeurd is door een andere ethische toetsingscomissie)" %}
-            </h2>
+            <h2>{% trans "Een nieuwe aanvraag aanmelden (die al goedgekeurd is door een andere ethische toetsingscomissie)" %}</h2>
             <p>
-              {% blocktrans trimmed %}
-              Je wilt een nieuwe aanvraag ter toetsing bij de FETC-GW aanmelden, die al getoetst is
-              door een andere ethische (toetsings) commissie.
-              Het is daarvoor <em>noodzakelijk</em> dat je goed bekend bent met het <a href="{{reg_url}}" target="_blank">FETC-GW
-                reglement</a>. 
-                Je kan jezelf en de commissieleden veel tijd besparen door je eerst
-                goed te informeren.
+                {% blocktrans trimmed %}
+                    Je wilt een nieuwe aanvraag ter toetsing bij de FETC-GW aanmelden, die al getoetst is
+                    door een andere ethische (toetsings) commissie.
+                    Het is daarvoor <em>noodzakelijk</em> dat je goed bekend bent met het <a href="{{ reg_url }}" target="_blank">FETC-GW
+                    reglement</a>.
+                    Je kan jezelf en de commissieleden veel tijd besparen door je eerst
+                    goed te informeren.
                 {% endblocktrans %}
             </p>
             <p>
@@ -32,15 +27,14 @@ <h2>
                     Gebruik bij het invullen s.v.p. geen afkortingen waar de FETC-GW wellicht
                     niet mee bekend is.
                     Raadpleeg bij vragen eerst het
-                    <a href="{{reg_url}}">reglement</a>
+                    <a href="{{ reg_url }}">reglement</a>
                     en neem eventueel daarna contact op met de secretaris
                     ({{ secretary_name }},
                     <a href="mailto:fetc-gw@uu.nl">fetc-gw@uu.nl</a>).
                 {% endblocktrans %}
             </p>
-            <a class="button button-colored float-right mb-3" href="{% url 'proposals:create_pre_approved' %}">
-                {% trans "Volgende stap >>" %}
-            </a>
+            <a class="button button-colored float-right mb-3"
+               href="{% url 'proposals:create_pre_approved' %}">{% trans "Volgende stap >>" %}</a>
         </div>
     </div>
 {% endblock %}
diff --git a/proposals/templates/proposals/proposal_start_pre_assessment.html b/proposals/templates/proposals/proposal_start_pre_assessment.html
index ee85f6885..a0e29d324 100644
--- a/proposals/templates/proposals/proposal_start_pre_assessment.html
+++ b/proposals/templates/proposals/proposal_start_pre_assessment.html
@@ -11,25 +11,36 @@
     <div class="uu-inner-container">
         <div class="col-12">
             <h2>{% trans "Nieuwe FETC-aanvraag voor (al dan niet goedgekeurde) subsidieaanvragen" %}</h2>
-
             <p>
-
-
                 <ul>
-                    <li>{% blocktrans trimmed %}Soms is bij het indienen van een aanvraag bij een subsidieverstrekker een ethische verklaring nodig.{% endblocktrans %}</li>
-                    <li>{% blocktrans trimmed %}Goedgekeurde NWO-aanvragen hebben ook een ethische verklaring nodig alvorens een startdatum vastgesteld kan worden.{% endblocktrans %}</li>
-                    </ul>
-
-                    <p>{% blocktrans trimmed %}In deze gevallen kunnen onderzoekers de FETC-GW verzoeken om de onderzoeksaanvraag te laten toetsen. Dit kan via deze route van de portal{% endblocktrans %}.</p>
-
-                    <p>{% blocktrans trimmed %}NB: De toetsing kan alleen op hoofdlijnen plaatsvinden en vervangt NIET de reguliere ethische toetsing van een onderzoek; elke mensgebonden studie die in het kader van de onderzoeksaanvraag zal worden uitgevoerd dient vóóraf goedgekeurd te zijn door de FETC-GW.{% endblocktrans %}
-            </p>
-
-            <p><img src="{% static 'proposals/images/fetc-flowchart-pre-2.png' %}" style="width: 100%;"></p>
-
-            <a class="button button-colored float-right mb-3" href="{% url 'proposals:create_pre' %}">
-                {% trans "Volgende stap >>" %}
-            </a>
+                    <li>
+                        {% blocktrans trimmed %}
+                            Soms is bij het indienen van een aanvraag bij een subsidieverstrekker een ethische verklaring nodig.
+                        {% endblocktrans %}
+                    </li>
+                    <li>
+                        {% blocktrans trimmed %}
+                            Goedgekeurde NWO-aanvragen hebben ook een ethische verklaring nodig alvorens een startdatum vastgesteld kan worden.
+                        {% endblocktrans %}
+                    </li>
+                </ul>
+                <p>
+                    {% blocktrans trimmed %}
+                        In deze gevallen kunnen onderzoekers de FETC-GW verzoeken om de onderzoeksaanvraag te laten toetsen. Dit kan via deze route van de portal
+                    {% endblocktrans %}
+                    .
+                </p>
+                <p>
+                    {% blocktrans trimmed %}
+                        NB: De toetsing kan alleen op hoofdlijnen plaatsvinden en vervangt NIET de reguliere ethische toetsing van een onderzoek; elke mensgebonden studie die in het kader van de onderzoeksaanvraag zal worden uitgevoerd dient vóóraf goedgekeurd te zijn door de FETC-GW.
+                    {% endblocktrans %}
+                </p>
+                <p>
+                    <img src="{% static 'proposals/images/fetc-flowchart-pre-2.png' %}"
+                         style="width: 100%">
+                </p>
+                <a class="button button-colored float-right mb-3"
+                   href="{% url 'proposals:create_pre' %}">{% trans "Volgende stap >>" %}</a>
+            </div>
         </div>
-    </div>
-{% endblock %}
+    {% endblock %}
diff --git a/proposals/templates/proposals/proposal_submit.html b/proposals/templates/proposals/proposal_submit.html
index d88a42209..ba041907c 100644
--- a/proposals/templates/proposals/proposal_submit.html
+++ b/proposals/templates/proposals/proposal_submit.html
@@ -15,8 +15,10 @@
 {% endblock %}
 
 {% block html_head %}
-<script type="text/javascript" charset="utf8" src="{% static 'proposals/js/word_counter.js' %}"></script>
-<script>
+    <script type="text/javascript"
+            charset="utf8"
+            src="{% static 'proposals/js/word_counter.js' %}"></script>
+    <script>
     $(function () {
         depends_on_value('embargo', 'True', 'embargo_end_date');
 
@@ -33,7 +35,7 @@
         let translated_string = " {% trans 'Aantal woorden:' %} "
         wordCounter("comments", translated_string)
     });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -53,27 +55,25 @@ <h2>
             </h2>
             <p>
                 {% if proposal.is_pre_assessment %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Je aanvraag voor voortoetsing is compleet.
                     {% endblocktrans %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Als je er zeker van bent dat je aanvraag op adequate wijze is gespecifieerd kan je de aanmelding
                         nu ter beoordeling naar de FETC-GW versturen.
                     {% endblocktrans %}
-
                 {% elif proposal.relation.needs_supervisor %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Je concept-aanmelding is compleet.
                     {% endblocktrans %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Je kan nu je concept-aanmelding ter beoordeling naar je supervisor versturen.
                     {% endblocktrans %}
-
                 {% else %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Je aanmelding is compleet.
                     {% endblocktrans %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Als je er zeker van bent dat je aanvraag op adequate wijze is gespecifieerd kan je de aanmelding
                         nu ter beoordeling naar de FETC-GW versturen.
                     {% endblocktrans %}
@@ -92,8 +92,7 @@ <h2>
                     de concept-aanvraag wordt dan bewaard voor eventuele latere wijziging en indiening.
                 {% endblocktrans %}
             </p>
-
-            {% if not proposal.is_pre_assessment  %}
+            {% if not proposal.is_pre_assessment %}
                 {% for study in proposal.study_set.all %}
                     {% if study.has_missing_forms %}
                         <div class="warning">
@@ -119,54 +118,50 @@ <h2>
                     {% endif %}
                 {% endfor %}
             {% endif %}
-
             <form action="" method="post" enctype="multipart/form-data">
-
-            {% if troublesome_pages %}
-            <div class="warning">
-	      <h5>
-                    {% blocktrans trimmed %}
-                        Er zijn nog errors gevonden op de volgende pagina's:
-                    {% endblocktrans %}
-		    </h5>
-                    <ul>
-                        {% for error_page in troublesome_pages %}
-                            <li>
-                                <a href="{{ error_page.url }}">
-                                    {{ error_page.page_name }}
-                                </a>
-                            </li>
-                        {% endfor %}
-                    </ul>
-                    {% blocktrans trimmed %}
-                        Dit komt waarschijnlijk doordat je nog niet alle verplichte velden heeft ingevuld. Je kan je
-                        aanmelding pas versturen wanneer deze fouten gecorrigeerd zijn.
-                    {% endblocktrans %}
-                </div>
-		{% endif %}
-		{% if start_date_warning %}
-		<div class="warning">
-		  <h5>{% trans "Controleer uw beoogde startdatum" %}</h5>
-		  <p>
-		    {% blocktrans trimmed %}
-		    Omdat de beoogde startdatum binnen twee weken van vandaag ligt, kan de FETC helaas geen officiële goedkeuring meer geven voor deze aanvraag. Controleer daarom bij een revisie altijd of de beoogde startdatum nog klopt.
-		    {% endblocktrans %}
-		    {% url "proposals:update" proposal.pk as first_page_url %}
-		    {% blocktrans trimmed %}
-		    De beoogde startdatum vindt u op
-		    <a href="{{first_page_url}}">deze pagina</a>.
-		    {% endblocktrans %}
-		  </p>
-		</div>		
-		{% endif %}
-
-
-		{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+                {% if troublesome_pages %}
+                    <div class="warning">
+                        <h5>
+                            {% blocktrans trimmed %}
+                                Er zijn nog errors gevonden op de volgende pagina's:
+                            {% endblocktrans %}
+                        </h5>
+                        <ul>
+                            {% for error_page in troublesome_pages %}
+                                <li>
+                                    <a href="{{ error_page.url }}">{{ error_page.page_name }}</a>
+                                </li>
+                            {% endfor %}
+                        </ul>
+                        {% blocktrans trimmed %}
+                            Dit komt waarschijnlijk doordat je nog niet alle verplichte velden heeft ingevuld. Je kan je
+                            aanmelding pas versturen wanneer deze fouten gecorrigeerd zijn.
+                        {% endblocktrans %}
+                    </div>
+                {% endif %}
+                {% if start_date_warning %}
+                    <div class="warning">
+                        <h5>{% trans "Controleer uw beoogde startdatum" %}</h5>
+                        <p>
+                            {% blocktrans trimmed %}
+                                Omdat de beoogde startdatum binnen twee weken van vandaag ligt, kan de FETC helaas geen officiële goedkeuring meer geven voor deze aanvraag. Controleer daarom bij een revisie altijd of de beoogde startdatum nog klopt.
+                            {% endblocktrans %}
+                            {% url "proposals:update" proposal.pk as first_page_url %}
+                            {% blocktrans trimmed %}
+                                De beoogde startdatum vindt u op
+                                <a href="{{ first_page_url }}">deze pagina</a>.
+                            {% endblocktrans %}
+                        </p>
+                    </div>
+                {% endif %}
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% if is_practice %}
-                <div class="info">
-                    {% trans "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling door de FETC-GW worden ingediend." %}
-                </div>
+                    <div class="info">
+                        {% trans "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling door de FETC-GW worden ingediend." %}
+                    </div>
                 {% endif %}
                 {% if troublesome_pages or is_practice %}
                     {% include "base/form_buttons.html" with no_forward=1 %}
diff --git a/proposals/templates/proposals/proposal_submitted.html b/proposals/templates/proposals/proposal_submitted.html
index 7c3a14678..32df1340b 100644
--- a/proposals/templates/proposals/proposal_submitted.html
+++ b/proposals/templates/proposals/proposal_submitted.html
@@ -35,7 +35,6 @@ <h2>
                     {% trans "Je aanmelding is verstuurd." %}
                 {% endif %}
                 {% trans "Je ontvangt een e-mail ter bevestiging." %}
-
                 {% url 'proposals:my_submitted' as submitted_url %}
                 {% blocktrans trimmed %}
                     Klik <a href="{{ submitted_url }}">hier</a> om je ingediende aanvragen in te zien.
diff --git a/proposals/templates/proposals/proposal_update_attachments.html b/proposals/templates/proposals/proposal_update_attachments.html
index 941594ebb..b59faee2d 100644
--- a/proposals/templates/proposals/proposal_update_attachments.html
+++ b/proposals/templates/proposals/proposal_update_attachments.html
@@ -10,21 +10,25 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Formulieren aanpassen" %}
-            </h2>
+            <h2>{% trans "Formulieren aanpassen" %}</h2>
             <p>
                 {% blocktrans trimmed with title=proposal.title ref_number=proposal.reference_number %}
-                Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag {{ title }}
-                (referentienummer <em>{{ ref_number }}</em>).
+                    Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag {{ title }}
+                    (referentienummer <em>{{ ref_number }}</em>).
                 {% endblocktrans %}
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <input type="hidden" name="next" value="{{ request.META.HTTP_REFERER }}">
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Formulieren aanpassen' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'Formulieren aanpassen' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/proposals/templates/proposals/proposal_update_date_start.html b/proposals/templates/proposals/proposal_update_date_start.html
index 389eceac6..143512cf0 100644
--- a/proposals/templates/proposals/proposal_update_date_start.html
+++ b/proposals/templates/proposals/proposal_update_date_start.html
@@ -10,24 +10,28 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Startdatum aanpassen" %}
-            </h2>
+            <h2>{% trans "Startdatum aanpassen" %}</h2>
             <p>
                 {% blocktrans trimmed with title=proposal.title ref_number=proposal.reference_number %}
-                Op deze pagina kan de startdatum worden aangepast van de aanvraag {{ title }}
-                (referentienummer <em>{{ ref_number }}</em>). <b>Let op!</b> Als de review al is afgerond,
-                wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht je de PDF 
-                opnieuw willen genereren, neem hierover dan contact op met 
+                    Op deze pagina kan de startdatum worden aangepast van de aanvraag {{ title }}
+                    (referentienummer <em>{{ ref_number }}</em>). <b>Let op!</b> Als de review al is afgerond,
+                    wordt de nieuwe startdatum niet automatisch weergegeven in de PDF. Mocht je de PDF
+                    opnieuw willen genereren, neem hierover dan contact op met
                 {% endblocktrans %}
                 <a href="mailto:portalsupport.gw@uu.nl">portalsupport.gw@uu.nl</a>.
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <input type="hidden" name="next" value="{{ request.META.HTTP_REFERER }}">
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Startdatum aanpassen' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'Startdatum aanpassen' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/proposals/templates/proposals/study_consent.html b/proposals/templates/proposals/study_consent.html
index b716a5f2f..7c8a54329 100644
--- a/proposals/templates/proposals/study_consent.html
+++ b/proposals/templates/proposals/study_consent.html
@@ -5,11 +5,11 @@
 {% load uil_filters %}
 
 {% block header_title %}
-  {% trans "Informed consent formulieren" %} - {{ block.super }}
+    {% trans "Informed consent formulieren" %} - {{ block.super }}
 {% endblock %}
 
 {% block html_head %}
-  <script>
+    <script>
     // This function hides school-related extra forms
     function hide_school_forms(prefix) {
       $("#id_" + prefix + "-director_consent_information").parents("tr").hide();
@@ -60,95 +60,96 @@
     // Show the first add link
     $("a.new").first().show();
     });
-  </script>
+    </script>
 {% endblock %}
 
 {% block content %}
-  <div class="uu-inner-container">
-    <div class="col-12">
-      {% with nav_items=proposal.available_urls active=4 %}
-        {% include 'base/navigation.html' %}
-      {% endwith %}
-
-      <h2>
-        {% trans "Informed consent formulieren uploaden" %}
-      </h2>
-      <p>
-        {% blocktrans trimmed %}
-          Hier kan je de Informed consent formulieren uploaden voor de opgegeven traject(en). Optioneel kan je indien nodig maximaal 10
-          paar extra formulieren uploaden. <br/> Klik hiervoor op 'Voeg extra formulieren' onderaan de pagina. Deze velden
-          kan je weer weg halen door alle formulieren te wissen.
-        {% endblocktrans %}
-      </p>
-
-      <p>
-        {% blocktrans trimmed %}
-          Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw" target="blank">voorbeelddocumenten</a> voor de <em>informed consent</em>. </li>
-        {% endblocktrans %}
-
-        {% blocktrans trimmed %}
-          Studenten moeten hun begeleider vragen om deze formulieren; dezelfde voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a href="https://fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/">deze pagina</a>.
-        {% endblocktrans %}
-      </p>
-
-      <p>
-        {% blocktrans trimmed %}
-          Let op dat je documenten geen redactionele fouten en/of taalfouten bevatten: een aanvraag kan hierom direct voor revisie worden teruggestuurd.
-        {% endblocktrans %}
-	{% blocktrans trimmed %}
-          Bij ontvangst worden alle bestandsnamen gewijzigd, zet hier dus geen belangrijke informatie in.
-        {% endblocktrans %}
-      </p>
-      {% if external_permission %}
-        <div class="info">
-          <p>{% blocktrans trimmed %}
-            Omdat er in één of meer trajecten onderzoek wordt uitgevoerd op een externe locatie waar toestemming voor vereist is, vragen we daar om een tweede set Informed Consent formulieren voor het management van de instelling. Dat is bijvoorbeeld de schoolleiding of het departementshoofd van een zorginstelling. Voeg waar nodig ook een informatiebrief voor de ouders/verzorgers toe.
-          {% endblocktrans %}</p>
-        </div>
-      {% endif %}
-      <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-        {{ formset.management_form }}
-
-        {# Reset the counter, as we're looping again #}
-        {% counter extra_form_counter create 1 %}
-        {% for form in formset %}
-
-          {% if form.instance.study %}
-            {# If it's connected to a study, use the study title and a simple div #}
-            <div>
-              {% with study=form.instance.study %}
-                {% include 'studies/study_title.html' %}
-              {% endwith %}
-          {% else %}
-              {# If not, we have to do some fancy stuff for the extra forms #}
-              {% if form.instance.informed_consent or form.instance.briefing or form.instance.parents_information or form.instance.director_consent_information or form.instance.director_consent_declaration %}
-                {# We can't check this in Python, so we determine here if the object is empty or used  #}
-                {% set used = 1 %}
-              {% else %}
-                {% set used = 0 %}
-                {# We only add the add link if the form is empty, as this simplifies the JS #}
-                <div style="float:right;">
-                  <a href="#" id="new-{% counter extra_form_counter value %}" class="new" data-n="{% counter extra_form_counter value %}" style="display: none">
-                    <img src="{% static 'proposals/images/add.png' %}" /> {% trans 'Voeg extra formulieren toe' %}
-                  </a>
-                </div>
-              {% endif %}
-
-              <div id="extra-{% counter extra_form_counter value %}" data-used="{{ used }}">
-                <h3>{% trans 'Extra formulieren' %} {% counter extra_form_counter value %}</h3>
-                {% counter extra_form_counter increment 1 %}
-
-          {% endif %}
-
-          <table>
-            {{ form.as_table }}
-          </table>
-              </div>
-        {% endfor %}
-        <br/>
-        {% include "base/form_buttons.html" %}
-      </form>
+    <div class="uu-inner-container">
+        <div class="col-12">
+            {% with nav_items=proposal.available_urls active=4 %}
+                {% include 'base/navigation.html' %}
+            {% endwith %}
+            <h2>{% trans "Informed consent formulieren uploaden" %}</h2>
+            <p>
+                {% blocktrans trimmed %}
+                    Hier kan je de Informed consent formulieren uploaden voor de opgegeven traject(en). Optioneel kan je indien nodig maximaal 10
+                    paar extra formulieren uploaden.
+                    <br />
+                    Klik hiervoor op 'Voeg extra formulieren' onderaan de pagina. Deze velden
+                    kan je weer weg halen door alle formulieren te wissen.
+                {% endblocktrans %}
+            </p>
+            <p>
+                {% blocktrans trimmed %}
+                    Gebruik de juiste (meest recente) <a href="https://intranet.uu.nl/documenten-ethische-toetsingscommissie-gw"
+    target="blank">voorbeelddocumenten</a> voor de <em>informed consent</em>.
+                </li>
+            {% endblocktrans %}
+            {% blocktrans trimmed %}
+                Studenten moeten hun begeleider vragen om deze formulieren; dezelfde voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a href="https://fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/">deze pagina</a>.
+            {% endblocktrans %}
+        </p>
+        <p>
+            {% blocktrans trimmed %}
+                Let op dat je documenten geen redactionele fouten en/of taalfouten bevatten: een aanvraag kan hierom direct voor revisie worden teruggestuurd.
+            {% endblocktrans %}
+            {% blocktrans trimmed %}
+                Bij ontvangst worden alle bestandsnamen gewijzigd, zet hier dus geen belangrijke informatie in.
+            {% endblocktrans %}
+        </p>
+        {% if external_permission %}
+            <div class="info">
+                <p>
+                    {% blocktrans trimmed %}
+                        Omdat er in één of meer trajecten onderzoek wordt uitgevoerd op een externe locatie waar toestemming voor vereist is, vragen we daar om een tweede set Informed Consent formulieren voor het management van de instelling. Dat is bijvoorbeeld de schoolleiding of het departementshoofd van een zorginstelling. Voeg waar nodig ook een informatiebrief voor de ouders/verzorgers toe.
+                    {% endblocktrans %}
+                </p>
             </div>
+        {% endif %}
+        <form action="" method="post" enctype="multipart/form-data">
+            {% csrf_token %}
+            {{ formset.management_form }}
+            {# Reset the counter, as we're looping again #}
+            {% counter extra_form_counter create 1 %}
+            {% for form in formset %}
+                {% if form.instance.study %}
+                    {# If it's connected to a study, use the study title and a simple div #}
+                    <div>
+                        {% with study=form.instance.study %}
+                            {% include 'studies/study_title.html' %}
+                        {% endwith %}
+                    {% else %}
+                        {# If not, we have to do some fancy stuff for the extra forms #}
+                        {% if form.instance.informed_consent or form.instance.briefing or form.instance.parents_information or form.instance.director_consent_information or form.instance.director_consent_declaration %}
+                            {# We can't check this in Python, so we determine here if the object is empty or used  #}
+                            {% set used = 1 %}
+                        {% else %}
+                            {% set used = 0 %}
+                            {# We only add the add link if the form is empty, as this simplifies the JS #}
+                            <div style="float:right;">
+                                <a href="#"
+                                   id="new-{% counter extra_form_counter value %}"
+                                   class="new"
+                                   data-n="{% counter extra_form_counter value %}"
+                                   style="display: none">
+                                    <img src="{% static 'proposals/images/add.png' %}" />
+                                    {% trans 'Voeg extra formulieren toe' %}
+                                </a>
+                            </div>
+                        {% endif %}
+                        <div id="extra-{% counter extra_form_counter value %}"
+                             data-used="{{ used }}">
+                            <h3>{% trans 'Extra formulieren' %} {% counter extra_form_counter value %}</h3>
+                            {% counter extra_form_counter increment 1 %}
+                        {% endif %}
+                        <table>
+                            {{ form.as_table }}
+                        </table>
+                    </div>
+                {% endfor %}
+                <br />
+                {% include "base/form_buttons.html" %}
+            </form>
+        </div>
     </div>
-
 {% endblock %}
diff --git a/proposals/templates/proposals/study_start.html b/proposals/templates/proposals/study_start.html
index 66e5f1e0e..eebce8d03 100644
--- a/proposals/templates/proposals/study_start.html
+++ b/proposals/templates/proposals/study_start.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block html_head %}
-<script>
+    <script>
 $(function() {
     add_title('study_name_1', "{% trans 'Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters.' %}");
 
@@ -49,7 +49,7 @@
     });
     $('input[name=studies_number]').change();
 });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -60,42 +60,42 @@
             {% with nav_items=proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Eén of meerdere trajecten?" %}
-            </h2>
+            <h2>{% trans "Eén of meerdere trajecten?" %}</h2>
             <p>
-                {% blocktrans %}
+                {% blocktrans trimmed %}
                     Een voorstel is opgebouwd uit (van groot naar klein) (i) trajecten, (ii) sessies, (iii) taken.
                 {% endblocktrans %}
             </p>
             <ul>
-            <p>
-                <li><strong>{% trans "Traject" %}</strong>:
+                <li>
+                    <strong>{% trans "Traject" %}</strong>:
                     {% blocktrans trimmed %}
-                    Als je met verschillende deelnemersgroepen werkt die een verschillend onderzoekstraject doorlopen waarvoor verschillende informed consent documenten nodig zijn.{% endblocktrans %}
-                    <p>{% blocktrans trimmed %}
-                        <u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een controlegroep en een experimentele groep die verschillende taken krijgen.
+                        Als je met verschillende deelnemersgroepen werkt die een verschillend onderzoekstraject doorlopen waarvoor verschillende informed consent documenten nodig zijn.
+                    {% endblocktrans %}
+                    <p>
+                        {% blocktrans trimmed %}
+                            <u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een controlegroep en een experimentele groep die verschillende taken krijgen.
                         {% endblocktrans %}
-            </p>
-            <p>
-            <li><strong>{% trans "Sessie" %}</strong>:
-                {% blocktrans trimmed %}
-                    Alle taken/onderdelen die iemand op één dag uitvoert.
-                {% endblocktrans %}
-            </li>
-            </p>
-            <p>
-            <li><strong>{% trans "Taak" %}</strong>:
-                {% blocktrans trimmed %}
-                    Een taak of onderdeel van je onderzoek.
-                <p>
-                    <u>Bijvoorbeeld</u>: het invullen van een vragenlijst, een interview, of een taaltest.
-                </p>
-                {% endblocktrans %}
-            </li>
-            </p>
+                    </p>
+                </li>
+                <li>
+                    <strong>{% trans "Sessie" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Alle taken/onderdelen die iemand op één dag uitvoert.
+                    {% endblocktrans %}
+                </li>
+                <li>
+                    <strong>{% trans "Taak" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Een taak of onderdeel van je onderzoek.
+                        <p>
+                            <u>Bijvoorbeeld</u>: het invullen van een vragenlijst, een interview, of een taaltest.
+                        </p>
+                    {% endblocktrans %}
+                </li>
             </ul>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
                 <table>
                     {{ form.as_table }}
                 </table>
diff --git a/proposals/templates/proposals/table_with_header.html b/proposals/templates/proposals/table_with_header.html
index b3d9a37fc..eb21d24f6 100644
--- a/proposals/templates/proposals/table_with_header.html
+++ b/proposals/templates/proposals/table_with_header.html
@@ -1,16 +1,14 @@
 {% load i18n %}
 
 {% if page_break %}
-  <h2 style="page-break-before: always"> {% trans section_title %} </h2>
+    <h2 style="page-break-before: always">{% trans section_title %}</h2>
 {% elif section_title %}
-  <h2> {% trans section_title %} </h2>
-{% endif %}
-{% if sub_title %}
-  <h3> {{ sub_title }} </h3>
+    <h2>{% trans section_title %}</h2>
 {% endif %}
+{% if sub_title %}<h3>{{ sub_title }}</h3>{% endif %}
 <div class="table">
-{% for row in rows %}
-  <div class="question">{{ row.verbose_name }}</div>
-  <div class="answer">{{ row.value }}</div>
-{% endfor %}
-</div>
\ No newline at end of file
+    {% for row in rows %}
+        <div class="question">{{ row.verbose_name }}</div>
+        <div class="answer">{{ row.value }}</div>
+    {% endfor %}
+</div>
diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html
index 611565505..a035042c8 100644
--- a/proposals/templates/proposals/table_with_header_diff.html
+++ b/proposals/templates/proposals/table_with_header_diff.html
@@ -2,50 +2,47 @@
 {% load i18n %}
 
 {% if section_title %}
-    <h2 class="mt-5 mb-1"> {% trans section_title %} </h2>
-{% endif %}
-{% if sub_title %}
-    <h3 class='mt-3'> {{ sub_title }} </h3>
+    <h2 class="mt-5 mb-1">{% trans section_title %}</h2>
 {% endif %}
+{% if sub_title %}<h3 class='mt-3'>{{ sub_title }}</h3>{% endif %}
 <table class="proposals-diff ">
     <tr>
         <th class="proposals-diff-question"></th>
         <th class="proposals-diff-answer">{% trans "Originele aanvraag" %}</th>
         <th class="proposals-diff-answer">{% trans "Revisie/amendement" %}</th>
     </tr>
-{% if warning %}
-    {% for row in rows|slice:":1"%}
-    <tr class="diff-ignore">
-        <th>{{ row.verbose_name }}</th>
-        {# If the first object is missing, place a warning on the first TD #}
-        {% if missing_object == 'old' %}
-            <td rowspan='{{rows|length}}'>
-                <div class='warning'>
-                    {{ warning }}
-                </div>
-            </td>
-            <td>{{ row.value }}</td>
-        {# Otherwise, we're missing the second one, thus we place the warning on the second #}
-        {% elif missing_object == 'new' %}
-            <td>{{ row.value }}</td>
-            <td rowspan='{{rows|length}}'>
-                <div class='warning'>
-                    {{ warning }}
-                </div>
-            </td>
-        {% endif %}
-    </tr>
-    {% endfor %}
-    {%for row in rows|slice:"1:"%}
-    <tr class="diff-ignore">
-        <th>{{row.verbose_name}}</th><td>{{row.value}}</td>
-    </tr>
-    {% endfor %}
-{% else %}
-    {% for row in rows %}
-        <tr>
-            <th>{{ row.verbose_name }}</th><td>{{ row.old_value }}</td><td>{{ row.new_value }}</td>
-        </tr>
-    {% endfor %}
-{% endif %}
-</table>
\ No newline at end of file
+    {% if warning %}
+        {% for row in rows|slice:":1" %}
+            <tr class="diff-ignore">
+                <th>{{ row.verbose_name }}</th>
+                {# If the first object is missing, place a warning on the first TD #}
+                {% if missing_object == 'old' %}
+                    <td rowspan='{{ rows|length }}'>
+                        <div class='warning'>{{ warning }}</div>
+                    </td>
+                    <td>{{ row.value }}</td>
+                    {# Otherwise, we're missing the second one, thus we place the warning on the second #}
+                {% elif missing_object == 'new' %}
+                    <td>{{ row.value }}</td>
+                    <td rowspan='{{ rows|length }}'>
+                        <div class='warning'>{{ warning }}</div>
+                    </td>
+                {% endif %}
+            </tr>
+        {% endfor %}
+        {% for row in rows|slice:"1:" %}
+            <tr class="diff-ignore">
+                <th>{{ row.verbose_name }}</th>
+                <td>{{ row.value }}</td>
+            </tr>
+        {% endfor %}
+    {% else %}
+        {% for row in rows %}
+            <tr>
+                <th>{{ row.verbose_name }}</th>
+                <td>{{ row.old_value }}</td>
+                <td>{{ row.new_value }}</td>
+            </tr>
+        {% endfor %}
+    {% endif %}
+</table>
diff --git a/proposals/templates/proposals/translated_consent_forms.html b/proposals/templates/proposals/translated_consent_forms.html
index 0db346fe4..9372d2237 100644
--- a/proposals/templates/proposals/translated_consent_forms.html
+++ b/proposals/templates/proposals/translated_consent_forms.html
@@ -12,7 +12,7 @@
         $(function () {
             depends_on_value('translated_forms', 'True', 'translated_forms_languages');
     });
-  </script>
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -20,24 +20,23 @@
         <div class="col-12">
             {% with nav_items=proposal.available_urls active=pagenr %}
                 {% include 'base/navigation.html' %}
-            {% endwith %}            
-            <h2>
-                {% trans "Vertaling informed consent formulieren" %}
-            </h2>
-
+            {% endwith %}
+            <h2>{% trans "Vertaling informed consent formulieren" %}</h2>
             <p>
                 {% blocktrans trimmed %}
-                Documenten moet in het Nederlands of in het Engels worden ingediend. 
-                Echter, om je deelnemers op een adequate manier te informeren kan het noodzakelijk zijn om de documenten in hun moedertaal te vertalen. 
-                Als dat het geval is, dan hoeven deze niet direct te worden ingediend. Het is wel noodzakelijk te vermelden dat deze vertaald zullen gaan worden. 
-                Bij goedkeuring moeten de documenten in andere talen wel worden aangeleverd, omdat de portal ook dient als officieel archief van goedgekeurde aanvragen. 
-                Dit kan eventueel na goedkeuring, maar kan ook bij een minimale revisie.
+                    Documenten moet in het Nederlands of in het Engels worden ingediend.
+                    Echter, om je deelnemers op een adequate manier te informeren kan het noodzakelijk zijn om de documenten in hun moedertaal te vertalen.
+                    Als dat het geval is, dan hoeven deze niet direct te worden ingediend. Het is wel noodzakelijk te vermelden dat deze vertaald zullen gaan worden.
+                    Bij goedkeuring moeten de documenten in andere talen wel worden aangeleverd, omdat de portal ook dient als officieel archief van goedgekeurde aanvragen.
+                    Dit kan eventueel na goedkeuring, maar kan ook bij een minimale revisie.
                 {% endblocktrans %}
             </p>
-
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                    {% include "base/form_buttons.html" %}
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
+                {% include "base/form_buttons.html" %}
             </form>
         </div>
     </div>
diff --git a/proposals/templates/proposals/wmo_application.html b/proposals/templates/proposals/wmo_application.html
index 70cefa2df..c05c2ed3d 100644
--- a/proposals/templates/proposals/wmo_application.html
+++ b/proposals/templates/proposals/wmo_application.html
@@ -23,11 +23,12 @@
             {% with nav_items=wmo.proposal.available_urls active=2 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Aanmelding bij de METC" %}
-            </h2>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <h2>{% trans "Aanmelding bij de METC" %}</h2>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% if wmo.status == wmo.WMOStatuses.WAITING %}
                     <div class="warning">
                         {% trans "Zolang je aanvraag nog niet is beoordeeld door de METC, kan je niet verder in het aanmeldingsproces." %}
diff --git a/proposals/templates/proposals/wmo_check.html b/proposals/templates/proposals/wmo_check.html
index f6adfa2df..15eb9015b 100644
--- a/proposals/templates/proposals/wmo_check.html
+++ b/proposals/templates/proposals/wmo_check.html
@@ -8,12 +8,14 @@
 {% endblock %}
 
 {% block html_head %}
-<script type="text/javascript" charset="utf8" src="{% static 'proposals/js/wmo.js' %}"></script>
-<script>
+    <script type="text/javascript"
+            charset="utf8"
+            src="{% static 'proposals/js/wmo.js' %}"></script>
+    <script>
 $(function() {
     check_metc_required("{% url 'proposals:check_wmo' %}");
 });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -22,13 +24,17 @@
             {% with nav_items=wmo.proposal.available_urls active=2 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "WMO-check" %}
-            </h2>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <h2>{% trans "WMO-check" %}</h2>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <div id="metc_status"></div>
-                <input class="pure-button pure-button-primary" type="button" onclick="javascript:location.reload();" value="{% trans 'Opnieuw beginnen' %}" />
+                <input class="pure-button pure-button-primary"
+                       type="button"
+                       onclick="javascript:location.reload();"
+                       value="{% trans 'Opnieuw beginnen' %}" />
             </form>
         </div>
     </div>
diff --git a/proposals/templates/proposals/wmo_form.html b/proposals/templates/proposals/wmo_form.html
index 3a9996d1e..334393725 100644
--- a/proposals/templates/proposals/wmo_form.html
+++ b/proposals/templates/proposals/wmo_form.html
@@ -8,7 +8,9 @@
 {% endblock %}
 
 {% block html_head %}
-    <script type="text/javascript" charset="utf8" src="{% static 'proposals/js/wmo.js' %}"></script>
+    <script type="text/javascript"
+            charset="utf8"
+            src="{% static 'proposals/js/wmo.js' %}"></script>
     <script>
     $(function() {
         check_metc_required("{% url 'proposals:check_wmo' %}");
@@ -19,19 +21,18 @@
     </script>
 {% endblock %}
 
-
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
             {% with nav_items=proposal.available_urls active=2 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}
-            </h2>
-
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <h2>{% trans "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" %}</h2>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <div id="metc_status"></div>
                 {% with proposal=wmo.proposal %}
                     {% include "base/form_buttons.html" %}
diff --git a/reviews/templates/mail/base-internal.html b/reviews/templates/mail/base-internal.html
index 8c26cfe1e..e29ecf35a 100644
--- a/reviews/templates/mail/base-internal.html
+++ b/reviews/templates/mail/base-internal.html
@@ -1,7 +1,9 @@
-{% block content %}
-{% endblock %}
-<br/>
-Namens de FETC-GW, met de vriendelijke groeten,<br/>
-<br/>
-de FETC-GW secretaris<br/>
+{% block content %}{% endblock %}
+
+<br />
+Namens de FETC-GW, met de vriendelijke groeten,
+<br />
+<br />
+de FETC-GW secretaris
+<br />
 {{ secretary }}
diff --git a/reviews/templates/mail/base.html b/reviews/templates/mail/base.html
index 09d344619..ba00e835d 100644
--- a/reviews/templates/mail/base.html
+++ b/reviews/templates/mail/base.html
@@ -1,23 +1,32 @@
-[English version below]<br/>
-<br/>
-{% block content_nl %}
-{% endblock %}
-<br/>
-Namens de FETC-GW, met de vriendelijke groeten,<br/>
-<br/>
-de FETC-GW secretaris,<br/>
-{{ secretary }}<br/>
-<br/>
-Dit is een automatisch gegenereerd bericht.<br/>
-<br/>
-~~~~~<br/>
-<br/>
-{% block content_en %}
-{% endblock %}
-<br/>
-Kind regards on behalf of the FEtC-H,<br/>
-<br/>
-the secretary of the FEtC-H,<br/>
-{{ secretary }}<br/>
-<br/>
+[English version below]
+<br />
+<br />
+{% block content_nl %}{% endblock %}
+
+<br />
+Namens de FETC-GW, met de vriendelijke groeten,
+<br />
+<br />
+de FETC-GW secretaris,
+<br />
+{{ secretary }}
+<br />
+<br />
+Dit is een automatisch gegenereerd bericht.
+<br />
+<br />
+~~~~~
+<br />
+<br />
+{% block content_en %}{% endblock %}
+
+<br />
+Kind regards on behalf of the FEtC-H,
+<br />
+<br />
+the secretary of the FEtC-H,
+<br />
+{{ secretary }}
+<br />
+<br />
 This message was generated automatically.
diff --git a/reviews/templates/mail/concept_creator.html b/reviews/templates/mail/concept_creator.html
index 93d788ba1..f118bbf70 100644
--- a/reviews/templates/mail/concept_creator.html
+++ b/reviews/templates/mail/concept_creator.html
@@ -1,21 +1,29 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-Beste collega,<br />
-<br />
-Uw concept-aanmelding wordt door de eindverantwoordelijk onderzoeker {{ supervisor }} van deze aanvraag gecontroleerd.
-Zodra deze de concept-aanmelding, evt. na kleine aanpassingen, heeft goedgekeurd en ter toetsing bij de FETC-GW heeft ingediend, krijgt u van ons bericht.<br />
-Indien de concept-aanmelding nog aanzienlijke wijzigingen uwerzijds behoeft zal de eindverantwoordelijk onderzoeker zelf contact met u opnemen.<br />
-U kunt uw ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br />
-<br />
+    Beste collega,
+    <br />
+    <br />
+    Uw concept-aanmelding wordt door de eindverantwoordelijk onderzoeker {{ supervisor }} van deze aanvraag gecontroleerd.
+    Zodra deze de concept-aanmelding, evt. na kleine aanpassingen, heeft goedgekeurd en ter toetsing bij de FETC-GW heeft ingediend, krijgt u van ons bericht.
+    <br />
+    Indien de concept-aanmelding nog aanzienlijke wijzigingen uwerzijds behoeft zal de eindverantwoordelijk onderzoeker zelf contact met u opnemen.
+    <br />
+    U kunt uw ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.
+    <br />
+    <br />
 {% endblock %}
 
 {% block content_en %}
-Dear colleague,<br />
-<br />
-Your draft application will be checked by your supervisor {{ supervisor }}, the researcher who has the final responsibility of this study.<br />
-You will receive a notification as soon as {{ supervisor }} has approved and formally submitted your draft application, possibly after making some minor revisions.<br />
-In case {{ supervisor }} finds it necessary for you to make more substantial revisions in the application, he/she will notify you about this, and meanwhile formally disapprove the study in order for you to be able to revise and resubmit it.<br />
-You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.
-<br />
+    Dear colleague,
+    <br />
+    <br />
+    Your draft application will be checked by your supervisor {{ supervisor }}, the researcher who has the final responsibility of this study.
+    <br />
+    You will receive a notification as soon as {{ supervisor }} has approved and formally submitted your draft application, possibly after making some minor revisions.
+    <br />
+    In case {{ supervisor }} finds it necessary for you to make more substantial revisions in the application, he/she will notify you about this, and meanwhile formally disapprove the study in order for you to be able to revise and resubmit it.
+    <br />
+    You can find a PDF of your submission <a href="{{ pdf_url }}">here</a>.
+    <br />
 {% endblock %}
diff --git a/reviews/templates/mail/concept_other_applicants.html b/reviews/templates/mail/concept_other_applicants.html
index ffe711064..6e9b645fa 100644
--- a/reviews/templates/mail/concept_other_applicants.html
+++ b/reviews/templates/mail/concept_other_applicants.html
@@ -1,23 +1,33 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-Beste collega,<br />
-<br />
-Uw collega {{ creator }} (cc) heeft een concept-aanmelding ingediend bij de ethische commissie voor het onderzoek {{ title }}, waar u aan meewerkt.<br />
-De aanmelding wordt door de eindverantwoordelijk onderzoeker {{ supervisor }} van deze aanvraag gecontroleerd.
-Zodra deze de concept-aanmelding, evt. na kleine aanpassingen, heeft goedgekeurd en ter toetsing bij de FETC-GW heeft ingediend, krijgt uw collega {{ creator }} van ons bericht.<br />
-Indien de concept-aanmelding nog aanzienlijke wijzigingen uwerzijds behoeft zal de eindverantwoordelijk onderzoeker zelf contact met uw collega opnemen.<br />
-U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br />
-<br />
+    Beste collega,
+    <br />
+    <br />
+    Uw collega {{ creator }} (cc) heeft een concept-aanmelding ingediend bij de ethische commissie voor het onderzoek {{ title }}, waar u aan meewerkt.
+    <br />
+    De aanmelding wordt door de eindverantwoordelijk onderzoeker {{ supervisor }} van deze aanvraag gecontroleerd.
+    Zodra deze de concept-aanmelding, evt. na kleine aanpassingen, heeft goedgekeurd en ter toetsing bij de FETC-GW heeft ingediend, krijgt uw collega {{ creator }} van ons bericht.
+    <br />
+    Indien de concept-aanmelding nog aanzienlijke wijzigingen uwerzijds behoeft zal de eindverantwoordelijk onderzoeker zelf contact met uw collega opnemen.
+    <br />
+    U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.
+    <br />
+    <br />
 {% endblock %}
 
 {% block content_en %}
-Dear colleague,<br />
-<br />
-Your colleague {{ creator }} (cc) has submitted a draft application to the ethics commission for the study {{ title }}, in which you are participating.<b />
-The application will be checked by the study's supervisor {{ supervisor }}, the researcher who has the final responsibility of this study.<br />
-Your colleague {{ creator }} will receive a notification as soon as {{ supervisor }} has approved and formally submitted your draft application, possibly after making some minor revisions.<br />
-In case {{ supervisor }} finds it necessary for you to make more substantial revisions in the application, he/she will notify your colleague about this, and meanwhile formally disapprove the study in order for you to be able to revise and resubmit it.<br />
-You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
-<br />
+    Dear colleague,
+    <br />
+    <br />
+    Your colleague {{ creator }} (cc) has submitted a draft application to the ethics commission for the study {{ title }}, in which you are participating.<b />
+    The application will be checked by the study's supervisor {{ supervisor }}, the researcher who has the final responsibility of this study.
+    <br />
+    Your colleague {{ creator }} will receive a notification as soon as {{ supervisor }} has approved and formally submitted your draft application, possibly after making some minor revisions.
+    <br />
+    In case {{ supervisor }} finds it necessary for you to make more substantial revisions in the application, he/she will notify your colleague about this, and meanwhile formally disapprove the study in order for you to be able to revise and resubmit it.
+    <br />
+    You can find a PDF of your submission <a href="{{ pdf_url }}">here</a>.
+    <br />
+    <br />
 {% endblock %}
diff --git a/reviews/templates/mail/concept_supervisor.html b/reviews/templates/mail/concept_supervisor.html
index bf8bc3373..b195da623 100644
--- a/reviews/templates/mail/concept_supervisor.html
+++ b/reviews/templates/mail/concept_supervisor.html
@@ -1,39 +1,47 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-Beste collega,<br/>
-<br/>
-{{ creator }} heeft binnen de FETC-GW-webportal een concept-aanvraag opgesteld voor een onderzoek waarbij u als de eindverantwoordelijke onderzoeker bent aangewezen.<br/>
-
-<p>
-{{ proposal.reference_number }}: {{ proposal.title }}</p>
-
-U kunt deze concept-aanmelding <a href="{{ proposal_url }}">hier</a> bekijken, eventueel na aanpassingen van uzelf of {{ creator }}, formeel ter toetsing bij de FETC-GW indienen.<br/>
-Indien {{ creator }} wordt geacht de aanpassingen te maken, dient u de aanvraag formeel af te keuren en zelf {{ creator }} hiervan op de hoogte stellen.<br/>
-<br/>
-U kunt al uw aanmeldingen als supervisor en hun status <a href="{{ my_supervised }}">hier</a> bekijken.<br/>
-<br/>
-{% if revision %}
-<strong>Let op:</strong> het gaat hierbij om een {{ revision_type|lower }} van een eerdere aanmelding.<br/>
-Op het webportaal kunt u de wijzigingen ten opzichte van de vorige aanmelding inzien.<br/>
-{% endif %}
+    Beste collega,
+    <br />
+    <br />
+    {{ creator }} heeft binnen de FETC-GW-webportal een concept-aanvraag opgesteld voor een onderzoek waarbij u als de eindverantwoordelijke onderzoeker bent aangewezen.
+    <br />
+    <p>{{ proposal.reference_number }}: {{ proposal.title }}</p>
+    U kunt deze concept-aanmelding <a href="{{ proposal_url }}">hier</a> bekijken, eventueel na aanpassingen van uzelf of {{ creator }}, formeel ter toetsing bij de FETC-GW indienen.
+    <br />
+    Indien {{ creator }} wordt geacht de aanpassingen te maken, dient u de aanvraag formeel af te keuren en zelf {{ creator }} hiervan op de hoogte stellen.
+    <br />
+    <br />
+    U kunt al uw aanmeldingen als supervisor en hun status <a href="{{ my_supervised }}">hier</a> bekijken.
+    <br />
+    <br />
+    {% if revision %}
+        <strong>Let op:</strong> het gaat hierbij om een {{ revision_type|lower }} van een eerdere aanmelding.
+        <br />
+        Op het webportaal kunt u de wijzigingen ten opzichte van de vorige aanmelding inzien.
+        <br />
+    {% endif %}
 {% endblock %}
 
 {% block content_en %}
-Dear colleague,<br/>
-<br/>
-{{ creator }} has created, within the portal of the FEtC-H, a draft application for a study for which you are appointed as the supervisor.<br/>
-
-<p>
-{{ proposal.reference_number }}: {{ proposal.title }}</p>
-
-You can review this draft application <a href="{{ proposal_url }}">here</a> and submit this study to the FEtC-H after you have approved it. Note that in case minor revisions are necessary, you can adjust the study yourself before submitting it.<br/>
-In case the application needs to be revised more substantially by {{ creator }}, we ask you to formally disapprove it in order for {{ creator }} to be able to revise it. In such a case, we ask you to inform {{ creator }} about this.<br/>
-<br/>
-You can view all your supervised applications and their status <a href="{{ my_supervised }}">here</a>.<br/>
-<br/>
-{% if revision %}
-<strong>Please note</strong> that this involves a {{ revision_type | lower }} of a previous application.<br/>
-On the web portal you can check the differences between the current and previous application.<br/>
-{% endif %}
+    Dear colleague,
+    <br />
+    <br />
+    {{ creator }} has created, within the portal of the FEtC-H, a draft application for a study for which you are appointed as the supervisor.
+    <br />
+    <p>{{ proposal.reference_number }}: {{ proposal.title }}</p>
+    You can review this draft application <a href="{{ proposal_url }}">here</a> and submit this study to the FEtC-H after you have approved it. Note that in case minor revisions are necessary, you can adjust the study yourself before submitting it.
+    <br />
+    In case the application needs to be revised more substantially by {{ creator }}, we ask you to formally disapprove it in order for {{ creator }} to be able to revise it. In such a case, we ask you to inform {{ creator }} about this.
+    <br />
+    <br />
+    You can view all your supervised applications and their status <a href="{{ my_supervised }}">here</a>.
+    <br />
+    <br />
+    {% if revision %}
+        <strong>Please note</strong> that this involves a {{ revision_type | lower }} of a previous application.
+        <br />
+        On the web portal you can check the differences between the current and previous application.
+        <br />
+    {% endif %}
 {% endblock %}
diff --git a/reviews/templates/mail/pre_assessment_secretary.html b/reviews/templates/mail/pre_assessment_secretary.html
index 0106f0b2d..1ccf5b463 100644
--- a/reviews/templates/mail/pre_assessment_secretary.html
+++ b/reviews/templates/mail/pre_assessment_secretary.html
@@ -1,7 +1,10 @@
 {% extends "mail/base-internal.html" %}
 
 {% block content %}
-Er is een nieuwe aanvraag voor voortoetsing ingediend (referentienummer: {{ proposal.reference_number }}, <br/>
-eindverantwoordelijke: {{ proposal.accountable_user.get_full_name }}).<br/>
-U kunt de aanvraag <a href="{{ proposal_pdf }}">hier</a> bekijken.<br/>
+    Er is een nieuwe aanvraag voor voortoetsing ingediend (referentienummer: {{ proposal.reference_number }},
+    <br />
+    eindverantwoordelijke: {{ proposal.accountable_user.get_full_name }}).
+    <br />
+    U kunt de aanvraag <a href="{{ proposal_pdf }}">hier</a> bekijken.
+    <br />
 {% endblock %}
diff --git a/reviews/templates/mail/reminder.html b/reviews/templates/mail/reminder.html
index bf627a3bd..2c0cc2905 100644
--- a/reviews/templates/mail/reminder.html
+++ b/reviews/templates/mail/reminder.html
@@ -1,15 +1,21 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-Beste collega,<br/>
-<br/>
-Je moet met spoed de aanvraag van {{ creator }} beoordelen. De deadline voor beoordeling is (bijna) verlopen.<br/>
-U kunt deze aanvraag beoordelen via {{ proposal_url }}<br/>
+    Beste collega,
+    <br />
+    <br />
+    Je moet met spoed de aanvraag van {{ creator }} beoordelen. De deadline voor beoordeling is (bijna) verlopen.
+    <br />
+    U kunt deze aanvraag beoordelen via {{ proposal_url }}
+    <br />
 {% endblock %}
 
 {% block content_en %}
-Dear colleague,<br/>
-<br/>
-You must urgently review {{creator}}'s study. The deadline for assessment has (almost) expired.<br/>
-You can review this application via {{ proposal_url }}<br/>
+    Dear colleague,
+    <br />
+    <br />
+    You must urgently review {{ creator }}'s study. The deadline for assessment has (almost) expired.
+    <br />
+    You can review this application via {{ proposal_url }}
+    <br />
 {% endblock %}
diff --git a/reviews/templates/mail/submitted_longroute.html b/reviews/templates/mail/submitted_longroute.html
index 9c8c473f5..221c9549e 100644
--- a/reviews/templates/mail/submitted_longroute.html
+++ b/reviews/templates/mail/submitted_longroute.html
@@ -1,35 +1,45 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-{% if was_revised %}
-Beste collega,<br/>
-<br/>
-Je gereviseerde aanvraag is door de FETC-GW ontvangen.<br/>
-<br/>
-Dit houdt in dat je revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen je binnenkort een beoordeling te kunnen sturen.<br/>
-
-{% else %}
-Beste collega,<br/>
-<br/>
-Je aanmelding is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>lange-route onderzoek</em>, zie <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">appendix A van het reglement</a> voor de criteria.<br/>
-<br/>
-Dit houdt in dat je aanvraag op de eerstvolgende vergadering van de FETC-GW zal worden besproken, wanneer je aanvraag tenminste een week voor die vergadering is ingediend. Zie <a href="https://fetc-gw.wp.hum.uu.nl/category/agenda/">de FETC-GW-agenda</a> voor een overzicht van de komende vergaderingen. Zeer kort na de vergadering zult u de beoordeling ontvangen.<br/>
-{% endif %}
+    {% if was_revised %}
+        Beste collega,
+        <br />
+        <br />
+        Je gereviseerde aanvraag is door de FETC-GW ontvangen.
+        <br />
+        <br />
+        Dit houdt in dat je revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen je binnenkort een beoordeling te kunnen sturen.
+        <br />
+    {% else %}
+        Beste collega,
+        <br />
+        <br />
+        Je aanmelding is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>lange-route onderzoek</em>, zie <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">appendix A van het reglement</a> voor de criteria.
+        <br />
+        <br />
+        Dit houdt in dat je aanvraag op de eerstvolgende vergadering van de FETC-GW zal worden besproken, wanneer je aanvraag tenminste een week voor die vergadering is ingediend. Zie <a href="https://fetc-gw.wp.hum.uu.nl/category/agenda/">de FETC-GW-agenda</a> voor een overzicht van de komende vergaderingen. Zeer kort na de vergadering zult u de beoordeling ontvangen.
+        <br />
+    {% endif %}
 {% endblock %}
 
 {% block content_en %}
-{% if was_revised %}
-Dear colleague,<br/>
-<br/>
-The FEtC-H has received your revised application.<br/>
-<br/>
-This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.<br/>
-
-{% else %}
-Dear colleague,<br/>
-<br/>
-The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>long-route research</em>, see <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"> appendix A in the regulations</a> for the criteria.<br/>
-<br/>
-This means that your study will be discussed during the next FEtC-H meeting, if your application was submitted at least one week before that meeting. See <a href="https://fetc-gw.wp.hum.uu.nl/en/category/agenda-en/">the FEtC-H agenda</a> for an overview of upcoming meetings. You will receive the assessment shortly after the meeting.<br/>
-{% endif %}
+    {% if was_revised %}
+        Dear colleague,
+        <br />
+        <br />
+        The FEtC-H has received your revised application.
+        <br />
+        <br />
+        This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.
+        <br />
+    {% else %}
+        Dear colleague,
+        <br />
+        <br />
+        The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>long-route research</em>, see <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">appendix A in the regulations</a> for the criteria.
+        <br />
+        <br />
+        This means that your study will be discussed during the next FEtC-H meeting, if your application was submitted at least one week before that meeting. See <a href="https://fetc-gw.wp.hum.uu.nl/en/category/agenda-en/">the FEtC-H agenda</a> for an overview of upcoming meetings. You will receive the assessment shortly after the meeting.
+        <br />
+    {% endif %}
 {% endblock %}
diff --git a/reviews/templates/mail/submitted_longroute_other_applicants.html b/reviews/templates/mail/submitted_longroute_other_applicants.html
index a2a06cb17..74cb64eaf 100644
--- a/reviews/templates/mail/submitted_longroute_other_applicants.html
+++ b/reviews/templates/mail/submitted_longroute_other_applicants.html
@@ -1,37 +1,53 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-{% if was_revised %}
-Beste collega,<br/>
-<br/>
-Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.<br/>
-<br/>
-Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.<br/>
-U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
-{% else %}
-Beste collega,<br/>
-<br/>
-Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>lange-route onderzoek</em>, zie <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">appendix A van het reglement</a> voor de criteria.<br/>
-<br/>
-Dit houdt in dat je aanvraag op de eerstvolgende vergadering van de FETC-GW zal worden besproken, wanneer je aanvraag tenminste een week voor die vergadering is ingediend. Zie <a href="https://fetc-gw.wp.hum.uu.nl/category/agenda/">de FETC-GW-agenda</a> voor een overzicht van de komende vergaderingen. Kort na de vergadering zal {{ creator }} de beoordeling ontvangen.<br/>
-U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
-{% endif %}
+    {% if was_revised %}
+        Beste collega,
+        <br />
+        <br />
+        Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.
+        <br />
+        <br />
+        Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.
+        <br />
+        U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.
+        <br />
+    {% else %}
+        Beste collega,
+        <br />
+        <br />
+        Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>lange-route onderzoek</em>, zie <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">appendix A van het reglement</a> voor de criteria.
+        <br />
+        <br />
+        Dit houdt in dat je aanvraag op de eerstvolgende vergadering van de FETC-GW zal worden besproken, wanneer je aanvraag tenminste een week voor die vergadering is ingediend. Zie <a href="https://fetc-gw.wp.hum.uu.nl/category/agenda/">de FETC-GW-agenda</a> voor een overzicht van de komende vergaderingen. Kort na de vergadering zal {{ creator }} de beoordeling ontvangen.
+        <br />
+        U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.
+        <br />
+    {% endif %}
 {% endblock %}
 
 {% block content_en %}
-{% if was_revised %}
-Dear colleague,<br/>
-<br/>
-Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your application.<br/>
-<br/>
-This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send your colleague {{ creator }} a review soon.<br/>
-You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
-{% else %}
-Dear colleague,<br/>
-<br/>
-Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>long-route research</em>, see <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"> appendix A in the regulations</a> for the criteria.<br/>
-<br/>
-This means that your study will be discussed during the next FEtC-H meeting, if your application was submitted at least one week before that meeting. See <a href="https://fetc-gw.wp.hum.uu.nl/en/category/agenda-en/">the FEtC-H agenda</a> for an overview of upcoming meetings. {{ creator }} will receive the assessment shortly after the meeting.<br/>
-You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
-{% endif %}
+    {% if was_revised %}
+        Dear colleague,
+        <br />
+        <br />
+        Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your application.
+        <br />
+        <br />
+        This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send your colleague {{ creator }} a review soon.
+        <br />
+        You can find a PDF of your submission <a href="{{ pdf_url }}">here</a>.
+        <br />
+    {% else %}
+        Dear colleague,
+        <br />
+        <br />
+        Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>long-route research</em>, see <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">appendix A in the regulations</a> for the criteria.
+        <br />
+        <br />
+        This means that your study will be discussed during the next FEtC-H meeting, if your application was submitted at least one week before that meeting. See <a href="https://fetc-gw.wp.hum.uu.nl/en/category/agenda-en/">the FEtC-H agenda</a> for an overview of upcoming meetings. {{ creator }} will receive the assessment shortly after the meeting.
+        <br />
+        You can find a PDF of your submission <a href="{{ pdf_url }}">here</a>.
+        <br />
+    {% endif %}
 {% endblock %}
diff --git a/reviews/templates/mail/submitted_shortroute.html b/reviews/templates/mail/submitted_shortroute.html
index 5deffff67..4c24abddc 100644
--- a/reviews/templates/mail/submitted_shortroute.html
+++ b/reviews/templates/mail/submitted_shortroute.html
@@ -1,39 +1,51 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-{% if was_revised %}
-Beste collega,<br/>
-<br/>
-Je gereviseerde aanvraag is door de FETC-GW ontvangen.<br/>
-<br/>
-Dit houdt in dat je revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen je binnenkort een beoordeling te kunnen sturen.<br/>
-
-{% else %}
-Beste collega,<br/>
-<br/>
-Je aanmelding is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>korte-route onderzoek</em> gekregen.<br/>
-<br/>
-Dit houdt in dat wij ernaar streven om je binnen twee werkweken een eerste beoordeling van de FETC-GW te sturen.<br/>
-<br/>
-NB: Het is mogelijk dat je aanvraag alsnog als 'lange-route onderzoek' wordt aangemerkt, in welk geval de beoordeling langer kan duren, zie het <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">reglement</a>. Houdt u hier a.u.b. rekening mee.<br/>
-{% endif %}
+    {% if was_revised %}
+        Beste collega,
+        <br />
+        <br />
+        Je gereviseerde aanvraag is door de FETC-GW ontvangen.
+        <br />
+        <br />
+        Dit houdt in dat je revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen je binnenkort een beoordeling te kunnen sturen.
+        <br />
+    {% else %}
+        Beste collega,
+        <br />
+        <br />
+        Je aanmelding is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>korte-route onderzoek</em> gekregen.
+        <br />
+        <br />
+        Dit houdt in dat wij ernaar streven om je binnen twee werkweken een eerste beoordeling van de FETC-GW te sturen.
+        <br />
+        <br />
+        NB: Het is mogelijk dat je aanvraag alsnog als 'lange-route onderzoek' wordt aangemerkt, in welk geval de beoordeling langer kan duren, zie het <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">reglement</a>. Houdt u hier a.u.b. rekening mee.
+        <br />
+    {% endif %}
 {% endblock %}
 
 {% block content_en %}
-{% if was_revised %}
-Dear colleague,<br/>
-<br/>
-The FEtC-H has received your revised application.<br/>
-<br/>
-This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.<br/>
-
-{% else %}
-Dear colleague,<br/>
-<br/>
-The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>short-route research</em>.
-This means that you will receive an assessment within two working weeks.<br/>
-<br/>
-Note: It is possible that your application may still be classified as a 'long-route research', in which case the asssessment procedure may take longer, see the <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">regulations</a> for information. If the latter case, see <a href="http://fetc-gw.wp.hum.uu.nl/regulations/">section 2.8, p. 14</a> for the possible time paths.<br/>
-Please be aware of these possibilities and the different time paths involved.<br/>
-{% endif %}
+    {% if was_revised %}
+        Dear colleague,
+        <br />
+        <br />
+        The FEtC-H has received your revised application.
+        <br />
+        <br />
+        This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.
+        <br />
+    {% else %}
+        Dear colleague,
+        <br />
+        <br />
+        The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>short-route research</em>.
+        This means that you will receive an assessment within two working weeks.
+        <br />
+        <br />
+        Note: It is possible that your application may still be classified as a 'long-route research', in which case the asssessment procedure may take longer, see the <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">regulations</a> for information. If the latter case, see <a href="http://fetc-gw.wp.hum.uu.nl/regulations/">section 2.8, p. 14</a> for the possible time paths.
+        <br />
+        Please be aware of these possibilities and the different time paths involved.
+        <br />
+    {% endif %}
 {% endblock %}
diff --git a/reviews/templates/mail/submitted_shortroute_other_applicants.html b/reviews/templates/mail/submitted_shortroute_other_applicants.html
index 86e8c69d9..de4f41442 100644
--- a/reviews/templates/mail/submitted_shortroute_other_applicants.html
+++ b/reviews/templates/mail/submitted_shortroute_other_applicants.html
@@ -1,39 +1,56 @@
 {% extends "mail/base.html" %}
 
 {% block content_nl %}
-{% if was_revised %}
-Beste collega,<br/>
-<br/>
-Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.<br/>
-<br/>
-Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.<br/>
-U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
-{% else %}
-Beste collega,<br/>
-<br/>
-Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>korte-route onderzoek</em> gekregen.<br/>
-<br/>
-Dit houdt in dat wij ernaar streven om uw collega binnen twee werkweken een eerste beoordeling van de FETC-GW te sturen.<br/>
-U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.<br/>
-<br/>
-NB: Het is mogelijk dat je aanvraag alsnog als 'lange-route onderzoek' wordt aangemerkt, in welk geval de beoordeling langer kan duren, zie het <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">reglement</a>. Houdt u hier a.u.b. rekening mee.<br/>
-{% endif %}
+    {% if was_revised %}
+        Beste collega,
+        <br />
+        <br />
+        Uw collega {{ creator }} (cc) heeft een gereviseerde aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen.
+        <br />
+        <br />
+        Dit houdt in dat de revisie nu door twee leden van de FETC-GW zal worden beoordeeld; een eenvoudige revisie wordt alleen door de secretaris beoordeeld. We hopen uw collega, {{ creator }}, binnenkort een beoordeling te kunnen sturen.
+        <br />
+        U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.
+        <br />
+    {% else %}
+        Beste collega,
+        <br />
+        <br />
+        Uw collega {{ creator }} (cc) heeft een aanvraag ingediend voor het onderzoek {{ title }}, waar u aan meewerkt, bij de ethische commissie. De aanvraag is door de FETC-GW ontvangen. De automatische screening van de portal heeft op basis van de door jou gegeven beschrijving voorlopig de status <em>korte-route onderzoek</em> gekregen.
+        <br />
+        <br />
+        Dit houdt in dat wij ernaar streven om uw collega binnen twee werkweken een eerste beoordeling van de FETC-GW te sturen.
+        <br />
+        U kunt de ingediende aanmelding <a href="{{ pdf_url }}">hier</a> in PDF vorm bekijken.
+        <br />
+        <br />
+        NB: Het is mogelijk dat je aanvraag alsnog als 'lange-route onderzoek' wordt aangemerkt, in welk geval de beoordeling langer kan duren, zie het <a href="https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/">reglement</a>. Houdt u hier a.u.b. rekening mee.
+        <br />
+    {% endif %}
 {% endblock %}
 
 {% block content_en %}
-{% if was_revised %}
-Dear colleague,<br/>
-<br/>
-Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your revised application.<br/>
-<br/>
-This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.<br/>
-You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
-{% else %}
-Dear colleague,<br/>
-<br/>
-Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>short-route research</em>. This means that your colleague will receive an assessment within two working weeks.<br/>
-You can find a PDF of your submission <a href="{{pdf_url}}">here</a>.<br/>
-<br/>
-Note: It is possible that your application may still be classified as a 'long-route research', in which case the asssessment procedure may take longer, see the <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">regulations</a> for information. If the latter case, see <a href="http://fetc-gw.wp.hum.uu.nl/regulations/">section 2.8, p. 14</a> for the possible time paths.<br/>
-{% endif %}
+    {% if was_revised %}
+        Dear colleague,
+        <br />
+        <br />
+        Your colleague {{ creator }} (cc) has submitted a revised application for the study {{ title }}, in which you are participating. The FEtC-H has received your revised application.
+        <br />
+        <br />
+        This means that your study will be assessed by two members of the FEtC-H; minor revisions will be assessed by the secretary only. We hope to be able to send you a review soon.
+        <br />
+        You can find a PDF of your submission <a href="{{ pdf_url }}">here</a>.
+        <br />
+    {% else %}
+        Dear colleague,
+        <br />
+        <br />
+        Your colleague {{ creator }} (cc) has submitted an application for the study {{ title }}, in which you are participating. The FEtC-H has received your application. The automatic screening of the portal has given your study the status of <em>short-route research</em>. This means that your colleague will receive an assessment within two working weeks.
+        <br />
+        You can find a PDF of your submission <a href="{{ pdf_url }}">here</a>.
+        <br />
+        <br />
+        Note: It is possible that your application may still be classified as a 'long-route research', in which case the asssessment procedure may take longer, see the <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">regulations</a> for information. If the latter case, see <a href="http://fetc-gw.wp.hum.uu.nl/regulations/">section 2.8, p. 14</a> for the possible time paths.
+        <br />
+    {% endif %}
 {% endblock %}
diff --git a/reviews/templates/reviews/action_explaination.html b/reviews/templates/reviews/action_explaination.html
index b17bce316..fd106c7fc 100644
--- a/reviews/templates/reviews/action_explaination.html
+++ b/reviews/templates/reviews/action_explaination.html
@@ -14,30 +14,37 @@
 {% static 'reviews/images/website.png' as img_export %}
 {% static 'reviews/images/report_go.png' as img_confirm %}
 {% static 'reviews/images/tick.png' as img_confirmed %}
-
 <div class="col-12 {% if request.user|is_secretary %}col-md-6{% endif %}">
     <h3>{% trans "Uitleg" %}</h3>
     <ul>
         <li>
-            {% blocktrans %}
-                Klik op <img src="{{ img_pdf }}" title="Inzien"> om een ingediende aanvraag in te zien.
+            {% blocktrans trimmed %}
+                Klik op
+                <img src="{{ img_pdf }}" title="Inzien">
+                om een ingediende aanvraag in te zien.
             {% endblocktrans %}
         </li>
         <li>
-            {% blocktrans %}
-                Klik op <img src="{{ img_diff }}" title="Toon verschillen"> om de verschillen met de voorgaande
+            {% blocktrans trimmed %}
+                Klik op
+                <img src="{{ img_diff }}" title="Toon verschillen">
+                om de verschillen met de voorgaande
                 versie te zien (alleen beschikbaar voor revisies/amendementen).
             {% endblocktrans %}
         </li>
         <li>
-            {% blocktrans %}
-                Klik op <img src="{{ img_details }}" title="Toon details"> om alle details en beoordelingen van
+            {% blocktrans trimmed %}
+                Klik op
+                <img src="{{ img_details }}" title="Toon details">
+                om alle details en beoordelingen van
                 een ingediende aanvraag te zien.
             {% endblocktrans %}
         </li>
         <li>
-            {% blocktrans %}
-                Klik op <img src="{{ img_decide }}" title="Beslissen"> om je beslissing door te geven.
+            {% blocktrans trimmed %}
+                Klik op
+                <img src="{{ img_decide }}" title="Beslissen">
+                om je beslissing door te geven.
             {% endblocktrans %}
         </li>
     </ul>
@@ -47,42 +54,56 @@ <h3>{% trans "Uitleg secretaris" %}</h3>
     <ul>
         {% if request.user|is_secretary %}
             <li>
-                {% blocktrans %}
-                    Klik op <img src="{{ img_hide }}" title="Verbergen"> om een ingediende aanvraag te verbergen uit het
+                {% blocktrans trimmed %}
+                    Klik op
+                    <img src="{{ img_hide }}" title="Verbergen">
+                    om een ingediende aanvraag te verbergen uit het
                     archief.
                 {% endblocktrans %}
             </li>
             <li>
                 {% blocktrans trimmed %}
-                    Klik op <img src="{{ img_add }}" title="Toevoegen"> om een ingediende aanvraag toe te voegen
+                    Klik op
+                    <img src="{{ img_add }}" title="Toevoegen">
+                    om een ingediende aanvraag toe te voegen
                     aan het archief.
                 {% endblocktrans %}
             </li>
             <li>
-                {% blocktrans %}
-                    Klik op <img src="{{ img_add_reviewers }}" title="Aanstellen"> om beoordelaars aan te stellen.
+                {% blocktrans trimmed %}
+                    Klik op
+                    <img src="{{ img_add_reviewers }}" title="Aanstellen">
+                    om beoordelaars aan te stellen.
                 {% endblocktrans %}
             </li>
             <li>
-                {% blocktrans %}
-                    Klik op <img src="{{ img_change_chamber }}" title="Verplaats naar andere kamer"> om een aanvraag
+                {% blocktrans trimmed %}
+                    Klik op
+                    <img src="{{ img_change_chamber }}" title="Verplaats naar andere kamer">
+                    om een aanvraag
                     te verplaatsen naar een andere kamer.
                 {% endblocktrans %}
             </li>
             <li>
-                {% blocktrans %}
-                    Klik op <img src="{{ img_close }}" title="Afsluiten"> om een aanvraag af te sluiten.
+                {% blocktrans trimmed %}
+                    Klik op
+                    <img src="{{ img_close }}" title="Afsluiten">
+                    om een aanvraag af te sluiten.
                 {% endblocktrans %}
             </li>
             <li>
-                {% blocktrans %}
-                    Klik op <img src="{{ img_confirm }}" title="Bevestigingsbrief"> om aan te geven dat de
+                {% blocktrans trimmed %}
+                    Klik op
+                    <img src="{{ img_confirm }}" title="Bevestigingsbrief">
+                    om aan te geven dat de
                     bevestigingsbrief is verstuurd.
                 {% endblocktrans %}
             </li>
             <li>
-                {% blocktrans %}
-                    Klik op <img src="{{ img_confirmed }}" title="Bevestigingsbrief"> om de opgegeven datum
+                {% blocktrans trimmed %}
+                    Klik op
+                    <img src="{{ img_confirmed }}" title="Bevestigingsbrief">
+                    om de opgegeven datum
                     van de bevestigingsbrief te veranderen.
                 {% endblocktrans %}
             </li>
diff --git a/reviews/templates/reviews/auto_review.html b/reviews/templates/reviews/auto_review.html
index f716b2316..0009e6681 100644
--- a/reviews/templates/reviews/auto_review.html
+++ b/reviews/templates/reviews/auto_review.html
@@ -4,17 +4,15 @@ <h3>{% trans "Uitkomst automatische review" %}</h3>
 <p>
     <div class="{{ auto_review_go|yesno:"success,warning" }}">
         {% if auto_review_go %}
-        {% trans "Volgens de automatische review kan dit voorstel de <em>korte (2-weken) route</em> volgen." %}
+            {% trans "Volgens de automatische review kan dit voorstel de <em>korte (2-weken) route</em> volgen." %}
         {% else %}
-        {% trans "Volgens de automatische review moet dit voorstel nader worden bekeken." %}
+            {% trans "Volgens de automatische review moet dit voorstel nader worden bekeken." %}
         {% endif %}
     </div>
     {% if not auto_review_go %}
-    <h3>{% trans "Redenen" %}</h3>
-    <ul>
-        {% for reason in auto_review_reasons %}
-        <li>{{ reason }}</li>
-        {% endfor %}
-    </ul>
+        <h3>{% trans "Redenen" %}</h3>
+        <ul>
+            {% for reason in auto_review_reasons %}<li>{{ reason }}</li>{% endfor %}
+        </ul>
     {% endif %}
 </p>
diff --git a/reviews/templates/reviews/change_chamber_form.html b/reviews/templates/reviews/change_chamber_form.html
index 1b7ee7482..8daafe976 100644
--- a/reviews/templates/reviews/change_chamber_form.html
+++ b/reviews/templates/reviews/change_chamber_form.html
@@ -10,13 +10,17 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Beoordelende kamer wijzigen" %}
-            </h2>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'OK' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+            <h2>{% trans "Beoordelende kamer wijzigen" %}</h2>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'OK' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>
diff --git a/reviews/templates/reviews/committee_members_workload.html b/reviews/templates/reviews/committee_members_workload.html
index d337de54e..99455a54d 100644
--- a/reviews/templates/reviews/committee_members_workload.html
+++ b/reviews/templates/reviews/committee_members_workload.html
@@ -15,81 +15,73 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h3 class="mb-3">{% trans 'Lopende reviews' %} {{ committee }} </h3>
-
+            <h3 class="mb-3">{% trans 'Lopende reviews' %} {{ committee }}</h3>
             <table class="dt w-100" data-language="{% datatables_lang %}">
                 <thead>
-                <tr>
-                    <th>{% trans "Reviewer" %}</th>
-                    <th>{% trans "Traject" %}</th>
-                    <th>{% trans "Referentienummer" %}</th>
-                    <th>{% trans "Datum ingediend" %}</th>
-                    <th>{% trans "Gewenste einddatum" %}</th>
-                </tr>
+                    <tr>
+                        <th>{% trans "Reviewer" %}</th>
+                        <th>{% trans "Traject" %}</th>
+                        <th>{% trans "Referentienummer" %}</th>
+                        <th>{% trans "Datum ingediend" %}</th>
+                        <th>{% trans "Gewenste einddatum" %}</th>
+                    </tr>
                 </thead>
                 <tbody>
-                {% for decision in decisions %}
-                    <tr>
-                        <th scope="row">{{ decision.reviewer.get_full_name }} </th>
-                        <td>
-                            {% if decision.review.proposal.is_revision == True %}
-                                {% trans 'Revisie' %}
-                            {% elif decision.review.short_route == True %}
-                                {% trans 'Korte route' %}
-                            {% else %}
-                                {% trans 'Lange route' %}
-                            {% endif %}
-                        </td>
-                        <td> 
-                            <a href="{% url 'reviews:detail' pk=decision.review.pk %}">
-                                {{ decision.review.proposal.reference_number }} 
-                            </a> - {{decision.review.proposal.title}}
-                        </td>
-                        <td data-order="{{ decision.review.date_start|date:'c' }}">{{ decision.review.date_start|date:"j M Y" }}</td>
-                        {% if decision.review.date_should_end < today %}
-                            <td data-order="{{ decision.review.date_should_end|date:'c' }}" class="text-danger"> 
-                                    {{ decision.review.date_should_end|date:"j M Y" }} 
+                    {% for decision in decisions %}
+                        <tr>
+                            <th scope="row">{{ decision.reviewer.get_full_name }}</th>
+                            <td>
+                                {% if decision.review.proposal.is_revision == True %}
+                                    {% trans 'Revisie' %}
+                                {% elif decision.review.short_route == True %}
+                                    {% trans 'Korte route' %}
+                                {% else %}
+                                    {% trans 'Lange route' %}
+                                {% endif %}
                             </td>
-                        {% else %}
-                            <td data-order="{{ decision.review.date_should_end|date:'c' }}">
-                                {{ decision.review.date_should_end|date:"j M Y" }}
+                            <td>
+                                <a href="{% url 'reviews:detail' pk=decision.review.pk %}">{{ decision.review.proposal.reference_number }}</a> - {{ decision.review.proposal.title }}
                             </td>
-                        {% endif %}
-                    </tr>
-                {% endfor %}
+                            <td data-order="{{ decision.review.date_start|date:'c' }}">{{ decision.review.date_start|date:"j M Y" }}</td>
+                            {% if decision.review.date_should_end < today %}
+                                <td data-order="{{ decision.review.date_should_end|date:'c' }}"
+                                    class="text-danger">{{ decision.review.date_should_end|date:"j M Y" }}</td>
+                            {% else %}
+                                <td data-order="{{ decision.review.date_should_end|date:'c' }}">{{ decision.review.date_should_end|date:"j M Y" }}</td>
+                            {% endif %}
+                        </tr>
+                    {% endfor %}
                 </tbody>
             </table>
             <br />
-            <h3 class="mb-3">{% trans 'Werkverdeling overzicht van afgelopen periode' %} </h3>
-            <p>
-                {% trans 'Vul hieronder een start- en einddatum in voor de periode van dit overzicht.'%}
-            </p>
+            <h3 class="mb-3">{% trans 'Werkverdeling overzicht van afgelopen periode' %}</h3>
+            <p>{% trans 'Vul hieronder een start- en einddatum in voor de periode van dit overzicht.' %}</p>
             <form action="" method="post">
                 {% csrf_token %}
                 <table>
-                {{ form.as_table }}
+                    {{ form.as_table }}
                 </table>
-                <input type="submit" value="{% trans 'Periode toepassen'%}">
+                <input type="submit" value="{% trans 'Periode toepassen' %}">
             </form>
             <br />
             <table class="dt w-100" data-language="{% datatables_lang %}">
                 <thead>
-                <tr>
-                    <th>{% trans "Reviewer" %}</th>
-                    <th>{% trans "Totaal" %}</th>
-                    <th>{% trans "Korte route" %}</th>
-                    <th>{% trans "Lange Route" %}</th>
-                    <th>{% trans "Revisie" %}</th>
-                </tr>
+                    <tr>
+                        <th>{% trans "Reviewer" %}</th>
+                        <th>{% trans "Totaal" %}</th>
+                        <th>{% trans "Korte route" %}</th>
+                        <th>{% trans "Lange Route" %}</th>
+                        <th>{% trans "Revisie" %}</th>
+                    </tr>
                 </thead>
                 <tbody>
                     {% for reviewer in reviewers %}
                         <tr>
-                            <th scope="row" > {{ reviewer.get_full_name }} </th>
-                            <td >{{ reviewer.total }}</td>
-                            <td >{{ reviewer.num_short_route }}</td>
-                            <td >{{ reviewer.num_long_route }}</td>
-                            <td >{{ reviewer.num_revision }}</td>                       
+                            <th scope="row">{{ reviewer.get_full_name }}</th>
+                            <td>{{ reviewer.total }}</td>
+                            <td>{{ reviewer.num_short_route }}</td>
+                            <td>{{ reviewer.num_long_route }}</td>
+                            <td>{{ reviewer.num_revision }}</td>
                         </tr>
                     {% endfor %}
                 </tbody>
diff --git a/reviews/templates/reviews/decision_form.html b/reviews/templates/reviews/decision_form.html
index 4a07c5c54..d565f4307 100644
--- a/reviews/templates/reviews/decision_form.html
+++ b/reviews/templates/reviews/decision_form.html
@@ -9,13 +9,11 @@
 
 {% block content %}
     <div class="uu-inner-container">
-    {% with review=decision.review %}
-        {% include "reviews/review_detail_sidebar.html" %}
-    {% endwith %}
+        {% with review=decision.review %}
+            {% include "reviews/review_detail_sidebar.html" %}
+        {% endwith %}
         <div class="col-12 col-md-9">
-            <h2>
-                {% trans "Aanvraag beoordelen" %}
-            </h2>
+            <h2>{% trans "Aanvraag beoordelen" %}</h2>
             {% with proposal=decision.review.proposal %}
                 {% url 'proposals:pdf' proposal.id as pdf_url %}
                 {% url 'proposals:update' proposal.id as update_url %}
@@ -29,8 +27,9 @@ <h2>
                     </p>
                 {% else %}
                     <p>
-                        {% blocktrans trimmed with title=proposal.title  %}
-                            Je kunt nu de aanvraag <em>{{ title }}</em> bekijken.<br/>
+                        {% blocktrans trimmed with title=proposal.title %}
+                            Je kunt nu de aanvraag <em>{{ title }}</em> bekijken.
+                            <br />
                         {% endblocktrans %}
                     </p>
                     <p>
@@ -49,7 +48,8 @@ <h2>
                     <ol>
                         <li>
                             {% blocktrans trimmed %}
-                                door de supervisor (jijzelf)<br/>
+                                door de supervisor (jijzelf)
+                                <br />
                                 Als supervisor kan je deze aanvraag <a href="{{ update_url }}" target="_blank">hier</a>
                                 aanpassen. Daarna word je teruggeleid naar deze pagina en kun je hieronder de aanvraag
                                 goedkeuren; dat betekent dat de aanvraag wordt ingediend bij de FETC-GW.
@@ -57,12 +57,13 @@ <h2>
                         </li>
                         <li class="mt-2">
                             {% blocktrans trimmed %}
-                                door de indiener (je student of promovendus)<br/>
+                                door de indiener (je student of promovendus)
+                                <br />
                                 Indien je wilt dat de indiener de aanvraag zelf aanpast voordat je de studie
                                 kunt goedkeuren en daarmee bij de FETC-GW indient, selecteer dan 'revisie noodzakelijk'
                                 of ‘niet goedgekeurd’ hieronder, voeg eventuele opmerkingen toe, en klik op 'Beslissing
                                 opslaan'. Zodra je dit gedaan hebt kan de indiener weer aanpassingen doen.
-                                <br/>
+                                <br />
                             {% endblocktrans %}
                         </li>
                         {# This list item is a somewhat hacky way to simulate a p tag, as you can't use those in a li #}
@@ -77,20 +78,22 @@ <h2>
                 {% if proposal.is_revision %}
                     <p class="warning">
                         {% url 'proposals:diff' proposal.id as diff_url %}
-                        {% blocktrans %}
+                        {% blocktrans trimmed %}
                             Dit is een revisie van of amendement op een vorige aanvraag. De verschillen met de vorige
                             aanvraag zijn <a href="{{ diff_url }}">hier</a> in te zien.
                         {% endblocktrans %}
                     </p>
                 {% endif %}
-                <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                    <table>{{ form.as_table }}</table>
+                <form action="" method="post" enctype="multipart/form-data">
+                    {% csrf_token %}
+                    <table>
+                        {{ form.as_table }}
+                    </table>
                     <div class="float-right">
-                        <a class="button" href="javascript:history.go(-1);">
-                            {% trans "Terug naar de vorige pagina" %}
-                        </a>
-                        <input class="pure-button pure-button-primary" type="submit"
-                               value="{% trans 'Beslissing opslaan' %}"/>
+                        <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                        <input class="pure-button pure-button-primary"
+                               type="submit"
+                               value="{% trans 'Beslissing opslaan' %}" />
                     </div>
                 </form>
             {% endwith %}
diff --git a/reviews/templates/reviews/documents_list.html b/reviews/templates/reviews/documents_list.html
index 42c683277..587a204b3 100644
--- a/reviews/templates/reviews/documents_list.html
+++ b/reviews/templates/reviews/documents_list.html
@@ -5,47 +5,34 @@
 {% load compare_tags %}
 {% load documents_list %}
 
-
-
 {% for container in containers %}
-
-<h5>
-    {{container.header}}
-</h5>
-
-<ul>
-    {% for item in container.items %}
-    <li>
-        <a href="{{ item.get_link_url }}" target="_blank"
-
-           {% if not item.sets_content_disposition %}
-               download="{{item.get_filename}}"
-           {% endif %}
-        >
-            {{item.name}}
+    <h5>{{ container.header }}</h5>
+    <ul>
+        {% for item in container.items %}
+            <li>
+                <a href="{{ item.get_link_url }}"
+                   target="_blank"
+                   {% if not item.sets_content_disposition %}download="{{ item.get_filename }}"{% endif %}>
+                    {{ item.name }}
+                </a>
+                {% if item.comparable %}
+                    {% simple_compare_link item.object item.field %}
+                {% endif %}
+            </li>
+        {% endfor %}
+    </ul>
+    {% if container.dmp_edit_link %}
+        <a href="{{ container.dmp_edit_link }}" class="d-block mb-3">
+            {% trans "Data Management Plan wijzigen" %}
+            <img src="{% static 'proposals/images/pencil.png' %}"
+                 title="{% trans 'Data Management Plan wijzigen' %}" />
         </a>
-        {% if item.comparable %}
-        {% simple_compare_link item.object item.field %}
-        {% endif %} 
-    </li>
-    {% endfor %}
-</ul>
-
-{% if container.dmp_edit_link %}
-    <a href="{{ container.dmp_edit_link }}" class="d-block mb-3">
-        {% trans "Data Management Plan wijzigen" %}
-        <img src="{% static 'proposals/images/pencil.png' %}"
-            title="{% trans 'Data Management Plan wijzigen' %}" />
-    </a>
-{% endif %}
-
-{% if container.edit_link %}
-<a href="{{ container.edit_link }}" class="d-block mb-3">
-    {% trans "Documenten wijzigen" %}
-    <img src="{% static 'proposals/images/pencil.png' %}"
-         title="{% trans 'Documenten wijzigen' %}" />
-</a>
-{% endif %}
-
-
+    {% endif %}
+    {% if container.edit_link %}
+        <a href="{{ container.edit_link }}" class="d-block mb-3">
+            {% trans "Documenten wijzigen" %}
+            <img src="{% static 'proposals/images/pencil.png' %}"
+                 title="{% trans 'Documenten wijzigen' %}" />
+        </a>
+    {% endif %}
 {% endfor %}
diff --git a/reviews/templates/reviews/review_assign_form.html b/reviews/templates/reviews/review_assign_form.html
index 1c8b95f80..e639c5d94 100644
--- a/reviews/templates/reviews/review_assign_form.html
+++ b/reviews/templates/reviews/review_assign_form.html
@@ -22,32 +22,32 @@
 
 {% block content %}
     <div class="uu-inner-container">
-
-    {% with review=review %}
-        {% include "reviews/review_detail_sidebar.html" %}
-    {% endwith %}
-
+        {% with review=review %}
+            {% include "reviews/review_detail_sidebar.html" %}
+        {% endwith %}
         <div class="col-12 col-md-9">
-            <h2>
-                {% trans "Commissieleden aanstellen" %}
-            </h2>
-
+            <h2>{% trans "Commissieleden aanstellen" %}</h2>
             {% url 'reviews:workload' review.proposal.reviewing_committee as workload_url %}
             {% blocktrans trimmed with title=review.proposal.title %}
                 <p>
                     Kies hier de geschikte route en commissieleden voor de aanvraag <em>{{ title }}</em>.
                     klik <a href="{{ workload_url }}">hier</a> voor een overzicht van de werkverdeling van deze commissie.
-                <p\>
+                </p>
             {% endblocktrans %}
-            <form class="clearfix" action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form class="clearfix"
+                  action=""
+                  method="post"
+                  enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <div class="float-right">
-                    <a class="button" href="javascript:history.go(-1);">
-                        {% trans "Terug naar de vorige pagina" %}
-                    </a>
-                    <input class="pure-button pure-button-primary" type="submit" value="{% trans 'OK' %}"/>
+                    <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                    <input class="pure-button pure-button-primary"
+                           type="submit"
+                           value="{% trans 'OK' %}" />
                 </div>
-
             </form>
             {% if not review.proposal.is_pre_assessment %}
                 {% include "reviews/auto_review.html" %}
diff --git a/reviews/templates/reviews/review_close_form.html b/reviews/templates/reviews/review_close_form.html
index d560fb90e..9a892a9ea 100644
--- a/reviews/templates/reviews/review_close_form.html
+++ b/reviews/templates/reviews/review_close_form.html
@@ -21,11 +21,9 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Review afsluiten" %}
-            </h2>
+            <h2>{% trans "Review afsluiten" %}</h2>
             <p>
-                {% blocktrans with title=review.proposal.title %}
+                {% blocktrans trimmed with title=review.proposal.title %}
                     Sluit hier de beoordeling van de aanvraag <em>{{ title }}</em> af. Hieronder volgen de individuele
                     beslissingen.
                 {% endblocktrans %}
@@ -33,19 +31,16 @@ <h2>
             <h3>{% trans "Individuele beslissingen" %}</h3>
             {% include "reviews/review_table.html" %}
             <h3>{% trans "Uiteindelijk besluit" %}</h3>
-
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <div class="float-right">
-                    <a class="button" href="javascript:history.go(-1);">
-                        {% trans "Terug naar de vorige pagina" %}
-                    </a>
-                    <input type="submit" value="{% trans 'Review afsluiten' %}"/>
+                    <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                    <input type="submit" value="{% trans 'Review afsluiten' %}" />
                 </div>
-
             </form>
         </div>
     </div>
-
-
 {% endblock %}
diff --git a/reviews/templates/reviews/review_detail.html b/reviews/templates/reviews/review_detail.html
index 43378ba83..29c95cb7d 100644
--- a/reviews/templates/reviews/review_detail.html
+++ b/reviews/templates/reviews/review_detail.html
@@ -8,7 +8,7 @@
 {% load uil_filters %}
 
 {% block header_title %}
-    {% blocktrans with proposal=review.proposal.title %}
+    {% blocktrans trimmed with proposal=review.proposal.title %}
         Details van besluitvorming bij aanmelding {{ proposal }}
     {% endblocktrans %}
     - {{ review.proposal.reference_number }} - {{ block.super }}
@@ -18,7 +18,7 @@
     <div class="uu-inner-container">
         <div class="col-12">
             <h2>
-                {% blocktrans with proposal=review.proposal.title %}
+                {% blocktrans trimmed with proposal=review.proposal.title %}
                     Details van besluitvorming bij aanmelding <em>{{ proposal }}</em>
                 {% endblocktrans %}
                 - {{ review.proposal.reference_number }}
@@ -26,33 +26,23 @@ <h2>
         </div>
     </div>
     <div class="uu-inner-container">
-
-    {% with review=review %}
-        {% include "reviews/review_detail_sidebar.html" %}
-    {% endwith %}
-
+        {% with review=review %}
+            {% include "reviews/review_detail_sidebar.html" %}
+        {% endwith %}
         <div class="col-12 col-md-9">
-            <h4>
-                {% trans "Reviewers" %}
-            </h4>
+            <h4>{% trans "Reviewers" %}</h4>
             {% include "reviews/review_table.html" %}
             <h4>{% trans "Handelingen" %}</h4>
             <ul>
-            {% for action in detail_actions %}
-                <li>
-                    {{ action }}
-                </li>
+                {% for action in detail_actions %}
+                    <li>{{ action }}</li>
                 {% empty %}
-                <li>
-                    {% trans "Geen handelingen beschikbaar" %}
-                </li>
-            {% endfor %}
+                    <li>{% trans "Geen handelingen beschikbaar" %}</li>
+                {% endfor %}
             </ul>
             {% if not review.proposal.is_pre_assessment %}
                 {% include "reviews/auto_review.html" %}
             {% endif %}
         </div>
-
     </div>
-
 {% endblock %}
diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html
index 8c2e1b004..ce1dfadb8 100644
--- a/reviews/templates/reviews/review_detail_sidebar.html
+++ b/reviews/templates/reviews/review_detail_sidebar.html
@@ -12,26 +12,22 @@
 Remember to include it in a with statement if the view does not provide it.
 
 {% endcomment %}
-
 <div class="col-12 col-md-3">
-    <h3>
-        {% trans "Details" %}
-    </h3>
+    <h3>{% trans "Details" %}</h3>
     <ul>
-        <li>
-            {% trans "Referentie" %}: {{ review.proposal.reference_number }}
-        </li>
-        <li>
-            {% trans "Commissie" %}: {{review.proposal.reviewing_committee}}
-        </li>
+        <li>{% trans "Referentie" %}: {{ review.proposal.reference_number }}</li>
+        <li>{% trans "Commissie" %}: {{ review.proposal.reviewing_committee }}</li>
         {% if review.proposal.amendment_or_revision %}
             <li>
                 <a href="{% url 'reviews:detail' review.proposal.parent.latest_review.pk %}">
                     {% blocktrans trimmed with parent=review.proposal.parent.reference_number r_or_a=review.proposal.amendment_or_revision %}
-                        {{r_or_a}} van<br/> {{ parent }}
+                        {{ r_or_a }} van
+                        <br />
+                        {{ parent }}
                     {% endblocktrans %}
                     <a href="{% url 'proposals:diff' review.proposal.pk %}">
-                        <img src="{% static 'proposals/images/arrow_divide.png' %}" title="{% trans 'Toon verschillen' %}">
+                        <img src="{% static 'proposals/images/arrow_divide.png' %}"
+                             title="{% trans 'Toon verschillen' %}">
                     </a>
                 </a>
             </li>
@@ -39,43 +35,49 @@ <h3>
         <li>
             {% trans "Aanvrager(s)" %}:
             <ul>
-                {% for name_email in review.get_applicant_names_emails %}
-                    <li>{{ name_email }}</li>
-                {% endfor %}
+                {% for name_email in review.get_applicant_names_emails %}<li>{{ name_email }}</li>{% endfor %}
             </ul>
             {{ review.get_applicant_names }}
         </li>
         {% if review.proposal.supervisor %}
-            <li>
-                {% trans "Supervisor" %}: {{ review.proposal.supervisor.get_full_name }}
-            </li>
+            <li>{% trans "Supervisor" %}: {{ review.proposal.supervisor.get_full_name }}</li>
         {% endif %}
         <li>
-            {% blocktrans with date_start=review.date_start|date:"j F Y, G:i" %}
-                Reviewronde gestart op<br/> {{ date_start }}.
+            {% blocktrans trimmed with date_start=review.date_start|date:"j F Y, G:i" %}
+                Reviewronde gestart op
+                <br />
+                {{ date_start }}.
             {% endblocktrans %}
         </li>
         {% if review.date_end %}
             <li>
-                {% blocktrans with date_end=review.date_end|date:"j F Y, G:i" %}
-                    Reviewronde beëindigd op<br/> {{ date_end }}.
+                {% blocktrans trimmed with date_end=review.date_end|date:"j F Y, G:i" %}
+                    Reviewronde beëindigd op
+                    <br />
+                    {{ date_end }}.
                 {% endblocktrans %}
             </li>
         {% endif %}
         {% if review.stage == review.Stages.CLOSED %}
             <li>
-                {% blocktrans with continuation=review.get_continuation_display %}
-                    Afhandeling:<br/> {{ continuation }}.
+                {% blocktrans trimmed with continuation=review.get_continuation_display %}
+                    Afhandeling:
+                    <br />
+                    {{ continuation }}.
                 {% endblocktrans %}
             </li>
             {% if review.proposal.date_confirmed %}
                 <li>
-                    {% blocktrans with date_confirmed=review.proposal.date_confirmed|date:"j F Y" %}
-                        Bevestiging verzonden op<br/> {{ date_confirmed }}.
+                    {% blocktrans trimmed with date_confirmed=review.proposal.date_confirmed|date:"j F Y" %}
+                        Bevestiging verzonden op
+                        <br />
+                        {{ date_confirmed }}.
                     {% endblocktrans %}
                     {% if review.proposal.confirmation_comments %}
-                        {% blocktrans with comments=review.proposal.confirmation_comments %}
-                            Opmerkingen:<br/> {{ comments }}.
+                        {% blocktrans trimmed with comments=review.proposal.confirmation_comments %}
+                            Opmerkingen:
+                            <br />
+                            {{ comments }}.
                         {% endblocktrans %}
                     {% endif %}
                 </li>
@@ -84,7 +86,7 @@ <h3>
         {% if review.proposal.is_pre_assessment %}
             <li>
                 <em>
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Dit is een aanvraag voor voortoetsing.
                     {% endblocktrans %}
                 </em>
@@ -100,23 +102,23 @@ <h3>
             </li>
         {% endif %}
     </ul>
-
-
-        {% if review.proposal.has_minor_revision %}
-            <h4>{% trans 'Revisie' %}</h4>
-            <p>{% blocktrans %}
+    {% if review.proposal.has_minor_revision %}
+        <h4>{% trans 'Revisie' %}</h4>
+        <p>
+            {% blocktrans trimmed %}
                 Deze aanvraag heeft een revisie gehad tijdens het beslisproces.
-            {% endblocktrans %}</p>
-            {% if review.proposal.minor_revision_description %}
-                <p>{% blocktrans %}
-                    Er zijn de volgende opmerkingen bijgevoegd:<br/>
+            {% endblocktrans %}
+        </p>
+        {% if review.proposal.minor_revision_description %}
+            <p>
+                {% blocktrans trimmed %}
+                    Er zijn de volgende opmerkingen bijgevoegd:
+                    <br />
                 {% endblocktrans %}
-                {{ review.proposal.minor_revision_description }}</p>
-            {% endif %}
+                {{ review.proposal.minor_revision_description }}
+            </p>
         {% endif %}
-
-
-                <h3>{% trans "Documenten" %}</h3>
-                {% documents_list review user %}
-
+    {% endif %}
+    <h3>{% trans "Documenten" %}</h3>
+    {% documents_list review user %}
 </div>
diff --git a/reviews/templates/reviews/review_discontinue_form.html b/reviews/templates/reviews/review_discontinue_form.html
index f12e40821..abf941f0a 100644
--- a/reviews/templates/reviews/review_discontinue_form.html
+++ b/reviews/templates/reviews/review_discontinue_form.html
@@ -22,59 +22,57 @@
 
 {% block content %}
     <div class="uu-inner-container">
-
-    {% with review=review %}
-        {% include "reviews/review_detail_sidebar.html" %}
-    {% endwith %}
-
+        {% with review=review %}
+            {% include "reviews/review_detail_sidebar.html" %}
+        {% endwith %}
         <div class="col-12 col-md-9">
-            <h2>
-                {% trans "Afhandeling definitief beëindigen" %}
-            </h2>
-
+            <h2>{% trans "Afhandeling definitief beëindigen" %}</h2>
             <p>
                 {% blocktrans trimmed %}
-                Als een aanvraag definitief niet meer door de FETC-GW
-                afgehandeld gaat worden, en deze in de weg staat,
-                kan er voor gekozen worden deze te beëindigen.
+                    Als een aanvraag definitief niet meer door de FETC-GW
+                    afgehandeld gaat worden, en deze in de weg staat,
+                    kan er voor gekozen worden deze te beëindigen.
                 {% endblocktrans %}
             </p>
             <p>
                 {% blocktrans trimmed %}
-                Een beëindigde aanvraag verschijnt niet meer in de pagina's
-                van de secretaris en beoordelaars. Deze
-                aanvraag kan ook niet meer gereviseerd worden,
-                maar nog wel gekopieerd. De aanvraag is nog wel zichtbaar
-                in de lijst met "alle ingediende aanvragen".
+                    Een beëindigde aanvraag verschijnt niet meer in de pagina's
+                    van de secretaris en beoordelaars. Deze
+                    aanvraag kan ook niet meer gereviseerd worden,
+                    maar nog wel gekopieerd. De aanvraag is nog wel zichtbaar
+                    in de lijst met "alle ingediende aanvragen".
                 {% endblocktrans %}
             </p>
             {% if review.stage == review.Stages.CLOSED %}
-            <p>
-                <strong>
-                    {% trans "Attentie" %}
-                </strong>:
-                {% blocktrans trimmed %}
-                Deze aanvraag heeft op dit moment geen lopende beoordeling. Om deze aanvraag definitief te
-                beëindigen, moeten we de uitkomst van laatste beoordeling (zie linker balk) veranderen.
-                Dit kan verwarring veroorzaken bij de indiener, dus houd hier rekening mee.
-                {% endblocktrans %}
-            </p>
+                <p>
+                    <strong>{% trans "Attentie" %}</strong>:
+                    {% blocktrans trimmed %}
+                        Deze aanvraag heeft op dit moment geen lopende beoordeling. Om deze aanvraag definitief te
+                        beëindigen, moeten we de uitkomst van laatste beoordeling (zie linker balk) veranderen.
+                        Dit kan verwarring veroorzaken bij de indiener, dus houd hier rekening mee.
+                    {% endblocktrans %}
+                </p>
             {% endif %}
             <p>
                 <strong>{% trans "Aanvraag" %}</strong>:
                 {% blocktrans with title=review.proposal.title author=review.proposal.created_by trimmed %}
-                <em>{{title}}</em> door {{author}}
+                    <em>{{ title }}</em> door {{ author }}
                 {% endblocktrans %}
-            <form class="clearfix" action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                <div class="float-right">
-                    <a class="button" href="javascript:history.go(-1);">
-                        {% trans "Terug naar de vorige pagina" %}
-                    </a>
-                    <input class="pure-button pure-button-primary" type="submit" value="{% trans 'OK' %}"/>
-                </div>
-
-            </form>
+                <form class="clearfix"
+                      action=""
+                      method="post"
+                      enctype="multipart/form-data">
+                    {% csrf_token %}
+                    <table>
+                        {{ form.as_table }}
+                    </table>
+                    <div class="float-right">
+                        <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                        <input class="pure-button pure-button-primary"
+                               type="submit"
+                               value="{% trans 'OK' %}" />
+                    </div>
+                </form>
+            </div>
         </div>
-    </div>
-{% endblock %}
+    {% endblock %}
diff --git a/reviews/templates/reviews/review_table.html b/reviews/templates/reviews/review_table.html
index b6a2f4cca..481c1a4be 100644
--- a/reviews/templates/reviews/review_table.html
+++ b/reviews/templates/reviews/review_table.html
@@ -13,12 +13,12 @@
     </thead>
     <tbody>
         {% for decision in review.decision_set.all %}
-        <tr>
-            <td>{{ decision.reviewer.get_full_name }}</td>
-            <td>{{ decision.get_go_display|default:_("open") }}</td>
-            <td data-order="{{ decision.date_decision|date:'c' }}">{{ decision.date_decision|date:"j F Y, G:i" }}</td>
-            <td>{{ decision.comments }}</td>
-        </tr>
+            <tr>
+                <td>{{ decision.reviewer.get_full_name }}</td>
+                <td>{{ decision.get_go_display|default:_("open") }}</td>
+                <td data-order="{{ decision.date_decision|date:'c' }}">{{ decision.date_decision|date:"j F Y, G:i" }}</td>
+                <td>{{ decision.comments }}</td>
+            </tr>
         {% endfor %}
     </tbody>
 </table>
diff --git a/reviews/templates/reviews/simple_compare_link.html b/reviews/templates/reviews/simple_compare_link.html
index 5225ca6f2..a547d9ef8 100644
--- a/reviews/templates/reviews/simple_compare_link.html
+++ b/reviews/templates/reviews/simple_compare_link.html
@@ -1,10 +1,9 @@
-
 {% load static %}
 {% load i18n %}
 
-
 {% if compare_url %}
-<a href="{{compare_url}}" target="_blank" class="icon-link">
-    <img src="{% static 'proposals/images/arrow_divide.png' %}" title="{% trans 'Toon verschillen' %}">
-</a>
+    <a href="{{ compare_url }}" target="_blank" class="icon-link">
+        <img src="{% static 'proposals/images/arrow_divide.png' %}"
+             title="{% trans 'Toon verschillen' %}">
+    </a>
 {% endif %}
diff --git a/reviews/templates/reviews/ufl_list.html b/reviews/templates/reviews/ufl_list.html
index 5fcdabf30..19b54414d 100644
--- a/reviews/templates/reviews/ufl_list.html
+++ b/reviews/templates/reviews/ufl_list.html
@@ -6,20 +6,14 @@
 {% load vue_tags %}
 
 {% get_current_language as LANGUAGE_CODE %}
-
-{% block header_title %}
-    {{ committee_name }} - {{ title }} - {{ block.super }}
-{% endblock %}
+{% block header_title %}{{ committee_name }} - {{ title }} - {{ block.super }}{% endblock %}
 
 {% block html_head %}
-
     {# This template loads in either the dev or prod Vue library, depending on settings.DEBUG #}
     {% include 'uil.vue/vueloader.html' %}
     {# Load in the base component FancyList #}
     {% load_vue_component 'FancyList' %}
-
     {% include list_template %}
-
     <script>
         // Needs to be wrapped into an onload to ensure all dependencies are loaded
         window.onload = _ => {
@@ -31,12 +25,9 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {{ committee_name }} - {{ title }}
-            </h2>
+            <h2>{{ committee_name }} - {{ title }}</h2>
         </div>
         {% include 'reviews/action_explaination.html' %}
-
         <div class="col-12">
             <div id="list"></div>
         </div>
diff --git a/studies/templates/studies/session_start.html b/studies/templates/studies/session_start.html
index 2b29a7a94..abd44e591 100644
--- a/studies/templates/studies/session_start.html
+++ b/studies/templates/studies/session_start.html
@@ -13,32 +13,31 @@
             {% with nav_items=study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Het takenonderzoek en interviews" %}
-            </h2>
+            <h2>{% trans "Het takenonderzoek en interviews" %}</h2>
             {% include "studies/study_title.html" %}
             <p>
-                {% blocktrans %}
-                In de volgende vragen gaan we nader in op wat je in jouw onderzoek van je deelnemers zal verlangen. Daarbij gelden de volgende definities:
+                {% blocktrans trimmed %}
+                    In de volgende vragen gaan we nader in op wat je in jouw onderzoek van je deelnemers zal verlangen. Daarbij gelden de volgende definities:
                 {% endblocktrans %}
             </p>
             <p>
-                {% blocktrans %}
-                <strong>Sessie:</strong> Het geheel van de voor je onderzoek benodigde betrokkenheid die je op één dag van een deelnemer vraagt. Bij een labonderzoek is dat bijvoorbeeld alles wat er van onderzoekswege gebeurt vanaf het moment dat je de deelnemer ontvangt tot het moment dat je afscheid neemt, inclusief de benodigde pauzes. En bij een internet-vragenlijst is dat alles wat er van onderzoekswege gebeurt vanaf het welkomstscherm tot de afronding van de (reeks) vragenlijst(en), wederom inclusief benodigde pauzes. Bij veldwerk is dat de tijd dat je met de deelnemer in interactie bent op één dag.
+                {% blocktrans trimmed %}
+                    <strong>Sessie:</strong> Het geheel van de voor je onderzoek benodigde betrokkenheid die je op één dag van een deelnemer vraagt. Bij een labonderzoek is dat bijvoorbeeld alles wat er van onderzoekswege gebeurt vanaf het moment dat je de deelnemer ontvangt tot het moment dat je afscheid neemt, inclusief de benodigde pauzes. En bij een internet-vragenlijst is dat alles wat er van onderzoekswege gebeurt vanaf het welkomstscherm tot de afronding van de (reeks) vragenlijst(en), wederom inclusief benodigde pauzes. Bij veldwerk is dat de tijd dat je met de deelnemer in interactie bent op één dag.
                 {% endblocktrans %}
             </p>
             <p>
-                {% blocktrans %}
-                <strong>Taak:</strong> Een coherente verzameling handelingen die je via een gesproken of geschreven taak-instructie aan de deelnemer oplegt, en ook als zodanig als 'taak' in een artikel zou beschrijven (bijvoorbeeld: "Beluister de volgende 200 zinnetjes en druk op een knop als je een fout ontdekt", "Vul persoonlijkheidsvragenlijst X in", "Speel 10 minuten met je kind zoals je dat thuis doet", “houd 1 week een dagboek bij van jouw media-gebruik”, “wil je je gender identiteit beschrijven”, “maak foto’s van plekken in jouw leefomgeving die je bedreigend en inspirerend vindt”, “zoek en deel met ons 10 foto’s uit jouw prive-archief om je levensverhaal te kunnen vertellen”). Indien de specifieke opdracht aan de deelnemer per item varieert (bijvoorbeeld: "bij een Nederlandse zin beoordeel je de betekenis, bij een Engelse zin de grammatica"), beschouw dit dan gewoon als één taak.
+                {% blocktrans trimmed %}
+                    <strong>Taak:</strong> Een coherente verzameling handelingen die je via een gesproken of geschreven taak-instructie aan de deelnemer oplegt, en ook als zodanig als 'taak' in een artikel zou beschrijven (bijvoorbeeld: "Beluister de volgende 200 zinnetjes en druk op een knop als je een fout ontdekt", "Vul persoonlijkheidsvragenlijst X in", "Speel 10 minuten met je kind zoals je dat thuis doet", “houd 1 week een dagboek bij van jouw media-gebruik”, “wil je je gender identiteit beschrijven”, “maak foto’s van plekken in jouw leefomgeving die je bedreigend en inspirerend vindt”, “zoek en deel met ons 10 foto’s uit jouw prive-archief om je levensverhaal te kunnen vertellen”). Indien de specifieke opdracht aan de deelnemer per item varieert (bijvoorbeeld: "bij een Nederlandse zin beoordeel je de betekenis, bij een Engelse zin de grammatica"), beschouw dit dan gewoon als één taak.
                 {% endblocktrans %}
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                <p>
-                    {% trans "Voor elke sessie stellen we in de komende schermen steeds dezelfde vragen." %}
-                </p>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
+                <p>{% trans "Voor elke sessie stellen we in de komende schermen steeds dezelfde vragen." %}</p>
                 {% with proposal=study.proposal %}
-                {% include "base/form_buttons.html" %}
+                    {% include "base/form_buttons.html" %}
                 {% endwith %}
             </form>
         </div>
diff --git a/studies/templates/studies/study_design.html b/studies/templates/studies/study_design.html
index c08c9456a..c6f8bb79f 100644
--- a/studies/templates/studies/study_design.html
+++ b/studies/templates/studies/study_design.html
@@ -13,54 +13,58 @@
             {% with nav_items=study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "De onderzoekstype(n)" %}
-            </h2>
+            <h2>{% trans "De onderzoekstype(n)" %}</h2>
             {% include "studies/study_title.html" %}
             <p>
-                {% blocktrans %}
-                    De FETC-GW onderscheidt 3 typen onderzoek (die evt. ook samen in één aanvraag voor kunnen komen):
+                {% blocktrans trimmed %}
+        De FETC-GW onderscheidt 3 typen onderzoek (die evt. ook samen in één aanvraag voor kunnen komen):
                 {% endblocktrans %}
             </p>
             <ul>
                 <li>
                     <p>
-                        {% blocktrans %}
-                            <strong>Interventieonderzoek</strong>:</br >
-                            De onderzoeker manipuleert d.m.v. een <em>interventie</em> de context waarin de deelnemers in hun normale leven doen wat ze normaliter ook doen. <br />
+                        {% blocktrans trimmed %}
+                            <strong>Interventieonderzoek</strong>:
+                            <br />
+                            De onderzoeker manipuleert d.m.v. een <em>interventie</em> de context waarin de deelnemers in hun normale leven doen wat ze normaliter ook doen.
+                            <br />
                             De effecten kunnen gelijktijdig en/of achteraf worden geobserveerd.
                         {% endblocktrans %}
                     </p>
                 </li>
                 <li>
                     <p>
-                        {% blocktrans %}
-                            <strong>Observatieonderzoek</strong>:</br >
+                        {% blocktrans trimmed %}
+                            <strong>Observatieonderzoek</strong>:
+                            <br />
                             De onderzoeker observeert deelnemers in hun normale leven, maar grijpt hier niet op in.
                         {% endblocktrans %}
                     </p>
                 </li>
                 <li>
                     <p>
-                        {% blocktrans %}
-                            <strong>Taakonderzoek en Interviews</strong>:</br >
+                        {% blocktrans trimmed %}
+                            <strong>Taakonderzoek en Interviews</strong>:
+                            <br />
                             De onderzoeker
                             <ul>
-                                <li>legt deelnemers een taak op (bijv. vragenlijst, experiment) of </li>
-                                <li>neemt een interview af, of </li>
+                                <li>legt deelnemers een taak op (bijv. vragenlijst, experiment) of</li>
+                                <li>neemt een interview af, of</li>
                                 <li>vraagt deelnemer deel te nemen aan een focusgroep.</li>
-                            </ul><br />
+                            </ul>
+                            <br />
                             Onderzoek in het ILS-lab is vanwege de locatie per definitie altijd taakonderzoek (óók als de deelnemers na ontvangst alleen maar worden geobserveerd).
                         {% endblocktrans %}
                     </p>
                 </li>
             </ul>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
                 <table>
                     <tr>
                         <th>
                             <label for="id_study_design">
-                                {% blocktrans %}
+                                {% blocktrans trimmed %}
                                     Om welk type onderzoek gaat het hier?
                                     Je kan meerdere opties aankruisen.
                                 {% endblocktrans %}
@@ -76,23 +80,23 @@ <h2>
                                 {% endfor %}
                             </ul>
                             <span class="helptext">
-                    {% blocktrans trimmed %}
-                        Dit is bijvoorbeeld het geval wanneer je een
-                        observatiedeel combineert met een taakonderzoeksdeel,
-                        of met een interventiedeel (in dezelfde sessie, of
-                        verspreid over dagen).
-                        Wanneer je in interventieonderzoek <em>extra</em> taken
-                        inzet om de effecten van de interventie te bemeten
-                        (bijvoorbeeld een speciale voor- en nameting met een
-                        vragenlijst die anders niet zou worden afgenomen)
-                        dien je die apart als taakonderzoek te specificeren.
-                    {% endblocktrans %}
-                </span>
+                                {% blocktrans trimmed %}
+                                    Dit is bijvoorbeeld het geval wanneer je een
+                                    observatiedeel combineert met een taakonderzoeksdeel,
+                                    of met een interventiedeel (in dezelfde sessie, of
+                                    verspreid over dagen).
+                                    Wanneer je in interventieonderzoek <em>extra</em> taken
+                                    inzet om de effecten van de interventie te bemeten
+                                    (bijvoorbeeld een speciale voor- en nameting met een
+                                    vragenlijst die anders niet zou worden afgenomen)
+                                    dien je die apart als taakonderzoek te specificeren.
+                                {% endblocktrans %}
+                            </span>
                         </td>
                     </tr>
                 </table>
                 <p>
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Voor elk door jou aangekruiste type onderzoek kan je op de hiernavolgende pagina's
                         de relevante informatie verschaffen.
                     {% endblocktrans %}
@@ -103,5 +107,4 @@ <h2>
             </form>
         </div>
     </div>
-
 {% endblock %}
diff --git a/studies/templates/studies/study_end.html b/studies/templates/studies/study_end.html
index a67e2e3cd..3af305f74 100644
--- a/studies/templates/studies/study_end.html
+++ b/studies/templates/studies/study_end.html
@@ -24,29 +24,27 @@
             {% with nav_items=study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Overzicht en eigen beoordeling van het gehele onderzoek" %}
-            </h2>
+            <h2>{% trans "Overzicht en eigen beoordeling van het gehele onderzoek" %}</h2>
             {% include "studies/study_title.html" %}
             <p>
-                {% blocktrans with age_groups=study.age_groups.all|join:', ' %}
+                {% blocktrans trimmed with age_groups=study.age_groups.all|join:', ' %}
                     Deelnemers uit de leeftijdscategorieën <em>{{ age_groups }}</em>
                 {% endblocktrans %}
                 {% if study.has_traits %}
-                    {% blocktrans with traits=study.traits.all|join:', ' %}
+                    {% blocktrans trimmed with traits=study.traits.all|join:', ' %}
                         en met de bijzondere kenmerken <em>{{ traits }}</em>
                     {% endblocktrans %}
                 {% else %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         zonder bijzondere kenmerken
                     {% endblocktrans %}
                 {% endif %}
                 {% if study.legally_incapable %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         en zijnde <em>wilsonbekwaam</em>
                     {% endblocktrans %}
                 {% endif %}
-                {% blocktrans %}
+                {% blocktrans trimmed %}
                     zullen aan de volgende onderdelen meedoen:
                 {% endblocktrans %}
             </p>
@@ -63,20 +61,20 @@ <h4>
                             </h4>
                             <table class="mb-3">
                                 <thead>
-                                <tr>
-                                    <th>{% trans "Setting" %}</th>
-                                    <th>{% trans "Aantal sessies (per week)" %}</th>
-                                    <th>{% trans "Duur per sessie (in minuten)" %}</th>
-                                    <th>{% trans "Controlegroep?" %}</th>
-                                </tr>
+                                    <tr>
+                                        <th>{% trans "Setting" %}</th>
+                                        <th>{% trans "Aantal sessies (per week)" %}</th>
+                                        <th>{% trans "Duur per sessie (in minuten)" %}</th>
+                                        <th>{% trans "Controlegroep?" %}</th>
+                                    </tr>
                                 </thead>
                                 <tbody>
-                                <tr>
-                                    <td>{{ intervention.setting.all|unordered_list }}</td>
-                                    <td>{{ intervention.amount_per_week }}</td>
-                                    <td>{{ intervention.duration }}</td>
-                                    <td>{{ intervention.has_controls|yesno:_("ja, nee") }}</td>
-                                </tr>
+                                    <tr>
+                                        <td>{{ intervention.setting.all|unordered_list }}</td>
+                                        <td>{{ intervention.amount_per_week }}</td>
+                                        <td>{{ intervention.duration }}</td>
+                                        <td>{{ intervention.has_controls|yesno:_("ja, nee") }}</td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </li>
@@ -94,34 +92,32 @@ <h4>
                             </h4>
                             <table class="mb-3">
                                 <thead>
-                                <tr>
-                                    <th>{% trans "Setting" %}</th>
-                                    <th>{% trans "Aantal dagen" %}</th>
-                                    <th>{% trans "Duur per sessie (in uren)" %}</th>
-                                    <th>{% trans "Anoniem?" %}</th>
-                                    <th>{% trans "Doelgroep?" %}</th>
-                                    <th>{% trans "Niet openbaar?" %}</th>
-                                    <th>{% trans "Toestemming nodig?" %}</th>
-                                    {% if observation.needs_approval %}
-                                        <th>{% trans "Instantie" %}</th>
-                                    {% endif %}
-                                    <th>{% trans "Registratie via" %}</th>
-                                </tr>
+                                    <tr>
+                                        <th>{% trans "Setting" %}</th>
+                                        <th>{% trans "Aantal dagen" %}</th>
+                                        <th>{% trans "Duur per sessie (in uren)" %}</th>
+                                        <th>{% trans "Anoniem?" %}</th>
+                                        <th>{% trans "Doelgroep?" %}</th>
+                                        <th>{% trans "Niet openbaar?" %}</th>
+                                        <th>{% trans "Toestemming nodig?" %}</th>
+                                        {% if observation.needs_approval %}
+                                            <th>{% trans "Instantie" %}</th>
+                                        {% endif %}
+                                        <th>{% trans "Registratie via" %}</th>
+                                    </tr>
                                 </thead>
                                 <tbody>
-                                <tr>
-                                    <td>{{ observation.setting.all|unordered_list }}</td>
-                                    <td>{{ observation.days }}</td>
-                                    <td>{{ observation.mean_hours }}</td>
-                                    <td>{{ observation.is_anonymous|yesno:_("ja, nee") }}</td>
-                                    <td>{{ observation.is_in_target_group|yesno:_("ja, nee") }}</td>
-                                    <td>{{ observation.is_nonpublic_space|yesno:_("ja, nee") }}</td>
-                                    <td>{{ observation.needs_approval|yesno:_("ja, nee") }}</td>
-                                    {% if observation.needs_approval %}
-                                        <td>{{ observation.approval_institution }}</td>
-                                    {% endif %}
-                                    <td>{{ observation.registrations.all|unordered_list }}</td>
-                                </tr>
+                                    <tr>
+                                        <td>{{ observation.setting.all|unordered_list }}</td>
+                                        <td>{{ observation.days }}</td>
+                                        <td>{{ observation.mean_hours }}</td>
+                                        <td>{{ observation.is_anonymous|yesno:_("ja, nee") }}</td>
+                                        <td>{{ observation.is_in_target_group|yesno:_("ja, nee") }}</td>
+                                        <td>{{ observation.is_nonpublic_space|yesno:_("ja, nee") }}</td>
+                                        <td>{{ observation.needs_approval|yesno:_("ja, nee") }}</td>
+                                        {% if observation.needs_approval %}<td>{{ observation.approval_institution }}</td>{% endif %}
+                                        <td>{{ observation.registrations.all|unordered_list }}</td>
+                                    </tr>
                                 </tbody>
                             </table>
                         </li>
@@ -137,9 +133,10 @@ <h5 class="pt-2">
                                         Sessie {{ session.order }} (totale brutoduur: {{ session.tasks_duration }}
                                         minuten)
                                         {% if study.sessions_number > 1 %}
-                                            <a href="{% url 'tasks:session_delete' session.pk %}"><img
-                                                    src="{% static 'proposals/images/delete.png' %}"
-                                                    title="{% trans 'Sessie verwijderen' %}"></a>
+                                            <a href="{% url 'tasks:session_delete' session.pk %}">
+                                                <img src="{% static 'proposals/images/delete.png' %}"
+                                                     title="{% trans 'Sessie verwijderen' %}">
+                                            </a>
                                         {% endif %}
                                     </h5>
                                     <p>
@@ -153,15 +150,18 @@ <h5 class="pt-2">
                 {% endif %}
             </ul>
             <p>
-                {% blocktrans %}
+                {% blocktrans trimmed %}
                     Beantwoord op basis van dit overzicht de volgende vragen,
                     en ga daarbij uit van het naar verwachting meest kwetsbare c.q.
                     minst belastbare (bijv. jongste) geselecteerde deelnemerstype
                     dat dit traject doorloopt.
                 {% endblocktrans %}
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% with proposal=study.proposal %}
                     {% include "base/form_buttons.html" %}
                 {% endwith %}
diff --git a/studies/templates/studies/study_form.html b/studies/templates/studies/study_form.html
index 69f44f8b5..68238b8fd 100644
--- a/studies/templates/studies/study_form.html
+++ b/studies/templates/studies/study_form.html
@@ -8,7 +8,7 @@
 {% endblock %}
 
 {% block html_head %}
-<script>
+    <script>
 $(function() {
     $('input[name=age_groups]').change();
 
@@ -68,7 +68,7 @@
     });
     $('input[name=age_groups], input[name=legally_incapable]').change();
 });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -77,25 +77,23 @@
             {% with nav_items=study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-
-            <h2>
-                {% trans "De deelnemers" %}
-            </h2>
-
+            <h2>{% trans "De deelnemers" %}</h2>
             {% include "studies/study_title.html" %}
-
             {% if not study.proposal.relation %}
                 <div class="warning">
                     {% url 'proposals:update' study.proposal.pk as url %}
-                    {% blocktrans %}
+                    {% blocktrans trimmed %}
                         Let op! Je hebt de vraag <a href="{{ url }}">'In welke hoedanigheid ben je betrokken bij deze aanvraag?'</a> nog niet ingevuld, waardoor deze pagina nog kan veranderen op basis van je antwoord.
                     {% endblocktrans %}
                 </div>
             {% endif %}
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% with proposal=study.proposal %}
-                {% include "base/form_buttons.html" %}
+                    {% include "base/form_buttons.html" %}
                 {% endwith %}
             </form>
         </div>
diff --git a/studies/templates/studies/study_title.html b/studies/templates/studies/study_title.html
index a9893f7e1..4ff01ca80 100644
--- a/studies/templates/studies/study_title.html
+++ b/studies/templates/studies/study_title.html
@@ -1,15 +1,15 @@
 {% load i18n %}
 
 {% if study.proposal.studies_number > 1 %}
-<h3>
-    {% if study.name %}
-    {% blocktrans with order=study.order name=study.name %}
-    Traject {{ order }} (<em>{{ name }}</em>)
-    {% endblocktrans %}
-    {% else %}
-    {% blocktrans with order=study.order %}
-    Traject {{ order }}
-    {% endblocktrans %}
-    {% endif %}
-</h3>
+    <h3>
+        {% if study.name %}
+            {% blocktrans trimmed with order=study.order name=study.name %}
+                Traject {{ order }} (<em>{{ name }}</em>)
+            {% endblocktrans %}
+        {% else %}
+            {% blocktrans trimmed with order=study.order %}
+                Traject {{ order }}
+            {% endblocktrans %}
+        {% endif %}
+    </h3>
 {% endif %}
diff --git a/studies/templates/studies/study_update_attachments.html b/studies/templates/studies/study_update_attachments.html
index 5ee3d6560..7d6ca5288 100644
--- a/studies/templates/studies/study_update_attachments.html
+++ b/studies/templates/studies/study_update_attachments.html
@@ -10,20 +10,24 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Formulieren aanpassen" %}
-            </h2>
+            <h2>{% trans "Formulieren aanpassen" %}</h2>
             <p>
                 {% blocktrans trimmed with title=documents.proposal.title ref_number=documents.proposal.reference_number order=documents.study.order %}
-                Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag {{ title }}
-                (referentienummer <em>{{ ref_number }}</em>), traject {{ order }}.
+                    Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag {{ title }}
+                    (referentienummer <em>{{ ref_number }}</em>), traject {{ order }}.
                 {% endblocktrans %}
             </p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 <input type="hidden" name="next" value="{{ request.META.HTTP_REFERER }}">
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Formulieren aanpassen' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'Formulieren aanpassen' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
             </form>
         </div>
     </div>
diff --git a/tasks/templates/tasks/session_confirm_delete.html b/tasks/templates/tasks/session_confirm_delete.html
index f479ff79f..e906e1ecc 100644
--- a/tasks/templates/tasks/session_confirm_delete.html
+++ b/tasks/templates/tasks/session_confirm_delete.html
@@ -6,17 +6,20 @@
     {% trans "Sessie verwijderen" %} - {{ block.super }}
 {% endblock %}
 
-
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Sessie verwijderen" %}
-            </h2>
-            <form action="" method="post">{% csrf_token %}
-                <p>Weet u zeker dat u deze sessie <strong>{{ session.order }}</strong> in de aanvraag <em>{{ session.study.proposal.title }}</em> wilt verwijderen?</p>
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Verwijderen' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
+            <h2>{% trans "Sessie verwijderen" %}</h2>
+            <form action="" method="post">
+                {% csrf_token %}
+                <p>
+                    Weet u zeker dat u deze sessie <strong>{{ session.order }}</strong> in de aanvraag <em>{{ session.study.proposal.title }}</em> wilt verwijderen?
+                </p>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'Verwijderen' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>
     </div>
diff --git a/tasks/templates/tasks/session_title.html b/tasks/templates/tasks/session_title.html
index 2e549d91c..758f841e6 100644
--- a/tasks/templates/tasks/session_title.html
+++ b/tasks/templates/tasks/session_title.html
@@ -1,23 +1,23 @@
 {% load i18n %}
 
 {% with order=session.order study_order=session.study.order study_name=session.study.name studies_number=session.study.proposal.studies_number sessions_number=session.study.sessions_number %}
-{% if studies_number > 1 and sessions_number > 1 %}
-<h3>
-    {% blocktrans %}
-    Traject {{ study_order }} (<em>{{ study_name }}</em>), sessie {{ order }}
-    {% endblocktrans %}
-</h3>
-{% elif studies_number > 1 %}
-<h3>
-    {% blocktrans %}
-    Traject {{ study_order }} (<em>{{ study_name }}</em>)
-    {% endblocktrans %}
-</h3>
-{% elif sessions_number >= 1 %}
-<h3>
-    {% blocktrans %}
-    Sessie {{ order }}
-    {% endblocktrans %}
-</h3>
-{% endif %}
+    {% if studies_number > 1 and sessions_number > 1 %}
+        <h3>
+            {% blocktrans trimmed %}
+                Traject {{ study_order }} (<em>{{ study_name }}</em>), sessie {{ order }}
+            {% endblocktrans %}
+        </h3>
+    {% elif studies_number > 1 %}
+        <h3>
+            {% blocktrans trimmed %}
+                Traject {{ study_order }} (<em>{{ study_name }}</em>)
+            {% endblocktrans %}
+        </h3>
+    {% elif sessions_number >= 1 %}
+        <h3>
+            {% blocktrans trimmed %}
+                Sessie {{ order }}
+            {% endblocktrans %}
+        </h3>
+    {% endif %}
 {% endwith %}
diff --git a/tasks/templates/tasks/task_confirm_delete.html b/tasks/templates/tasks/task_confirm_delete.html
index 17e2e7ae7..c39a183e1 100644
--- a/tasks/templates/tasks/task_confirm_delete.html
+++ b/tasks/templates/tasks/task_confirm_delete.html
@@ -9,13 +9,17 @@
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
-            <h2>
-                {% trans "Taak verwijderen" %}
-            </h2>
-            <form action="" method="post">{% csrf_token %}
-                <p>Weet u zeker dat u de taak <strong>{{ task.name }}</strong> uit sessie <strong>{{ task.session.order }}</strong> in de aanvraag <em>{{ task.session.study.proposal.title }}</em> wilt verwijderen?</p>
-                <input class="pure-button pure-button-primary" type="submit" value="{% trans 'Verwijderen' %}" />
-                <a class="pure-button pure-button-secondary" href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
+            <h2>{% trans "Taak verwijderen" %}</h2>
+            <form action="" method="post">
+                {% csrf_token %}
+                <p>
+                    Weet u zeker dat u de taak <strong>{{ task.name }}</strong> uit sessie <strong>{{ task.session.order }}</strong> in de aanvraag <em>{{ task.session.study.proposal.title }}</em> wilt verwijderen?
+                </p>
+                <input class="pure-button pure-button-primary"
+                       type="submit"
+                       value="{% trans 'Verwijderen' %}" />
+                <a class="pure-button pure-button-secondary"
+                   href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>
     </div>
diff --git a/tasks/templates/tasks/task_end.html b/tasks/templates/tasks/task_end.html
index ae76ec69b..8c2d8fa00 100644
--- a/tasks/templates/tasks/task_end.html
+++ b/tasks/templates/tasks/task_end.html
@@ -7,16 +7,13 @@
     {% trans "Overzicht van het takenonderzoek" %} - {{ block.super }}
 {% endblock %}
 
-
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
             {% with nav_items=session.study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Overzicht van het takenonderzoek" %}
-            </h2>
+            <h2>{% trans "Overzicht van het takenonderzoek" %}</h2>
             {% include "tasks/session_title.html" %}
             <div class="task_list">
                 <p>
@@ -25,13 +22,15 @@ <h2>
                 {% include "tasks/task_list.html" %}
             </div>
             <p>{% trans "Beantwoord op basis van dit overzicht de volgende vragen:" %}</p>
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% with proposal=session.study.proposal study=session.study %}
-                {% include "base/form_buttons.html" %}
+                    {% include "base/form_buttons.html" %}
                 {% endwith %}
             </form>
         </div>
     </div>
-
 {% endblock %}
diff --git a/tasks/templates/tasks/task_form.html b/tasks/templates/tasks/task_form.html
index ccb16265d..53fce3fee 100644
--- a/tasks/templates/tasks/task_form.html
+++ b/tasks/templates/tasks/task_form.html
@@ -8,32 +8,31 @@
 {% endblock %}
 
 {% block html_head %}
-<script>
+    <script>
 $(function() {
     check_field_required('registrations', 'needs_kind', 'registration_kinds', 'tasks', 'Registration');
     check_field_required('registrations', 'needs_details', 'registrations_details', 'tasks', 'Registration');
     check_field_required('registration_kinds', 'needs_details', 'registration_kinds_details', 'tasks', 'RegistrationKind');
     depends_on_value('feedback', 'True', 'feedback_details');
 });
-</script>
+    </script>
 {% endblock %}
 
-
 {% block content %}
     <div class="uu-inner-container">
         <div class="col-12">
             {% with nav_items=task.session.study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-
-            <h2>
-                {% trans "Het takenonderzoek en interviews" %}
-            </h2>
+            <h2>{% trans "Het takenonderzoek en interviews" %}</h2>
             {% include "tasks/task_title.html" %}
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
                 {% with proposal=task.session.study.proposal study=task.session.study session=task.session %}
-                {% include "base/form_buttons.html" %}
+                    {% include "base/form_buttons.html" %}
                 {% endwith %}
             </form>
         </div>
diff --git a/tasks/templates/tasks/task_list.html b/tasks/templates/tasks/task_list.html
index 73137d60d..63fa4cb79 100644
--- a/tasks/templates/tasks/task_list.html
+++ b/tasks/templates/tasks/task_list.html
@@ -13,27 +13,30 @@
     </thead>
     <tbody>
         {% for task in session.task_set.all %}
-        <tr>
-            <td>{{ task.name }}</td>
-            <td>{{ task.duration }}</td>
-            <td>{{ task.registrations.all|unordered_list }}</td>
-            <td class="task_feedback">
-                <span class="label">{{ task.feedback|yesno:_("ja,nee") }}</span>
-                {% if task.feedback %}
-                <span class="help">{{ task.feedback_details }}</span>
-                {% endif %}
-            </td>
-            <td>
-                <a href="{% url 'tasks:update' task.id %}"><img src="{% static 'proposals/images/pencil.png' %}" title="{% trans 'Taak bewerken' %}"></a>
-                {% if session.tasks_number > 1 %}
-                <a href="{% url 'tasks:delete' task.id %}"><img src="{% static 'proposals/images/delete.png' %}" title="{% trans 'Taak verwijderen' %}"></a>
-                {% endif %}
-            </td>
-        </tr>
+            <tr>
+                <td>{{ task.name }}</td>
+                <td>{{ task.duration }}</td>
+                <td>{{ task.registrations.all|unordered_list }}</td>
+                <td class="task_feedback">
+                    <span class="label">{{ task.feedback|yesno:_("ja,nee") }}</span>
+                    {% if task.feedback %}<span class="help">{{ task.feedback_details }}</span>{% endif %}
+                </td>
+                <td>
+                    <a href="{% url 'tasks:update' task.id %}">
+                        <img src="{% static 'proposals/images/pencil.png' %}"
+                             title="{% trans 'Taak bewerken' %}">
+                    </a>
+                    {% if session.tasks_number > 1 %}
+                        <a href="{% url 'tasks:delete' task.id %}">
+                            <img src="{% static 'proposals/images/delete.png' %}"
+                                 title="{% trans 'Taak verwijderen' %}">
+                        </a>
+                    {% endif %}
+                </td>
+            </tr>
         {% endfor %}
     </tbody>
 </table>
-
 <script>
 $(function() {
     let elements = $('.task_feedback');
diff --git a/tasks/templates/tasks/task_start.html b/tasks/templates/tasks/task_start.html
index cc206b64b..763210e55 100644
--- a/tasks/templates/tasks/task_start.html
+++ b/tasks/templates/tasks/task_start.html
@@ -8,14 +8,14 @@
 {% endblock %}
 
 {% block html_head %}
-<script>
+    <script>
 $(function() {
     depends_on_value('is_copy', 'True', 'parent_session');
     depends_on_value('is_copy', 'False', 'tasks_number');
 
     $('input[name=tasks_number]').parents('tr').insertAfter($('input[name=is_copy]').parents('tr'));
 });
-</script>
+    </script>
 {% endblock %}
 
 {% block content %}
@@ -24,21 +24,19 @@
             {% with nav_items=session.study.proposal.available_urls active=3 %}
                 {% include 'base/navigation.html' %}
             {% endwith %}
-            <h2>
-                {% trans "Het takenonderzoek en interviews" %}
-            </h2>
+            <h2>{% trans "Het takenonderzoek en interviews" %}</h2>
             {% include "main/setting_checks.html" %}
             {% include "tasks/session_title.html" %}
-            <form action="" method="post" enctype="multipart/form-data">{% csrf_token %}
-                <table>{{ form.as_table }}</table>
-                <p>
-                    {% trans "Voor elke taak stellen we in de komende schermen steeds dezelfde vragen." %}
-                </p>
+            <form action="" method="post" enctype="multipart/form-data">
+                {% csrf_token %}
+                <table>
+                    {{ form.as_table }}
+                </table>
+                <p>{% trans "Voor elke taak stellen we in de komende schermen steeds dezelfde vragen." %}</p>
                 {% with proposal=session.study.proposal study=session.study %}
-                {% include "base/form_buttons.html" %}
+                    {% include "base/form_buttons.html" %}
                 {% endwith %}
             </form>
         </div>
     </div>
-
 {% endblock %}
diff --git a/tasks/templates/tasks/task_title.html b/tasks/templates/tasks/task_title.html
index 51f26d6f3..7a0352a8d 100644
--- a/tasks/templates/tasks/task_title.html
+++ b/tasks/templates/tasks/task_title.html
@@ -1,17 +1,17 @@
 {% load i18n %}
 
 {% with order=task.order session_order=task.session.order study_order=task.session.study.order study_name=task.session.study.name studies_number=task.session.study.proposal.studies_number %}
-{% if studies_number > 1 %}
-<h3>
-    {% blocktrans %}
-    Traject {{ study_order }} (<em>{{ study_name }}</em>), sessie {{ session_order }}, taak {{ order }}
-    {% endblocktrans %}
-</h3>
-{% else %}
-<h3>
-    {% blocktrans %}
-    Sessie {{ session_order }}, taak {{ order }}
-    {% endblocktrans %}
-</h3>
-{% endif %}
+    {% if studies_number > 1 %}
+        <h3>
+            {% blocktrans trimmed %}
+                Traject {{ study_order }} (<em>{{ study_name }}</em>), sessie {{ session_order }}, taak {{ order }}
+            {% endblocktrans %}
+        </h3>
+    {% else %}
+        <h3>
+            {% blocktrans trimmed %}
+                Sessie {{ session_order }}, taak {{ order }}
+            {% endblocktrans %}
+        </h3>
+    {% endif %}
 {% endwith %}

From dc56d72b6cb0fa8c03eef124adf505400762267a Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 15:36:27 +0100
Subject: [PATCH 119/148] fix: regenerate and fix translation file

---
 locale/en/LC_MESSAGES/django.po | 2483 +++++++++++++------------------
 1 file changed, 1069 insertions(+), 1414 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 1580a6be9..cb1ab438b 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-11 16:40+0100\n"
+"POT-Creation-Date: 2024-01-12 15:35+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -17,7 +17,7 @@ msgstr ""
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 "X-Generator: Poedit 2.4.1\n"
 
-#: faqs/menus.py:7 main/templates/main/index.html:201
+#: faqs/menus.py:7 main/templates/main/index.html:187
 msgid "FETC-GW website"
 msgstr "FEtC-H website"
 
@@ -29,15 +29,15 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/"
 msgid "Reglement FETC-GW"
 msgstr "Regulations FEtC-H"
 
-#: faqs/menus.py:13 main/templates/main/index.html:204
-#: proposals/templates/proposals/proposal_start_pre_approved.html:14
+#: faqs/menus.py:13 main/templates/main/index.html:190
+#: proposals/templates/proposals/proposal_start_pre_approved.html:11
 msgid "https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/"
 msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/"
 
-#: faqs/menus.py:17 main/templates/main/index.html:209
+#: faqs/menus.py:17 main/templates/main/index.html:194
 #: proposals/templates/proposals/study_consent.html:8
 #: proposals/templates/proposals/translated_consent_forms.html:7
-#: proposals/utils/pdf_diff_logic.py:868
+#: proposals/utils/pdf_diff_logic.py:878
 msgid "Informed consent formulieren"
 msgstr "Informed consent forms"
 
@@ -51,7 +51,7 @@ msgstr ""
 msgid "FAQs"
 msgstr "FAQs"
 
-#: faqs/menus.py:27
+#: faqs/menus.py:30
 msgid "Help"
 msgstr "Help"
 
@@ -59,47 +59,47 @@ msgstr "Help"
 msgid "FAQ"
 msgstr "FAQ"
 
-#: faqs/templates/faqs/faq_list.html:6 faqs/templates/faqs/faq_list.html:13
+#: faqs/templates/faqs/faq_list.html:6 faqs/templates/faqs/faq_list.html:12
 msgid "Frequently Asked Questions"
 msgstr "Frequently Asked Questions"
 
-#: fetc/settings.py:132
+#: fetc/settings.py:128
 msgid "Nederlands"
 msgstr "Dutch"
 
-#: fetc/settings.py:133
+#: fetc/settings.py:129
 msgid "Engels"
 msgstr "English"
 
-#: interventions/models.py:15
+#: interventions/models.py:17
 msgid "Wat is de periode waarbinnen de interventie plaatsvindt?"
 msgstr "What is the period in which the intervention will take place?"
 
-#: interventions/models.py:16
+#: interventions/models.py:18
 msgid "De interventie vindt plaats binnen het schooljaar 2018-2019"
 msgstr "The intervention will take place in the academic year 2018-2019"
 
-#: interventions/models.py:22
+#: interventions/models.py:23
 msgid "Zal de interventie vaker dan één keer plaatsvinden?"
 msgstr "Will there be more than one intervention session?"
 
-#: interventions/models.py:27
+#: interventions/models.py:28
 msgid "Wat is de frequentie van de interventie?"
 msgstr "What is the frequency of the intervention?"
 
-#: interventions/models.py:32
+#: interventions/models.py:33
 msgid "Wat is de duur van de interventie per sessie in minuten?"
 msgstr "What is the duration of the intervention session in minutes?"
 
-#: interventions/models.py:38
+#: interventions/models.py:39
 msgid "Wie voert de interventie uit?"
 msgstr "Who will conduct the intervention?"
 
-#: interventions/models.py:43
+#: interventions/models.py:44
 msgid "Geef een beschrijving van de experimentele interventie"
 msgstr "Give a description of the experimental intervention"
 
-#: interventions/models.py:48
+#: interventions/models.py:50
 msgid ""
 "Is er sprake van een controlegroep? (Let op: als de controlegroep ook een "
 "ander soort taken krijgt, moet je hier een apart traject voor aanmaken)"
@@ -107,15 +107,15 @@ msgstr ""
 "Is there a control group? (If the control receives significantly different "
 "tasks, it should have its own trajectory)"
 
-#: interventions/models.py:55
+#: interventions/models.py:58
 msgid "Geef een beschrijving van de controleinterventie"
 msgstr "Give a description of the control intervention"
 
-#: interventions/models.py:60
+#: interventions/models.py:63
 msgid "Hoe wordt het effect van de interventie gemeten?"
 msgstr "How will the effect of the intervention be measured?"
 
-#: interventions/models.py:61
+#: interventions/models.py:65
 msgid ""
 "Wanneer je de deelnemer extra taken laat uitvoeren, dus een taak die niet "
 "behoort tot het reguliere onderwijspakket, dan moet je op de vorige pagina "
@@ -125,12 +125,12 @@ msgstr ""
 "part of the regular educational package, you should also check \"task-based "
 "research\" on the previous page."
 
-#: interventions/models.py:68
+#: interventions/models.py:73
 msgid "Voert de leerling nog een taak uit die niet onder het leerplan valt?"
 msgstr ""
 "Does the pupil have to perform a task that is not part of the curriculum?"
 
-#: interventions/models.py:69
+#: interventions/models.py:75
 msgid ""
 "Moet het nog een taak doen, zoals het invullen van een "
 "(onderzoeks)vragenlijst, die niet binnen de interventie zelf valt?"
@@ -138,21 +138,21 @@ msgstr ""
 "For example, does the pupil have to fill out a (research) questionnaire that "
 "is not part of intervention?"
 
-#: interventions/models.py:75
+#: interventions/models.py:82
 msgid "Hoe vaak per week vindt de interventiesessie plaats?"
 msgstr "How many times a week will the intervention session take place?"
 
 #: interventions/templates/interventions/intervention_form.html:7
-#: interventions/templates/interventions/intervention_form.html:49
-#: proposals/utils/pdf_diff_logic.py:595
+#: interventions/templates/interventions/intervention_form.html:48
+#: proposals/utils/pdf_diff_logic.py:605
 msgid "Het interventieonderzoek"
 msgstr "Intervention study"
 
 #: interventions/templates/interventions/intervention_form.html:17
 #: main/models.py:50
-#: observations/templates/observations/observation_form.html:27
-#: studies/templates/studies/study_end.html:67
-#: studies/templates/studies/study_end.html:98
+#: observations/templates/observations/observation_form.html:26
+#: studies/templates/studies/study_end.html:65
+#: studies/templates/studies/study_end.html:96
 msgid "Setting"
 msgstr "Setting"
 
@@ -164,7 +164,7 @@ msgstr "Description of the intervention"
 msgid "Extra taak"
 msgstr "Extra task"
 
-#: interventions/templates/interventions/intervention_form.html:61
+#: interventions/templates/interventions/intervention_form.html:60
 msgid ""
 "Als je dit nog niet gedaan hebt, zul je op de vorige pagina naast "
 "\"interventie\" ook \"takenonderzoek\" moeten aanvinken, om je aanvraag "
@@ -174,25 +174,25 @@ msgstr ""
 "research\" on the previous page to answer the required task questions "
 "related to tasks."
 
-#: interventions/utils.py:11 studies/models.py:254
-#: studies/templates/studies/study_end.html:58
+#: interventions/utils.py:11 studies/models.py:270
+#: studies/templates/studies/study_end.html:56
 msgid "Interventieonderzoek"
 msgstr "Interventional research"
 
-#: interventions/views.py:19
+#: interventions/views.py:20
 msgid "Interventie opgeslagen"
 msgstr "Intervention saved"
 
 #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20
-#: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38
-#: main/forms/conditional_form.py:48 main/forms/mixins.py:83
-#: proposals/forms.py:544 proposals/forms.py:627 proposals/forms.py:642
-#: studies/forms.py:104 tasks/forms.py:87
+#: main/forms/conditional_form.py:31 main/forms/conditional_form.py:42
+#: main/forms/conditional_form.py:58 main/forms/mixins.py:81
+#: proposals/forms.py:614 proposals/forms.py:699 proposals/forms.py:720
+#: studies/forms.py:137 tasks/forms.py:104
 msgid "Dit veld is verplicht."
 msgstr "This field is required."
 
 #: main/menus.py:6 main/templates/main/index.html:7
-#: main/templates/main/index.html:56 main/templates/main/landing.html:34
+#: main/templates/main/index.html:53 main/templates/main/landing.html:33
 msgid "Startpagina"
 msgstr "Start page"
 
@@ -200,15 +200,15 @@ msgstr "Start page"
 msgid "Log in"
 msgstr "Log in"
 
-#: main/menus.py:16 main/templates/base/login_header.html:7
+#: main/menus.py:17 main/templates/base/login_header.html:7
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:8 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
+#: main/models.py:8 main/utils.py:15 proposals/utils/pdf_diff_logic.py:244
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:9 main/utils.py:15 proposals/utils/pdf_diff_logic.py:234
+#: main/models.py:9 main/utils.py:15 proposals/utils/pdf_diff_logic.py:244
 msgid "nee"
 msgstr "no"
 
@@ -220,13 +220,13 @@ msgstr "uncertain"
 msgid "Geef aan waar de dataverzameling plaatsvindt"
 msgstr "Specify where the data collection will take place"
 
-#: main/models.py:63 observations/models.py:129 proposals/models.py:252
-#: studies/models.py:200 studies/models.py:236 tasks/models.py:157
-#: tasks/models.py:169
+#: main/models.py:63 observations/models.py:139 proposals/models.py:282
+#: studies/models.py:211 studies/models.py:253 tasks/models.py:169
+#: tasks/models.py:181
 msgid "Namelijk"
 msgstr "Please specify"
 
-#: main/models.py:68
+#: main/models.py:69
 msgid ""
 "Vindt het afnemen van de taak plaats onder het toeziend oog van de leraar of "
 "een ander persoon die bevoegd is?"
@@ -234,13 +234,13 @@ msgstr ""
 "Will the task be conducted under the supervision of the teacher or another "
 "qualified person?"
 
-#: main/models.py:74
+#: main/models.py:76
 msgid "Is de testleider in het bezit van een VOG?"
 msgstr ""
 "Does the test leader hold a Certificate of Conduct (Verklaring Omtrent "
 "Gedrag, VOG)?"
 
-#: main/models.py:75
+#: main/models.py:78
 msgid ""
 "Iedereen die op een school werkt moet in het bezit         zijn van een "
 "Verklaring Omtrent Gedrag (VOG, zie         <a href=\"https://www.justis.nl/"
@@ -256,191 +256,187 @@ msgstr ""
 "role of the FEtC-H in this matter is just to inform the researchers that the "
 "school probably will ask about this certificate."
 
-#: main/templates/auth/user_detail.html:22
+#: main/templates/auth/user_detail.html:17
 msgid "Gebruiksersnaam"
 msgstr "Username"
 
-#: main/templates/auth/user_detail.html:30
-#: proposals/templates/proposals/proposal_pdf.html:119
+#: main/templates/auth/user_detail.html:21
+#: proposals/templates/proposals/proposal_pdf.html:117
 msgid "E-mail"
 msgstr "E-mail"
 
-#: main/templates/auth/user_detail.html:46
+#: main/templates/auth/user_detail.html:32
 msgid "Ingediende aanvragen"
 msgstr "My submitted applications;"
 
-#: main/templates/auth/user_detail.html:51 reviews/api/views.py:45
-#: reviews/api/views.py:276 reviews/api/views.py:338
-#: reviews/templates/reviews/committee_members_workload.html:25
+#: main/templates/auth/user_detail.html:36 reviews/api/views.py:46
+#: reviews/api/views.py:273 reviews/api/views.py:334
+#: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Referentienummer"
 msgstr "Reference number"
 
-#: main/templates/auth/user_detail.html:52
+#: main/templates/auth/user_detail.html:37
 #: reviews/templates/reviews/vue_templates/decision_list.html:105
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:55
 #: reviews/templates/reviews/vue_templates/review_list.html:110
 msgid "Eindverantwoordelijke"
 msgstr "Researcher with final responsibility"
 
-#: main/templates/auth/user_detail.html:53
+#: main/templates/auth/user_detail.html:38
 msgid "Titel aanvraag"
 msgstr "Proposed title"
 
-#: main/templates/auth/user_detail.html:54
+#: main/templates/auth/user_detail.html:39
 msgid "Fase"
 msgstr "Phase"
 
-#: main/templates/auth/user_detail.html:55 proposals/api/views.py:24
-#: proposals/api/views.py:92 proposals/api/views.py:122
-#: proposals/api/views.py:172
+#: main/templates/auth/user_detail.html:40 proposals/api/views.py:22
+#: proposals/api/views.py:89 proposals/api/views.py:112
+#: proposals/api/views.py:146
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:102
 #: proposals/templates/proposals/vue_templates/proposal_list.html:161
-#: reviews/api/views.py:49 reviews/api/views.py:280 reviews/api/views.py:342
-#: reviews/templates/reviews/committee_members_workload.html:26
+#: reviews/api/views.py:50 reviews/api/views.py:277 reviews/api/views.py:338
+#: reviews/templates/reviews/committee_members_workload.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:157
 msgid "Datum ingediend"
 msgstr "Date submitted"
 
-#: main/templates/auth/user_detail.html:56
-#: reviews/templates/reviews/committee_members_workload.html:27
+#: main/templates/auth/user_detail.html:41
+#: reviews/templates/reviews/committee_members_workload.html:26
 #: reviews/templates/reviews/vue_templates/decision_list.html:163
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105
 #: reviews/templates/reviews/vue_templates/review_list.html:167
 msgid "Gewenste einddatum"
 msgstr "Desired end date"
 
-#: main/templates/auth/user_detail.html:57
+#: main/templates/auth/user_detail.html:42
 #: reviews/templates/reviews/vue_templates/decision_list.html:118
 msgid "Mijn besluit"
 msgstr "My decision"
 
-#: main/templates/auth/user_detail.html:58 reviews/api/views.py:332
-#: reviews/models.py:43
+#: main/templates/auth/user_detail.html:43 reviews/api/views.py:328
+#: reviews/models.py:34
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
 #: reviews/templates/reviews/vue_templates/review_list.html:137
 msgid "Afhandeling"
 msgstr "Conclusion"
 
-#: main/templates/auth/user_detail.html:59
+#: main/templates/auth/user_detail.html:44
 #: tasks/templates/tasks/task_list.html:11
 msgid "Acties"
 msgstr "Actions"
 
-#: main/templates/auth/user_detail.html:75 reviews/models.py:125
+#: main/templates/auth/user_detail.html:60 reviews/models.py:117
 msgid ", met revisie"
 msgstr ", with revision"
 
-#: main/templates/auth/user_detail.html:84
+#: main/templates/auth/user_detail.html:69
 #: reviews/templates/reviews/vue_templates/decision_list.html:47
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:46
 #: reviews/templates/reviews/vue_templates/review_list.html:48
 msgid "Aanvraag inzien"
 msgstr "Examine application"
 
-#: main/templates/auth/user_detail.html:86
-#: reviews/templates/reviews/review_detail_sidebar.html:18
+#: main/templates/auth/user_detail.html:73
+#: reviews/templates/reviews/review_detail_sidebar.html:16
 #: reviews/templates/reviews/vue_templates/decision_list.html:50
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:49
 #: reviews/templates/reviews/vue_templates/review_list.html:51
 msgid "Details"
 msgstr "Details"
 
-#: main/templates/auth/user_detail.html:90
+#: main/templates/auth/user_detail.html:78
 #: reviews/templates/reviews/vue_templates/decision_list.html:59
 #: reviews/templates/reviews/vue_templates/review_list.html:60
 msgid "Aanstellen"
 msgstr "Appoint"
 
-#: main/templates/auth/user_detail.html:93
+#: main/templates/auth/user_detail.html:83
 #: reviews/templates/reviews/vue_templates/decision_list.html:78
 #: reviews/templates/reviews/vue_templates/review_list.html:71
 msgid "Afsluiten"
 msgstr "Conclude"
 
-#: main/templates/auth/user_detail.html:98
+#: main/templates/auth/user_detail.html:89
 #: reviews/templates/reviews/vue_templates/decision_list.html:84
 #: reviews/templates/reviews/vue_templates/review_list.html:77
 msgid "Website export tekst"
 msgstr "Website export text"
 
-#: main/templates/auth/user_detail.html:103
+#: main/templates/auth/user_detail.html:94
 #: proposals/templates/proposals/proposal_confirmation.html:7
 #: proposals/templates/proposals/proposal_confirmation.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:95
 #: reviews/templates/reviews/vue_templates/review_list.html:88
-#: reviews/utils/review_actions.py:245
+#: reviews/utils/review_actions.py:228
 msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
-#: main/templates/auth/user_detail.html:106
-#: proposals/templates/proposals/proposal_confirmation.html:34
+#: main/templates/auth/user_detail.html:97
+#: proposals/templates/proposals/proposal_confirmation.html:38
 #: reviews/templates/reviews/vue_templates/decision_list.html:90
 #: reviews/templates/reviews/vue_templates/review_list.html:83
 msgid "Bevestigingsbrief verstuurd"
 msgstr "Confirmation sent"
 
-#: main/templates/base/form_buttons.html:6
+#: main/templates/base/form_buttons.html:9
 msgid "<< Opslaan en vorige stap"
 msgstr "<< Save and go back to previous step"
 
-#: main/templates/base/form_buttons.html:10
-#: main/templates/base/form_buttons.html:14
-#: main/templates/base/form_buttons.html:18
+#: main/templates/base/form_buttons.html:13
+#: main/templates/base/form_buttons.html:17
+#: main/templates/base/form_buttons.html:21
 msgid "Terug naar begin aanvraag"
 msgstr "Return to start of application"
 
-#: main/templates/base/form_buttons.html:24
+#: main/templates/base/form_buttons.html:26
 msgid "Terug naar begin traject"
 msgstr "Back to the beginning of the trajectory"
 
-#: main/templates/base/form_buttons.html:29
+#: main/templates/base/form_buttons.html:30
 msgid "Terug naar begin sessie"
 msgstr "Back to the beginning of the session"
 
-#: main/templates/base/form_buttons.html:35
-msgid "Opslaan en volgende stap >>"
-msgstr "Save and go to next step >>"
-
 #: main/templates/base/login_header.html:6
 msgid "Welkom {}"
 msgstr "Welcome {}"
 
-#: main/templates/base/sidebar.html:27
+#: main/templates/base/sidebar.html:29
 msgid "Toon voortgang"
 msgstr "Show progress"
 
-#: main/templates/base/sidebar.html:30
+#: main/templates/base/sidebar.html:32
 msgid "Sluiten"
 msgstr "Close"
 
-#: main/templates/base/sidebar.html:31
+#: main/templates/base/sidebar.html:33
 msgid "Voortgang"
 msgstr "Progress"
 
-#: main/templates/base/site_header.html:2
+#: main/templates/base/site_header.html:3
 msgid "Portal FETC - Geesteswetenschappen"
 msgstr "Portal FEtC – Humanities"
 
-#: main/templates/base/site_title.html:2
+#: main/templates/base/site_title.html:3
 msgid "FETC-GW"
 msgstr "FEtC-H"
 
-#: main/templates/error/400.html:10 main/templates/error/500.html:9
+#: main/templates/error/400.html:10 main/templates/error/500.html:8
 msgid "Server error"
 msgstr "Server error"
 
-#: main/templates/error/400.html:13 main/templates/error/500.html:12
+#: main/templates/error/400.html:13 main/templates/error/500.html:10
 msgid "Er is een fout opgetreden tijdens het opvragen van deze pagina."
 msgstr "We encountered an error while processing your request."
 
-#: main/templates/error/400.html:18 main/templates/error/500.html:17
+#: main/templates/error/400.html:18 main/templates/error/500.html:15
 msgid "Blijft dit probleem aanhouden?"
 msgstr "If this problem persists; "
 
-#: main/templates/error/400.html:21 main/templates/error/403.html:41
-#: main/templates/error/403_csrf.html:39 main/templates/error/500.html:20
+#: main/templates/error/400.html:21 main/templates/error/403.html:31
+#: main/templates/error/403_csrf.html:27 main/templates/error/500.html:18
 #: reviews/templates/reviews/review_closed.html:37
 msgid ""
 "Neem dan contact op met het technisch beheer van de portal via <a "
@@ -449,27 +445,27 @@ msgstr ""
 "Please contact the technical support staff of the portal by email at <a "
 "href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>. "
 
-#: main/templates/error/403.html:9
+#: main/templates/error/403.html:8
 msgid "Geen toegang"
 msgstr "Access denied"
 
-#: main/templates/error/403.html:12
+#: main/templates/error/403.html:9
 msgid "Je hebt geen toegang tot de opgevraagde pagina."
 msgstr "You are not allowed to view this page."
 
-#: main/templates/error/403.html:16
+#: main/templates/error/403.html:11
 msgid "Dit kan meerdere oorzaken hebben:"
 msgstr "This may be caused by the following:"
 
-#: main/templates/error/403.html:20
+#: main/templates/error/403.html:13
 msgid "Je hebt niet de benodigde rechten om deze pagina te bekijken;"
 msgstr "You don't have the required permissions to view this page;"
 
-#: main/templates/error/403.html:23
+#: main/templates/error/403.html:14
 msgid "Je bent niet als mede-onderzoeker opgegeven voor deze aanvraag;"
 msgstr "You have not been added as a researcher to this application;"
 
-#: main/templates/error/403.html:26
+#: main/templates/error/403.html:16
 msgid ""
 "Je probeert een door jou eerder genomen beslissing aan te passen, maar de "
 "beoordelingsperiode is verstreken."
@@ -477,14 +473,14 @@ msgstr ""
 "You are trying to change one of your decisions, but the assessment period "
 "has expired."
 
-#: main/templates/error/403.html:32
+#: main/templates/error/403.html:22
 #, python-format
 msgid ""
-"Je bent niet ingelogd, probeer <a href=\"%(login_url)s\"> in te loggen</a>."
+"Je bent niet ingelogd, probeer <a href=\"%(login_url)s\">in te loggen</a>."
 msgstr ""
-"You are not logged in, please <a href=\"%(login_url)s\"> try to log in</a>."
+"You are not logged in, please <a href=\"%(login_url)s\" try to log in</a>."
 
-#: main/templates/error/403.html:38 main/templates/error/403_csrf.html:36
+#: main/templates/error/403.html:28 main/templates/error/403_csrf.html:24
 #: reviews/templates/reviews/review_closed.html:34
 msgid "Denk je dat dit niet klopt?"
 msgstr "Do you think this is in error?"
@@ -493,15 +489,15 @@ msgstr "Do you think this is in error?"
 msgid "Verificatie Fout"
 msgstr "Verification Error"
 
-#: main/templates/error/403_csrf.html:13
+#: main/templates/error/403_csrf.html:12
 msgid "Verzoek kon niet geverifieerd worden"
 msgstr "Request could not be verified"
 
-#: main/templates/error/403_csrf.html:16
+#: main/templates/error/403_csrf.html:13
 msgid "Er is iets fout gegaan met het verifiëren van je browser."
 msgstr "Something went wrong while verifying your browser"
 
-#: main/templates/error/403_csrf.html:19
+#: main/templates/error/403_csrf.html:15
 msgid ""
 "Dit kan meerdere oorzaken hebben, zoals het gebruik van een script- of ad-"
 "blocker, of je cookie-instellingen. Probeer eerst een <em>volledige "
@@ -510,33 +506,33 @@ msgstr ""
 "This can have several causes, like using a script- or ad-blocker, or your "
 "cookie settings. First try a <em>fresh refresh</em> of the page:"
 
-#: main/templates/error/403_csrf.html:23
+#: main/templates/error/403_csrf.html:18
 msgid "Voor Chrome: ctrl + F5 (Windows) of cmd + shift + R (Mac)"
 msgstr "For Chrome: ctrl + F5 (Windows) or cmd + shift + R (Mac)"
 
-#: main/templates/error/403_csrf.html:26
+#: main/templates/error/403_csrf.html:19
 msgid "Voor Firefox: ctrl + shift + R (Windows) of cmd + shift + R (Mac)"
 msgstr "For Firefox: ctrl + shift + R (Windows) or cmd + shift + R (Mac)"
 
-#: main/templates/error/403_csrf.html:29
+#: main/templates/error/403_csrf.html:20
 msgid "Voor Edge: ctrl + F5"
 msgstr "For Edge: ctrl + F5"
 
-#: main/templates/error/403_csrf.html:32
+#: main/templates/error/403_csrf.html:21
 msgid "Voor Safari: option + cmnd + E"
 msgstr "For Safari: option + cmnd + E"
 
-#: main/templates/error/404.html:9
+#: main/templates/error/404.html:8
 msgid "Pagina niet gevonden"
 msgstr "Page not found"
 
-#: main/templates/error/404.html:12
+#: main/templates/error/404.html:9
 msgid "Sorry, deze pagina is helaas niet (meer) beschikbaar."
 msgstr ""
 "We are sorry but the page (or document) you have requested is currently not "
 "available."
 
-#: main/templates/error/404.html:15
+#: main/templates/error/404.html:11
 msgid ""
 "Mogelijk ben je hier terechtgekomen via een verouderde of foutieve link. "
 "Graag vernemen wij welke link niet werkt. Je kan ons dat laten weten door <a "
@@ -548,7 +544,7 @@ msgstr ""
 "fetc-gw.wp.hum.uu.nl/contact/\" target=\"_blank\">contacting our secretary</"
 "a>. We will try to solve the problem as soon as possible."
 
-#: main/templates/error/500.html:23
+#: main/templates/error/500.html:21
 msgid ""
 "Maak hierbij zo veel mogelijk duidelijk wat je aan het doen was, en op welke "
 "pagina."
@@ -564,16 +560,16 @@ msgstr ""
 "This portal is intended for employees (and students) of the Faculty of "
 "Humanities."
 
-#: main/templates/main/index.html:24
+#: main/templates/main/index.html:23
 msgid "Volgens onze gegevens werk/studeer je bij de"
 msgstr "According to our information, you work/study at the"
 
-#: main/templates/main/index.html:29
+#: main/templates/main/index.html:28
 msgid ""
 "Volgens onze gegevens werk/studeer je bij een andere faculteit of dienst."
 msgstr "According to our data, you work/study at another faculty or service."
 
-#: main/templates/main/index.html:34
+#: main/templates/main/index.html:32
 msgid ""
 "Controleer of je inderdaad een aanvraag wilt indienen bij de Facultaire "
 "Ethische Toetsingscommissie van Geesteswetenschappen."
@@ -581,7 +577,7 @@ msgstr ""
 "Please check whether you indeed want to submit an application to the Faculty "
 "Ethics Assessment Committee – Humanities."
 
-#: main/templates/main/index.html:39
+#: main/templates/main/index.html:37
 msgid ""
 "Als je vermoedt dat dit incorrect is, neem dan contact op met <a "
 "href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>."
@@ -589,7 +585,7 @@ msgstr ""
 "If you suspect this is incorrect, please contact support at <a href=\"mailto:"
 "portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>. "
 
-#: main/templates/main/index.html:64
+#: main/templates/main/index.html:59
 msgid ""
 "Formele goedkeuring door één van beide kamers van de FETC-GW (middels een "
 "formele goedkeuringsbrief) is vereist voor mensgebonden onderzoek binnen de "
@@ -604,7 +600,7 @@ msgstr ""
 "even to recruiting participants. Therefore, always wait for the letter of "
 "approval before starting research activities."
 
-#: main/templates/main/index.html:71
+#: main/templates/main/index.html:64
 msgid ""
 "NB: Goedgekeurde aanvragen komen in het archief van deze portal te staan, "
 "zie het menu hierboven. Dit archief is toegankelijk voor iedereen met een "
@@ -614,7 +610,7 @@ msgstr ""
 "studying or working at the Faculty of Humanities with a Solis-ID can access "
 "this archive through the menu bar above."
 
-#: main/templates/main/index.html:79
+#: main/templates/main/index.html:69
 msgid ""
 "Heb je een vraag over de werking van de portal, ontdek je een foutje, "
 "missende functionaliteit, of verkeerde vertaling? Neem dan contact op met  "
@@ -625,23 +621,23 @@ msgstr ""
 "email to <a href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</"
 "a>."
 
-#: main/templates/main/index.html:86
+#: main/templates/main/index.html:75
 #: proposals/templates/proposals/proposal_start.html:16
-#: proposals/templates/proposals/proposal_start_practice.html:18
+#: proposals/templates/proposals/proposal_start_practice.html:16
 msgid "Check voor het indienen:"
 msgstr "Before submitting an application, please consult:"
 
-#: main/templates/main/index.html:89
+#: main/templates/main/index.html:78
 #: proposals/templates/proposals/proposal_start.html:19
-#: proposals/templates/proposals/proposal_start_practice.html:21
+#: proposals/templates/proposals/proposal_start_practice.html:19
 msgid ""
-"De <a href=\"https://fetc-gw.wp.hum.uu.nl/\" target=\"_blank\"> UU-webpagina "
+"De <a href=\"https://fetc-gw.wp.hum.uu.nl/\" target=\"_blank\">UU-webpagina "
 "van de FETC-GW</a> voor nieuws en de agenda."
 msgstr ""
 "The <a href=\"https://fetc-gw.wp.hum.uu.nl/en/\"  target=\"_blank\">UU-"
 "webpage of the FEtC-H</a> for news and upcoming dates."
 
-#: main/templates/main/index.html:96
+#: main/templates/main/index.html:84
 msgid ""
 "Het <a href=\"https://fetc-gw.wp.hum.uu.nl/reglement-fetc-gw/\" "
 "target=\"blank\">reglement van de FETC-GW</a>."
@@ -649,26 +645,26 @@ msgstr ""
 "The <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/\"  "
 "target=\"_blank\">regulations of the FEtC-H </a>."
 
-#: main/templates/main/index.html:102
+#: main/templates/main/index.html:90
 msgid ""
 "Gebruik de juiste (meest recente) <a href=\"https://intranet.uu.nl/"
 "documenten-ethische-toetsingscommissie-gw\" "
 "target=\"blank\">voorbeelddocumenten</a> voor de <em>informed consent</em>. "
-"(de laatstse versie is van <u>december 2021</u>)</li>"
+"(de laatstse versie is van <u>december 2021</u>) </li>"
 msgstr ""
 "Make sure to use the correct (most recent) <a href=\"https://intranet.uu.nl/"
 "en/documents-ethics-assessment-committee-humanities\" "
 "target=\"_blank\">model documents</a> for <em>informed consent</em>. (Latest "
 "version: <u>December 2021</u>)"
 
-#: main/templates/main/index.html:106
+#: main/templates/main/index.html:96
 msgid ""
-"<li>Voor advies over data management (plannen): <a href=\"mailto:"
-"datamanagement.gw@uu.nl\">datamanagement.gw@uu.nl</a>.</li> <li>Voor advies "
-"over privacy zaken: <a href=\"mailto:privacy.gw@uu.nl\">privacy.gw@uu.nl</a>."
-"</li> <li>Voor vragen over de procedure: <a href=\"mailto:fetc-gw@uu."
-"nl\">Desiree Capel</a>.</li> <li>Voor vragen over de portal zelf: <a "
-"href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>.</li>"
+"<li> Voor advies over data management (plannen): <a href=\"mailto:"
+"datamanagement.gw@uu.nl\">datamanagement.gw@uu.nl</a>. </li> <li> Voor "
+"advies over privacy zaken: <a href=\"mailto:privacy.gw@uu.nl\">privacy.gw@uu."
+"nl</a>. </li> <li> Voor vragen over de procedure: <a href=\"mailto:fetc-"
+"gw@uu.nl\">Desiree Capel</a>. </li> <li> Voor vragen over de portal zelf: <a "
+"href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>. </li>"
 msgstr ""
 "<li>For advice on data management: <a href=\"mailto:datamanagement.gw@uu."
 "nl\">datamanagement.gw@uu.nl</a>.</li> <li>For issues concerning privacy: <a "
@@ -678,97 +674,97 @@ msgstr ""
 "itself: <a href=\"mailto:portalsupport.gw@uu.nl\">portalsupport.gw@uu.nl</a>."
 "</li>"
 
-#: main/templates/main/index.html:115
+#: main/templates/main/index.html:112
 msgid "In deze portal kan je het volgende doen:"
 msgstr "In this portal you can do the following:"
 
-#: main/templates/main/index.html:124
+#: main/templates/main/index.html:120
 msgid "Dien een nieuwe aanvraag in"
 msgstr "Submit a new proposal"
 
-#: main/templates/main/index.html:129
+#: main/templates/main/index.html:124
 msgid "die volledig nieuw is in deze portal;"
 msgstr "that is completely new in this portal;"
 
-#: main/templates/main/index.html:132
+#: main/templates/main/index.html:127
 msgid "op basis van een kopie van een oude aanvraag;"
 msgstr "from a copy of an old proposal;"
 
-#: main/templates/main/index.html:135
+#: main/templates/main/index.html:130
 msgid "voor (al dan niet goedgekeurde) subsidieaanvragen;"
 msgstr "to supplement a grant application"
 
-#: main/templates/main/index.html:138
+#: main/templates/main/index.html:133
 msgid "die al goedgekeurd is door een andere ethische toetsingscomissie."
 msgstr "that has been approved by another ethics committee."
 
-#: main/templates/main/index.html:144
+#: main/templates/main/index.html:138
 msgid "Een aanvraag reviseren"
 msgstr "Revise a proposal"
 
-#: main/templates/main/index.html:149
+#: main/templates/main/index.html:142
 msgid "als een revisie, gebaseerd op opmerkingen van de FETC-GW;"
 msgstr "as a revision, based on comments of the FEtC-H;"
 
-#: main/templates/main/index.html:152
+#: main/templates/main/index.html:145
 msgid "als amendement, wanneer de aanvraag al goedgekeurd is door de FETC-GW."
 msgstr ""
 "as an amendment, after your proposal has already been approved by the FEtC-H."
 
-#: main/templates/main/index.html:160
+#: main/templates/main/index.html:152
 msgid "Bekijk"
 msgstr "View"
 
-#: main/templates/main/index.html:164
+#: main/templates/main/index.html:155
 msgid "mijn conceptaanvragen;"
 msgstr "my draft applications;"
 
-#: main/templates/main/index.html:167
+#: main/templates/main/index.html:158
 msgid "mijn oefenaanvragen;"
 msgstr "my practice applications;"
 
-#: main/templates/main/index.html:170
+#: main/templates/main/index.html:161
 msgid "mijn ingediende aanvragen;"
 msgstr "my submitted applications;"
 
-#: main/templates/main/index.html:173
+#: main/templates/main/index.html:164
 msgid "mijn afgehandelde aanvragen;"
 msgstr "my processed applications;"
 
-#: main/templates/main/index.html:176
+#: main/templates/main/index.html:167
 msgid "mijn aanvragen als eindverantwoordelijke;"
 msgstr "my supervised applications;"
 
-#: main/templates/main/index.html:179
+#: main/templates/main/index.html:170
 msgid "al mijn aanvragen."
 msgstr "all my applications"
 
-#: main/templates/main/index.html:183
+#: main/templates/main/index.html:173
 msgid "FETC-GW archief"
 msgstr "FEtC-H archive"
 
-#: main/templates/main/index.html:187
+#: main/templates/main/index.html:176
 msgid "Alle goedgekeurde aanvragen bekijken van de Algemene Kamer"
 msgstr "View all processed and approved applications of the General Chamber"
 
-#: main/templates/main/index.html:190
+#: main/templates/main/index.html:179
 msgid "Alle goedgekeurde aanvragen bekijken van de Linguïstiek Kamer"
 msgstr ""
 "View all processed and approved applications of the Linguistics Chamber"
 
-#: main/templates/main/index.html:205
+#: main/templates/main/index.html:190
 msgid "Reglement van de FETC-GW"
 msgstr "Regulations of the FEtC-H"
 
-#: main/templates/main/index.html:212
+#: main/templates/main/index.html:197
 msgid "Veelgestelde vragen m.b.t. dit portal"
 msgstr "Frequently asked questions relating to this portal"
 
-#: main/templates/main/index.html:222
+#: main/templates/main/index.html:204
 msgid "Bannerfoto door Kim O'leary"
 msgstr "Cover image by Kim O'leary"
 
-#: main/templates/main/landing.html:52
+#: main/templates/main/landing.html:50
 msgid ""
 "Welkom bij het portal van de Facultaire Ethische Toetsingscommissie "
 "Geesteswetenschappen (FETC-GW)."
@@ -776,8 +772,8 @@ msgstr ""
 "Welcome to the portal of the Faculty Ethics assessment Committee Humanities "
 "(FEtC-H)"
 
-#: main/templates/main/landing.html:58
-#: main/templates/registration/logged_out.html:22
+#: main/templates/main/landing.html:56
+#: main/templates/registration/logged_out.html:18
 msgid ""
 "Klik <a href=\"http://fetc-gw.wp.hum.uu.nl\">hier</a> om terug te keren naar "
 "de FETC-GW-website."
@@ -785,25 +781,25 @@ msgstr ""
 "Click <a href=\"http://fetc-gw.wp.hum.uu.nl/en/\">here</a> to return to the "
 "FEtC-H website."
 
-#: main/templates/main/landing.html:62
+#: main/templates/main/landing.html:60
 msgid "Contact"
 msgstr "Contact"
 
-#: main/templates/main/landing.html:64
+#: main/templates/main/landing.html:62
 msgid "Secretaris FETC-GW"
 msgstr "FEtC-H Secretary"
 
-#: main/templates/main/landing.html:66 main/templates/main/landing.html:72
+#: main/templates/main/landing.html:65 main/templates/main/landing.html:72
 msgid "Om hier een e-mail adres te zien moet Javascript aan staan"
 msgstr "Javascript needs to be enabled to see the email address"
 
-#: main/templates/main/landing.html:70
+#: main/templates/main/landing.html:69
 msgid "Technische ondersteuning"
 msgstr "Technical support"
 
 #: main/templates/main/landing.html:77
-#: main/templates/registration/login.html:15
-#: main/templates/registration/login.html:32
+#: main/templates/registration/login.html:14
+#: main/templates/registration/login.html:37
 msgid "Inloggen"
 msgstr "Log in"
 
@@ -815,59 +811,59 @@ msgstr ""
 "You need a Solis-ID to log in. If you do not have a Solis ID, please contact "
 "the secretary of the FEtC-H."
 
-#: main/templates/main/landing.html:86 main/templates/main/landing.html:93
+#: main/templates/main/landing.html:87 main/templates/main/landing.html:96
 msgid "Log in met je Solis-ID"
 msgstr "Log in with your Solis-ID"
 
-#: main/templates/registration/logged_out.html:9
+#: main/templates/registration/logged_out.html:8
 msgid "Uitloggen"
 msgstr "Log out"
 
-#: main/templates/registration/logged_out.html:12
+#: main/templates/registration/logged_out.html:9
 msgid "Je bent succesvol uitgelogd."
 msgstr "You have logged out succesfully"
 
-#: main/templates/registration/logged_out.html:17
+#: main/templates/registration/logged_out.html:13
 #, python-format
 msgid ""
 "Klik  <a href=\"%(landing_url)s\">hier</a> om naar de startpagina te gaan."
 msgstr ""
 "Click <a href=\"%(landing_url)s\">here</a> to return to the start page."
 
-#: main/templates/registration/login.html:23
+#: main/templates/registration/login.html:20
 msgid ""
 "Gebruikersnaam of wachtwoord incorrect. Probeer het alstublieft opnieuw."
 msgstr "Username or password incorrect. Please try again."
 
-#: main/templates/registration/login.html:27
+#: main/templates/registration/login.html:22
 msgid "Je kan hier inloggen met je Solis-ID en wachtwoord."
 msgstr "You can log in here with your Solis-ID and password."
 
-#: main/templates/registration/login.html:30
+#: main/templates/registration/login.html:29
 msgid "Gebruikersnaam"
 msgstr "Username"
 
-#: main/templates/registration/login.html:31
+#: main/templates/registration/login.html:35
 msgid "Wachtwoord"
 msgstr "Password"
 
-#: main/templatetags/compare_tags.py:80
+#: main/templatetags/compare_tags.py:63
 #: proposals/templates/proposals/vue_templates/proposal_list.html:51
-#: reviews/templates/reviews/review_detail_sidebar.html:34
-#: reviews/templates/reviews/simple_compare_link.html:8
+#: reviews/templates/reviews/review_detail_sidebar.html:30
+#: reviews/templates/reviews/simple_compare_link.html:7
 #: reviews/templates/reviews/vue_templates/decision_list.html:53
 #: reviews/templates/reviews/vue_templates/review_list.html:54
 msgid "Toon verschillen"
 msgstr "Show differences"
 
-#: main/validators.py:14
+#: main/validators.py:17
 #, python-format
 msgid "Dit veld mag maximaal %(limit_value)d woord bevatten."
 msgid_plural "Dit veld mag maximaal %(limit_value)d woorden bevatten."
 msgstr[0] "This field can contain a maximum of %(limit_value)d word."
 msgstr[1] "This field can contain a maximum of %(limit_value)d words."
 
-#: main/validators.py:23
+#: main/validators.py:28
 msgid "Alleen .pdf- of .doc(x)-bestanden zijn toegestaan."
 msgstr "Only .pdf or .doc(x) files are accepted."
 
@@ -886,11 +882,11 @@ msgstr ""
 "will be observed. For example: The teacher will be observed. The observation "
 "of interest is the interaction between the teacher and their pupils."
 
-#: observations/models.py:40
+#: observations/models.py:41
 msgid "Beschrijf <b>waarom</b> er wordt geobserveerd."
 msgstr "Describe <b>why</b> the participant will be observed."
 
-#: observations/models.py:42
+#: observations/models.py:43
 msgid ""
 "Wat is het doel van de observatie? Bijvoorbeeld: Het doel van de observatie "
 "is inzicht te krijgen in hoe de leerkracht omgaat met de uitleg van de "
@@ -902,42 +898,42 @@ msgstr ""
 "method. One question to be answered will be whether the teachers explain the "
 "new method well in understandable language."
 
-#: observations/models.py:51
+#: observations/models.py:52
 msgid "Beschrijf <b>hoe vaak en hoe lang</b> de observant wordt geobserveerd."
 msgstr ""
 "Describe <b>how often and how long</b> the participant will be observed."
 
-#: observations/models.py:52
+#: observations/models.py:54
 msgid ""
 "Bijvoorbeeld: De leraar zal 5 lessen van 45 minuten worden geobserveerd."
 msgstr ""
 "For example: Each teacher will be observed during 5 lessons of 45 minutes."
 
-#: observations/models.py:58
+#: observations/models.py:61
 msgid "Wordt er anoniem geobserveerd?"
 msgstr "Will the observation be anonymous?"
 
-#: observations/models.py:60
+#: observations/models.py:63
 msgid ""
 "Zoals zou kunnen voorkomen op fora en de onderzoeker ook een account heeft."
 msgstr "As might happen on forums where the researcher also has an account."
 
-#: observations/models.py:65 observations/models.py:75
-#: observations/models.py:88 proposals/models.py:742 studies/models.py:164
-#: studies/models.py:220 studies/models.py:350
+#: observations/models.py:69 observations/models.py:79
+#: observations/models.py:94 proposals/models.py:793 studies/models.py:170
+#: studies/models.py:232 studies/models.py:392
 msgid "Licht toe"
 msgstr "Explain"
 
-#: observations/models.py:70
+#: observations/models.py:74
 msgid "Doet de onderzoeker zich voor als behorende tot de doelgroep?"
 msgstr ""
 "Will the researcher present themselves as belonging to the target group?"
 
-#: observations/models.py:80
+#: observations/models.py:84
 msgid "Wordt er geobserveerd in een niet-openbare ruimte?"
 msgstr "Will observations be made in a non-public space?"
 
-#: observations/models.py:81
+#: observations/models.py:86
 msgid ""
 "Bijvoorbeeld er wordt geobserveerd bij iemand thuis, tijdens een "
 "hypotheekgesprek, tijdens politieverhoren of een forum waar een account voor "
@@ -947,11 +943,11 @@ msgstr ""
 "negotiation, during a police interrogation or in a forum for which an "
 "account must be created."
 
-#: observations/models.py:93
+#: observations/models.py:99
 msgid "Vindt informed consent van tevoren plaats?"
 msgstr "Will informed consent take place beforehand?"
 
-#: observations/models.py:99
+#: observations/models.py:105
 msgid ""
 "Leg uit waarom informed consent niet van te voren plaatsvindt en geef ook op "
 "welke wijze dit achteraf verzorgd wordt."
@@ -959,7 +955,7 @@ msgstr ""
 "Please explain why informed consent is not taken beforehand and how it will "
 "be taken afterwards."
 
-#: observations/models.py:106
+#: observations/models.py:113
 msgid ""
 "Heb je toestemming nodig van een (samenwerkende) instantie om deze "
 "observatie te mogen uitvoeren?"
@@ -967,15 +963,15 @@ msgstr ""
 "Do you need permission from a (collaborating) institution in order to carry "
 "out this observation?"
 
-#: observations/models.py:112
+#: observations/models.py:120
 msgid "Welke instantie?"
 msgstr "Which institution?"
 
-#: observations/models.py:118
+#: observations/models.py:126
 msgid "Upload hier het toestemmingsdocument (in .pdf of .doc(x)-formaat)"
 msgstr "Upload the permission document (in .pdf or .doc(x)-format) here"
 
-#: observations/models.py:125
+#: observations/models.py:134
 msgid ""
 "Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het "
 "gebruik van de term ‘anoniem’ of ‘geanonimiseerd’ in je documenten voor "
@@ -993,55 +989,55 @@ msgstr ""
 "versie-1.1_21dec2021.pdf' target='_blank'>Guidelines for Informed Consent, "
 "‘Audio and Video’</a>."
 
-#: observations/models.py:126
+#: observations/models.py:136
 msgid "Hoe wordt het gedrag geregistreerd?"
 msgstr "How will the behaviour be recorded?"
 
-#: observations/models.py:135
+#: observations/models.py:143
 msgid "Op hoeveel dagen wordt er geobserveerd (per deelnemer)?"
 msgstr "How many days will observations be taken on (per participant)?"
 
-#: observations/models.py:139
+#: observations/models.py:148
 msgid "Hoeveel uur wordt er gemiddeld per dag geobserveerd?"
 msgstr "How many hours of observation will take place on average per day?"
 
 #: observations/templates/observations/observation_form.html:7
-#: observations/templates/observations/observation_form.html:44
-#: proposals/utils/pdf_diff_logic.py:651
+#: observations/templates/observations/observation_form.html:42
+#: proposals/utils/pdf_diff_logic.py:661
 msgid "Het observatieonderzoek"
 msgstr "Observational study"
 
-#: observations/templates/observations/observation_form.html:28
+#: observations/templates/observations/observation_form.html:27
 msgid "Details observatie"
 msgstr "Details of observation"
 
-#: observations/templates/observations/observation_form.html:29
+#: observations/templates/observations/observation_form.html:28
 msgid "Anonimiteit"
 msgstr "Anonymity"
 
-#: observations/templates/observations/observation_form.html:30
+#: observations/templates/observations/observation_form.html:29
 msgid "Toestemming"
 msgstr "Permission"
 
-#: observations/templates/observations/observation_form.html:31
+#: observations/templates/observations/observation_form.html:30
 msgid "Registratie gedrag"
 msgstr "Recording behaviour"
 
 #: observations/templates/observations/observation_update_attachments.html:7
-#: observations/templates/observations/observation_update_attachments.html:27
-#: observations/templates/observations/observation_update_attachments.html:38
+#: observations/templates/observations/observation_update_attachments.html:26
+#: observations/templates/observations/observation_update_attachments.html:41
 #: proposals/templates/proposals/proposal_update_attachments.html:7
-#: proposals/templates/proposals/proposal_update_attachments.html:14
-#: proposals/templates/proposals/proposal_update_attachments.html:25
+#: proposals/templates/proposals/proposal_update_attachments.html:13
+#: proposals/templates/proposals/proposal_update_attachments.html:28
 #: proposals/templates/proposals/proposal_update_date_start.html:7
 #: studies/templates/studies/study_update_attachments.html:7
-#: studies/templates/studies/study_update_attachments.html:14
-#: studies/templates/studies/study_update_attachments.html:25
+#: studies/templates/studies/study_update_attachments.html:13
+#: studies/templates/studies/study_update_attachments.html:28
 msgid "Formulieren aanpassen"
 msgstr "Change forms"
 
-#: observations/templates/observations/observation_update_attachments.html:30
-#: studies/templates/studies/study_update_attachments.html:17
+#: observations/templates/observations/observation_update_attachments.html:28
+#: studies/templates/studies/study_update_attachments.html:15
 #, python-format
 msgid ""
 "Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag "
@@ -1050,47 +1046,47 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>), trajectory %(order)s."
 
-#: observations/templates/observations/observation_update_attachments.html:39
-#: proposals/templates/proposals/proposal_confirmation.html:36
-#: proposals/templates/proposals/proposal_diff.html:58
-#: proposals/templates/proposals/proposal_update_attachments.html:26
-#: proposals/templates/proposals/proposal_update_date_start.html:29
-#: reviews/templates/reviews/change_chamber_form.html:19
-#: reviews/templates/reviews/decision_form.html:90
+#: observations/templates/observations/observation_update_attachments.html:43
+#: proposals/templates/proposals/proposal_confirmation.html:39
+#: proposals/templates/proposals/proposal_diff.html:55
+#: proposals/templates/proposals/proposal_update_attachments.html:30
+#: proposals/templates/proposals/proposal_update_date_start.html:33
+#: reviews/templates/reviews/change_chamber_form.html:23
+#: reviews/templates/reviews/decision_form.html:93
 #: reviews/templates/reviews/review_assign_form.html:46
-#: reviews/templates/reviews/review_close_form.html:41
-#: reviews/templates/reviews/review_discontinue_form.html:72
-#: studies/templates/studies/study_update_attachments.html:26
+#: reviews/templates/reviews/review_close_form.html:40
+#: reviews/templates/reviews/review_discontinue_form.html:70
+#: studies/templates/studies/study_update_attachments.html:30
 msgid "Terug naar de vorige pagina"
 msgstr "Back to the previous page"
 
-#: observations/utils.py:8 studies/models.py:257
-#: studies/templates/studies/study_end.html:89
+#: observations/utils.py:8 studies/models.py:271
+#: studies/templates/studies/study_end.html:87
 msgid "Observatieonderzoek"
 msgstr "Observational research"
 
-#: observations/views.py:20
+#: observations/views.py:21
 msgid "Observatie opgeslagen"
 msgstr "Observation saved"
 
-#: proposals/api/views.py:28 proposals/api/views.py:130
-#: proposals/api/views.py:176
+#: proposals/api/views.py:23 proposals/api/views.py:116
+#: proposals/api/views.py:147
 msgid "Datum afgerond"
 msgstr "Date reviewed"
 
-#: proposals/api/views.py:32 proposals/api/views.py:77
-#: proposals/api/views.py:96 proposals/api/views.py:134
-#: proposals/api/views.py:155
+#: proposals/api/views.py:24 proposals/api/views.py:77
+#: proposals/api/views.py:90 proposals/api/views.py:117
+#: proposals/api/views.py:133
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:71
 #: proposals/templates/proposals/vue_templates/proposal_list.html:116
 msgid "Laatst bijgewerkt"
 msgstr "Last edited"
 
-#: proposals/api/views.py:126
+#: proposals/api/views.py:114
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:43 proposals/models.py:218
+#: proposals/forms.py:58 proposals/models.py:242
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1099,19 +1095,19 @@ msgstr ""
 "Are there any other researchers involved <strong>outside</strong> the above-"
 "mentioned institutes? "
 
-#: proposals/forms.py:64 proposals/validators.py:25
+#: proposals/forms.py:79 proposals/validators.py:22
 msgid "Er bestaat al een aanvraag met deze titel."
 msgstr "There is an existing application with this title."
 
-#: proposals/forms.py:134
+#: proposals/forms.py:144
 msgid "Selecteer..."
 msgstr "Select..."
 
-#: proposals/forms.py:141
+#: proposals/forms.py:153
 msgid "Docent"
 msgstr "Professor"
 
-#: proposals/forms.py:142
+#: proposals/forms.py:155
 msgid ""
 "Vul hier de docent van de cursus in waarbinnen je deze portal moet "
 "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De "
@@ -1122,23 +1118,23 @@ msgstr ""
 "This application will not be published in the semipublic archive of the FEtC-"
 "H."
 
-#: proposals/forms.py:193
+#: proposals/forms.py:207
 msgid "Je dient een promotor/begeleider op te geven."
 msgstr "You are required to specify a promotor/supervisor."
 
-#: proposals/forms.py:200
+#: proposals/forms.py:213
 msgid "Je kunt niet jezelf als promotor/begeleider opgeven."
 msgstr "You cannot submit yourself as the promotor/supervisor."
 
-#: proposals/forms.py:214
+#: proposals/forms.py:227
 msgid "Je hebt jezelf niet als onderzoekers geselecteerd."
 msgstr "You have not selected yourself."
 
-#: proposals/forms.py:219
+#: proposals/forms.py:232
 msgid "Je hebt geen andere onderzoekers geselecteerd."
 msgstr "You have not selected any other researchers."
 
-#: proposals/forms.py:229
+#: proposals/forms.py:243
 msgid ""
 "Dit veld is verplicht, maar je kunt later terugkomen om "
 "hem                     verder in te vullen."
@@ -1146,7 +1142,7 @@ msgstr ""
 "This field is required, but you may choose to come back to this page later "
 "to fill it in."
 
-#: proposals/forms.py:239
+#: proposals/forms.py:254
 msgid ""
 "Indien je geen toestemming hebt van een andere ethische commissie, dien je "
 "het normale formulier in te vullen. Ga terug naar de startpagina, en "
@@ -1159,23 +1155,23 @@ msgstr ""
 "page, and select \"Submit a new application that is completely new in this "
 "portal\" or \"from a copy of an old application.\""
 
-#: proposals/forms.py:266
+#: proposals/forms.py:286
 msgid "Ik maak een oefenaanvraag aan"
 msgstr "I am creating a practice application"
 
-#: proposals/forms.py:281 proposals/models.py:535
+#: proposals/forms.py:302 proposals/models.py:586
 msgid "Te kopiëren aanvraag"
 msgstr "Application to be copied"
 
-#: proposals/forms.py:283 proposals/models.py:537
+#: proposals/forms.py:304 proposals/models.py:588
 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent."
 msgstr "This field shows only applications in which you are involved."
 
-#: proposals/forms.py:321
+#: proposals/forms.py:346
 msgid "Te reviseren aanvraag"
 msgstr "Application to be revised"
 
-#: proposals/forms.py:322
+#: proposals/forms.py:348
 msgid ""
 "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij "
 "een medeuitvoerende bent."
@@ -1183,70 +1179,70 @@ msgstr ""
 "This field only shows submitted applications that have not been approved "
 "(yet) in which you are involved."
 
-#: proposals/forms.py:346
+#: proposals/forms.py:379
 msgid "Te amenderen aanvraag"
 msgstr "Application to be amended"
 
-#: proposals/forms.py:347
+#: proposals/forms.py:381
 msgid ""
 "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende "
 "bent."
 msgstr "This field shows only approved applications in which you are involved."
 
-#: proposals/forms.py:402 proposals/forms.py:532 proposals/forms.py:561
-#: proposals/forms.py:675
+#: proposals/forms.py:439 proposals/forms.py:598 proposals/forms.py:630
+#: proposals/forms.py:752
 msgid "Dit veld is verplicht om verder te gaan."
 msgstr "This field is required to continue."
 
-#: proposals/forms.py:410
+#: proposals/forms.py:449
 msgid "Je dient een instelling op te geven."
 msgstr "You are required to specify an institution."
 
-#: proposals/forms.py:468
+#: proposals/forms.py:515
 msgid "In dit geval is een beslissing van een METC vereist"
 msgstr "In this case, a decision by a METC is required"
 
-#: proposals/forms.py:476
+#: proposals/forms.py:524
 msgid "Naam traject 1"
 msgstr "Title of trajectory 1"
 
-#: proposals/forms.py:478
+#: proposals/forms.py:527
 msgid "Naam traject 2"
 msgstr "Title of trajectory 2"
 
-#: proposals/forms.py:480
+#: proposals/forms.py:530
 msgid "Naam traject 3"
 msgstr "Title of trajectory 3"
 
-#: proposals/forms.py:482
+#: proposals/forms.py:533
 msgid "Naam traject 4"
 msgstr "Title of trajectory 4"
 
-#: proposals/forms.py:484
+#: proposals/forms.py:536
 msgid "Naam traject 5"
 msgstr "Title of trajectory 5"
 
-#: proposals/forms.py:486
+#: proposals/forms.py:539
 msgid "Naam traject 6"
 msgstr "Title of trajectory 6"
 
-#: proposals/forms.py:488
+#: proposals/forms.py:542
 msgid "Naam traject 7"
 msgstr "Title of trajectory 7"
 
-#: proposals/forms.py:490
+#: proposals/forms.py:545
 msgid "Naam traject 8"
 msgstr "Title of trajectory 8"
 
-#: proposals/forms.py:492
+#: proposals/forms.py:548
 msgid "Naam traject 9"
 msgstr "Title of trajectory 9"
 
-#: proposals/forms.py:494
+#: proposals/forms.py:551
 msgid "Naam traject 10"
 msgstr "Title of trajectory 10"
 
-#: proposals/forms.py:538
+#: proposals/forms.py:606
 msgid ""
 "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee "
 "verschillende trajecten zijn."
@@ -1254,19 +1250,19 @@ msgstr ""
 "If different trajectories are used, at least two different trajectories "
 "should be filled in."
 
-#: proposals/forms.py:572
+#: proposals/forms.py:641
 msgid "Nieuwe beoogde startdatum"
 msgstr "New intended start date"
 
-#: proposals/forms.py:634
+#: proposals/forms.py:708
 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd."
 msgstr "Declaration of consent for trajectory {} not yet added."
 
-#: proposals/forms.py:638
+#: proposals/forms.py:715
 msgid "Informatiebrief voor traject {} nog niet toegevoegd."
 msgstr "Information letter for trajectory {} not yet added."
 
-#: proposals/forms.py:650
+#: proposals/forms.py:729
 msgid ""
 "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar "
 "van vandaag."
@@ -1274,7 +1270,7 @@ msgstr ""
 "The embargo-period can last a maximum of 2 years. Pick a date within 2 years "
 "from today."
 
-#: proposals/forms.py:681
+#: proposals/forms.py:761
 msgid "Vul in in welke talen de formulieren worden vertaald."
 msgstr "Please fill in the languages"
 
@@ -1291,112 +1287,112 @@ msgid ""
 "Nieuwe aanvraag starten voor (al dan niet goedgekeurde) subsidieaanvragen"
 msgstr "Start a new application to supplement a grant application"
 
-#: proposals/menus.py:21
+#: proposals/menus.py:22
 msgid ""
 "Nieuwe aanvraag starten (die al goedgekeurd is door een andere ethische "
 "toetsingscomissie)"
 msgstr ""
 "Start a new application (that has been approved by another ethics committee)"
 
-#: proposals/menus.py:26
+#: proposals/menus.py:28
 msgid "Nieuwe oefenaanvraag starten"
 msgstr "Start a new practice application"
 
-#: proposals/menus.py:30
+#: proposals/menus.py:32
 msgid "Maak een revisie van een bestaande aanvraag"
 msgstr "Create a revision for an existing application"
 
-#: proposals/menus.py:34
+#: proposals/menus.py:36
 msgid "Maak een amendement van een al goedgekeurde aanvraag"
 msgstr "Create an amendment to an already approved application"
 
-#: proposals/menus.py:42
+#: proposals/menus.py:44
 msgid "Nieuwe aanvraag"
 msgstr "New application"
 
-#: proposals/menus.py:52
+#: proposals/menus.py:54
 msgid "Al mijn aanvragen"
 msgstr "All my applications"
 
-#: proposals/menus.py:56 proposals/views/proposal_views.py:78
+#: proposals/menus.py:58 proposals/views/proposal_views.py:98
 msgid "Mijn conceptaanvragen"
 msgstr "My draft applications"
 
-#: proposals/menus.py:60 proposals/views/proposal_views.py:128
+#: proposals/menus.py:62 proposals/views/proposal_views.py:157
 msgid "Mijn oefenaanvragen"
 msgstr "My practice applications"
 
-#: proposals/menus.py:64 proposals/views/proposal_views.py:90
+#: proposals/menus.py:66 proposals/views/proposal_views.py:112
 msgid "Mijn ingediende aanvragen"
 msgstr "My submitted applications"
 
-#: proposals/menus.py:68 proposals/views/proposal_views.py:102
+#: proposals/menus.py:70 proposals/views/proposal_views.py:126
 msgid "Mijn afgehandelde aanvragen"
 msgstr "My processed applications"
 
-#: proposals/menus.py:72 proposals/views/proposal_views.py:114
+#: proposals/menus.py:74 proposals/views/proposal_views.py:140
 msgid "Mijn aanvragen als eindverantwoordelijke"
 msgstr "My supervised applications"
 
-#: proposals/menus.py:80
+#: proposals/menus.py:82
 msgid "Mijn aanvragen"
 msgstr "My applications"
 
-#: proposals/menus.py:90
+#: proposals/menus.py:92
 msgid "Bekijk alle goedgekeurde aanvragen van de Algemene Kamer"
 msgstr "View all approved applications of the General Chamber"
 
-#: proposals/menus.py:95
+#: proposals/menus.py:97
 msgid "Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"
 msgstr "View all approved applications of the Linguistics Chamber"
 
-#: proposals/menus.py:100
+#: proposals/menus.py:102
 msgid "Site-export"
 msgstr "Site-export"
 
-#: proposals/menus.py:110 proposals/views/proposal_views.py:155
+#: proposals/menus.py:112 proposals/views/proposal_views.py:185
 msgid "Archief"
 msgstr "Archive"
 
-#: proposals/mixins.py:20
+#: proposals/mixins.py:21
 #, python-format
 msgid "Aanvraag %(title)s bewerkt"
 msgstr "Application %(title)s edited"
 
-#: proposals/models.py:137
+#: proposals/models.py:152
 msgid "Concept"
 msgstr "Draft"
 
-#: proposals/models.py:138
+#: proposals/models.py:154
 msgid "Opgestuurd ter beoordeling door eindverantwoordelijke"
 msgstr "Sent for assessment by the researcher with final responsibility"
 
-#: proposals/models.py:139
+#: proposals/models.py:156
 msgid "Opgestuurd ter beoordeling door FETC-GW"
 msgstr "Sent for assessment by FEtC-H"
 
-#: proposals/models.py:140 proposals/models.py:141
+#: proposals/models.py:157 proposals/models.py:158
 msgid "Aanvraag is beoordeeld door FETC-GW"
 msgstr "Application has been assessed by FEtC-H"
 
-#: proposals/models.py:144
+#: proposals/models.py:161
 msgid "om de portal te exploreren"
 msgstr "to explore the portal"
 
-#: proposals/models.py:145
+#: proposals/models.py:162
 msgid "in het kader van een cursus"
 msgstr "in the context of a course"
 
 # Not actually used in the interface
-#: proposals/models.py:157
+#: proposals/models.py:172
 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?"
 msgstr "Which chamber should be reviewing this application?"
 
-#: proposals/models.py:166
+#: proposals/models.py:179
 msgid "Aan welk onderzoeksinstituut ben je verbonden?"
 msgstr "To which research institute are you affiliated?"
 
-#: proposals/models.py:172
+#: proposals/models.py:185
 msgid ""
 "Wat is de beoogde startdatum van het onderzoek waarvoor deze aanvraag wordt "
 "ingediend?"
@@ -1404,7 +1400,7 @@ msgstr ""
 "What is the desired starting date of the actual research for which this "
 "application is being submitted?"
 
-#: proposals/models.py:173
+#: proposals/models.py:188
 msgid ""
 "NB: Voor een aanvraag van een onderzoek dat al gestart is voordat de FETC-GW "
 "de aanvraag heeft goedgekeurd kan geen formele goedkeuring meer gegeven "
@@ -1414,7 +1410,7 @@ msgstr ""
 "has approved it cannot receive formal approval; in such cases, the FEtC-H "
 "only provides a post-hoc advice."
 
-#: proposals/models.py:182
+#: proposals/models.py:198
 msgid ""
 "Wat is de titel van je aanvraag? Deze titel zal worden gebruikt in alle "
 "formele correspondentie."
@@ -1422,7 +1418,7 @@ msgstr ""
 "What is the title of your application? This title will be used in all formal "
 "correspondence."
 
-#: proposals/models.py:187
+#: proposals/models.py:204
 msgid ""
 "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer "
 "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van "
@@ -1434,7 +1430,7 @@ msgstr ""
 "portal. The title cannot be identical to that of a study you have previously "
 "submitted."
 
-#: proposals/models.py:195
+#: proposals/models.py:213
 msgid ""
 "Geef een duidelijke, bondige beschrijving van de onderzoeksvraag of -vragen. "
 "Gebruik maximaal 200 woorden."
@@ -1442,7 +1438,7 @@ msgstr ""
 "Give a clear, concise description of the research question or questions. Use "
 "a maximum of 200 words."
 
-#: proposals/models.py:203
+#: proposals/models.py:221
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die geaffilieerd "
 "zijn aan één van de onderzoeksinstituten ICON, OFR, OGK of ILS?"
@@ -1450,7 +1446,7 @@ msgstr ""
 "Are there any other researchers involved affiliated with ICON, OFR, OGK or "
 "ILS?"
 
-#: proposals/models.py:206
+#: proposals/models.py:226
 msgid ""
 "Werk je samen met een onderzoeker of organisatie buiten de UU en is je "
 "onderzoek niet strikt anoniem? Neem dan contact op met de <a href=\"mailto:"
@@ -1462,11 +1458,11 @@ msgstr ""
 "gw@uu.nl\">privacy officer</a>. Agreements may then have to be made about "
 "the processing of personal data."
 
-#: proposals/models.py:226
+#: proposals/models.py:252
 msgid "Andere betrokkenen"
 msgstr "Other people involved"
 
-#: proposals/models.py:231
+#: proposals/models.py:259
 msgid ""
 "Worden de informed consent formulieren nog vertaald naar een andere taal dan "
 "Nederlands of Engels?"
@@ -1474,30 +1470,30 @@ msgstr ""
 "Will the informed consent forms be translated in a language other than Dutch "
 "or English?"
 
-#: proposals/models.py:238
+#: proposals/models.py:268
 msgid "Andere talen:"
 msgstr "Other languages:"
 
-#: proposals/models.py:247
+#: proposals/models.py:277
 msgid "Hoe wordt dit onderzoek gefinancierd?"
 msgstr "How is this study funded?"
 
-#: proposals/models.py:258
+#: proposals/models.py:288
 msgid ""
 "Wat is de naam van het gefinancierde project en wat is het projectnummer?"
 msgstr "What is the name of the funded project and what is the project number?"
 
-#: proposals/models.py:262
+#: proposals/models.py:292
 msgid ""
 "De titel die je hier opgeeft zal in de formele toestemmingsbrief gebruikt "
 "worden."
 msgstr "This title will be used in the formal letter of approval."
 
-#: proposals/models.py:268
+#: proposals/models.py:298
 msgid "Ruimte voor eventuele opmerkingen. Gebruik maximaal 1000 woorden."
 msgstr "Space for possible comments. Use a maximum of a 1000 words."
 
-#: proposals/models.py:274
+#: proposals/models.py:305
 msgid ""
 "<p>Je hebt aangegeven dat je gebruik wilt gaan maken van één van de "
 "faciliteiten van het ILS, namelijk de database, Zep software en/of het ILS "
@@ -1520,7 +1516,7 @@ msgstr ""
 "> - The title of the study <br/> - The planned starting date <br/> - The "
 "facilities you intend to use (database, lab, Zep software)"
 
-#: proposals/models.py:294
+#: proposals/models.py:327
 msgid ""
 "Als de deelnemers van je onderzoek moeten worden misleid, kan           je "
 "ervoor kiezen je applicatie pas later op te laten nemen in het           "
@@ -1532,16 +1528,16 @@ msgstr ""
 "for users of this portal. Would you like your application to be placed under "
 "a temporary embargo?"
 
-#: proposals/models.py:305
+#: proposals/models.py:339
 msgid ""
 "Vanaf welke datum mag je onderzoek wel in het archief worden weergegeven?"
 msgstr "From which date may your application be displayed in the archive?"
 
-#: proposals/models.py:315
+#: proposals/models.py:349
 msgid "Upload hier je aanvraag (in .pdf of .doc(x)-formaat)"
 msgstr "Upload your application here (in .pdf or .doc(x)-format)"
 
-#: proposals/models.py:323
+#: proposals/models.py:357
 msgid ""
 "Heb je formele toestemming van een ethische toetsingcommissie, uitgezonderd "
 "deze FETC-GW commissie?"
@@ -1549,11 +1545,11 @@ msgstr ""
 "Do you have formal approval from an ethics committee, other than this FEtC-H "
 "committee?"
 
-#: proposals/models.py:331
+#: proposals/models.py:366
 msgid "Welk instituut heeft de aanvraag goedgekeurd?"
 msgstr "Which institute approved the application?"
 
-#: proposals/models.py:339
+#: proposals/models.py:374
 msgid ""
 "Upload hier je formele toestemmingsbrief van dit instituut (in .pdf of ."
 "doc(x)-formaat)"
@@ -1561,22 +1557,22 @@ msgstr ""
 "Please upload the formal approval letter from this institute here (in .pdf "
 "or .doc(x)-format)"
 
-#: proposals/models.py:347
+#: proposals/models.py:383
 msgid "Ik vul de portal in in het kader van een cursus"
 msgstr "I am using this portal in the context of a course"
 
-#: proposals/models.py:352
+#: proposals/models.py:388
 msgid "Ik vul de portal in om de portal te exploreren"
 msgstr "I am using this portal to explore the portal"
 
-#: proposals/models.py:364
+#: proposals/models.py:401
 msgid ""
 "Kan voor alle deelnemers dezelfde informatiebrief en, indien van           "
 "toepassing, dezelfde toestemmingsverklaring gebruikt worden?"
 msgstr ""
 "Can the same informed consent documents be used for all participant groups?"
 
-#: proposals/models.py:366
+#: proposals/models.py:405
 msgid ""
 "Daar waar de verschillen klein en qua belasting of risico irrelevant zijn is "
 "sprake van in essentie hetzelfde traject, en voldoet één set documenten voor "
@@ -1600,11 +1596,11 @@ msgstr ""
 "time. However, if separate groups receive different <i>kinds</i> of tasks, "
 "they constitute separate trajectories."
 
-#: proposals/models.py:382
+#: proposals/models.py:422
 msgid "Hoeveel verschillende trajecten zijn er?"
 msgstr "How many different trajectories are there?"
 
-#: proposals/models.py:400
+#: proposals/models.py:441
 msgid ""
 "Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de "
 "privacy officer."
@@ -1612,7 +1608,7 @@ msgstr ""
 "I discussed my application and documents for participants with the privacy "
 "officer."
 
-#: proposals/models.py:407
+#: proposals/models.py:450
 msgid ""
 "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om "
 "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het "
@@ -1622,24 +1618,24 @@ msgstr ""
 "include it here. Supplying a DMP can expedite ethical assessment of "
 "proposals."
 
-#: proposals/models.py:419 proposals/utils/pdf_diff_logic.py:989
-#: reviews/models.py:172
+#: proposals/models.py:462 proposals/utils/pdf_diff_logic.py:999
+#: reviews/models.py:162
 msgid "Ruimte voor eventuele opmerkingen"
 msgstr "Space for possible comments"
 
-#: proposals/models.py:431
+#: proposals/models.py:474
 msgid "Datum bevestigingsbrief verstuurd"
 msgstr "Date confirmation sent"
 
-#: proposals/models.py:436 reviews/forms.py:113
+#: proposals/models.py:479 reviews/forms.py:123
 msgid "Is er een revisie geweest na het indienen van deze aanvraag?"
 msgstr "Has this proposal been amended after it was submitted?"
 
-#: proposals/models.py:441
+#: proposals/models.py:484
 msgid "Leg uit"
 msgstr "Explain why"
 
-#: proposals/models.py:447
+#: proposals/models.py:491
 msgid ""
 "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf "
 "kort hoe ga je daarmee omgaat.  Gebruik maximaal 1000 woorden."
@@ -1648,23 +1644,23 @@ msgstr ""
 "please describe briefly how you will address them. Use a maximum of a 1000 "
 "words."
 
-#: proposals/models.py:461
+#: proposals/models.py:505
 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:469
+#: proposals/models.py:514
 msgid "Wat is je studierichting?"
 msgstr "What is your course of study?"
 
-#: proposals/models.py:476
+#: proposals/models.py:521
 msgid "In welke context doe je dit onderzoek?"
 msgstr "In what capacity are you involved in this application?"
 
-#: proposals/models.py:483
+#: proposals/models.py:528
 msgid "Namelijk:"
 msgstr "Please specify:"
 
-#: proposals/models.py:490
+#: proposals/models.py:536
 msgid ""
 "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) "
 "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met "
@@ -1678,7 +1674,7 @@ msgstr ""
 "do not not, you can terminate your proposal now. If you do, please explain "
 "what the reason is:"
 
-#: proposals/models.py:507
+#: proposals/models.py:555
 msgid ""
 "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten         "
 "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren."
@@ -1687,13 +1683,13 @@ msgstr ""
 "researchers need to have logged into this portal at least once, in order to "
 "be selectable here."
 
-#: proposals/models.py:514
+#: proposals/models.py:563
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115
 #: proposals/templates/proposals/vue_templates/proposal_list.html:174
 msgid "Promotor/Begeleider"
 msgstr "Promotor/Supervisor"
 
-#: proposals/models.py:517
+#: proposals/models.py:567
 msgid ""
 "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n"
 "                    naar je promotor of begeleider gestuurd worden. Deze "
@@ -1723,53 +1719,53 @@ msgstr ""
 "you wait for them to do this, but remember to come back and fill in this "
 "field before submitting."
 
-#: proposals/models.py:544
+#: proposals/models.py:594
 msgid ""
 "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?"
 msgstr ""
 "Is this application a revision or an amendment of a previously submitted "
 "application?"
 
-#: proposals/models.py:628
+#: proposals/models.py:677
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:628 reviews/api/views.py:39 reviews/api/views.py:328
-#: reviews/templates/reviews/committee_members_workload.html:36
-#: reviews/templates/reviews/committee_members_workload.html:82
+#: proposals/models.py:677 reviews/api/views.py:40 reviews/api/views.py:324
+#: reviews/templates/reviews/committee_members_workload.html:35
+#: reviews/templates/reviews/committee_members_workload.html:74
 #: reviews/templates/reviews/review_detail_sidebar.html:106
 msgid "Revisie"
 msgstr "Revision"
 
-#: proposals/models.py:634
+#: proposals/models.py:683
 msgid "Normaal"
 msgstr "Normal"
 
-#: proposals/models.py:639
+#: proposals/models.py:688
 msgid "Voortoetsing"
 msgstr "Preliminary assessment"
 
-#: proposals/models.py:641
+#: proposals/models.py:690
 msgid "Oefening"
 msgstr "Practice"
 
-#: proposals/models.py:643
+#: proposals/models.py:692
 msgid "Extern getoetst"
 msgstr "External approval"
 
-#: proposals/models.py:728
+#: proposals/models.py:777
 msgid "Geen beoordeling door METC noodzakelijk"
 msgstr "Assessment by METC not required"
 
-#: proposals/models.py:729
+#: proposals/models.py:778
 msgid "In afwachting beslissing METC"
 msgstr "Pending decision by METC"
 
-#: proposals/models.py:730
+#: proposals/models.py:779
 msgid "Beslissing METC geüpload"
 msgstr "METC decision uploaded"
 
-#: proposals/models.py:733
+#: proposals/models.py:783
 msgid ""
 "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling "
 "waar toetsing door een METC verplicht is gesteld?"
@@ -1777,11 +1773,11 @@ msgstr ""
 "Will the data collection take place at the UMC Utrecht or another "
 "institution for which an assessment by a METC is required?"
 
-#: proposals/models.py:747
+#: proposals/models.py:798
 msgid "Welke instelling?"
 msgstr "Which institution?"
 
-#: proposals/models.py:753
+#: proposals/models.py:805
 msgid ""
 "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd "
 "door de WMO)?"
@@ -1789,7 +1785,7 @@ msgstr ""
 "Is the nature of the research question medical (as defined by the Medical "
 "Research Involving Human Subjects Act (WMO))?"
 
-#: proposals/models.py:755
+#: proposals/models.py:809
 msgid ""
 "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-"
 "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden "
@@ -1810,7 +1806,7 @@ msgstr ""
 "Committee on Research Involving Human Subjects, Definition of medical "
 "research, 2005, ccmo.nl)"
 
-#: proposals/models.py:771
+#: proposals/models.py:826
 msgid ""
 "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de "
 "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?"
@@ -1819,15 +1815,15 @@ msgstr ""
 "registered with the FEtC-H. Has an application for this project already been "
 "submitted to an METC?"
 
-#: proposals/models.py:778
+#: proposals/models.py:834
 msgid "Is de METC al tot een beslissing gekomen?"
 msgstr "Has the METC already come to a decision?"
 
-#: proposals/models.py:783
+#: proposals/models.py:840
 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the decision of METC  (in .pdf or .doc(x)-format) here"
 
-#: proposals/models.py:821
+#: proposals/models.py:883
 #, python-brace-format
 msgid "WMO {title}, status {status}"
 msgstr "WMO {title}, status {status}"
@@ -1839,33 +1835,21 @@ msgstr "Compare documents"
 
 #: proposals/templates/proposals/compare_documents.html:51
 msgid ""
-"\n"
-"                Hier kan je twee versies van een document vergelijken. "
-"Standaard\n"
-"                geeft hij een <i>gecombineerde</i> versie weer, waarbij "
-"tekst\n"
-"                die verwijderd is in het rood is gemarkeerd en nieuwe tekst\n"
-"                in het groen is gemarkeerd.\n"
-"                "
+"Hier kan je twee versies van een document vergelijken. Standaard geeft hij "
+"een <i>gecombineerde</i> versie weer, waarbij tekst die verwijderd is in het "
+"rood is gemarkeerd en nieuwe tekst in het groen is gemarkeerd."
 msgstr ""
-"\n"
-"                This tool allows you to compare two documents. By default,\n"
-"                you are presented with a <i>combined</i> view in "
-"whichremoved\n"
-"                text is marked in red and added text is marked in green.\n"
-"                "
+"This tool allows you to compare two documents. By default, you are presented "
+"with a <i>combined</i> view where removed text is marked in red and added "
+"text is marked in green."
 
 #: proposals/templates/proposals/compare_documents.html:59
 msgid ""
-"\n"
-"                Je kan ook de bestanden naast elkaar bekijken, met dezelfde\n"
-"                markeringen. Klik hiervoor op 'Bekijk apart'.\n"
-"                "
+"Je kan ook de bestanden naast elkaar bekijken, met dezelfde markeringen. "
+"Klik hiervoor op 'Bekijk apart'."
 msgstr ""
-"\n"
 "Documents can also be viewed side by side, with markings. To do so, click "
-"'View separately'.\n"
-"    "
+"'View separately'."
 
 #: proposals/templates/proposals/compare_documents.html:65
 msgid "Je vergelijkt"
@@ -1875,19 +1859,19 @@ msgstr "Comparing:"
 msgid "Er zijn geen wijzigingen gevonden in dit document!"
 msgstr "No changes were found in this document!"
 
-#: proposals/templates/proposals/compare_documents.html:72
+#: proposals/templates/proposals/compare_documents.html:71
 msgid "Bekijk apart"
 msgstr "View separately"
 
-#: proposals/templates/proposals/compare_documents.html:75
+#: proposals/templates/proposals/compare_documents.html:72
 msgid "Bekijk gecombineerd"
 msgstr "View combined"
 
-#: proposals/templates/proposals/compare_documents.html:82
+#: proposals/templates/proposals/compare_documents.html:78
 msgid "Oud"
 msgstr "Old"
 
-#: proposals/templates/proposals/compare_documents.html:88
+#: proposals/templates/proposals/compare_documents.html:84
 msgid "Nieuw"
 msgstr "New"
 
@@ -1901,32 +1885,28 @@ msgstr "Delete application"
 msgid "Weet je zeker dat je de aanvraag <em>%(title)s</em> wilt verwijderen?"
 msgstr "Are you sure you want to delete the application <em>%(title)s</em>?"
 
-#: proposals/templates/proposals/proposal_confirm_delete.html:19
+#: proposals/templates/proposals/proposal_confirm_delete.html:20
 #: proposals/templates/proposals/vue_templates/proposal_list.html:66
-#: tasks/templates/tasks/session_confirm_delete.html:18
-#: tasks/templates/tasks/task_confirm_delete.html:17
+#: tasks/templates/tasks/session_confirm_delete.html:20
+#: tasks/templates/tasks/task_confirm_delete.html:20
 msgid "Verwijderen"
 msgstr "Delete"
 
 #: proposals/templates/proposals/proposal_confirm_delete.html:21
 #: proposals/templates/proposals/proposal_copy.html:93
-#: tasks/templates/tasks/session_confirm_delete.html:19
-#: tasks/templates/tasks/task_confirm_delete.html:18
+#: tasks/templates/tasks/session_confirm_delete.html:22
+#: tasks/templates/tasks/task_confirm_delete.html:22
 msgid "Annuleren"
 msgstr "Cancel"
 
 #: proposals/templates/proposals/proposal_confirmation.html:27
 #, python-format
 msgid ""
-"\n"
-"                    Geef hieronder aan wanneer de bevestigingsbrief voor de "
-"aanvraag <em>%(title)s</em> is verstuurd.\n"
-"                "
+"Geef hieronder aan wanneer de bevestigingsbrief voor de aanvraag "
+"<em>%(title)s</em> is verstuurd."
 msgstr ""
-"\n"
-"    Please state when the confirmation letter for <em>%(title)s</em> has "
-"been sent here.\n"
-"    "
+"Please state when the confirmation letter for <em>%(title)s</em> has been "
+"sent here. "
 
 #: proposals/templates/proposals/proposal_copy.html:8
 #: proposals/templates/proposals/proposal_copy.html:22
@@ -1994,14 +1974,14 @@ msgstr ""
 "check if your application is not already in the your list of draft "
 "applications."
 
-#: proposals/templates/proposals/proposal_copy.html:68
+#: proposals/templates/proposals/proposal_copy.html:67
 msgid ""
 "Je kan hier een aanvraag kopiëren. Alle velden kunnen na het kopiëren "
 "aangepast worden."
 msgstr ""
 "Here you can copy an application. All fields can be edited after copying."
 
-#: proposals/templates/proposals/proposal_copy.html:71
+#: proposals/templates/proposals/proposal_copy.html:69
 msgid ""
 "Deze pagina is alleen bedoeld voor het geval je een geheel nieuwe aanvraag "
 "gaat doen op basis van een eerder uitgevoerde aanvraag. Aanvragen t.b.v. "
@@ -2010,7 +1990,7 @@ msgstr ""
 "This page is only intended for creating an entirely new application based on "
 "a previous application. Applications for grant applications cannot be copied."
 
-#: proposals/templates/proposals/proposal_copy.html:77
+#: proposals/templates/proposals/proposal_copy.html:75
 #, python-format
 msgid ""
 "Als je gevraagd is om een revisie te maken van een eerder ingediende "
@@ -2019,7 +1999,7 @@ msgstr ""
 "If you have been asked to revise a previously submitted application, you can "
 "do so <a href=\"%(revision_url)s\">here</a>. "
 
-#: proposals/templates/proposals/proposal_copy.html:83
+#: proposals/templates/proposals/proposal_copy.html:81
 #, python-format
 msgid ""
 "Indien je wijzigingen hebt in een al goedgekeurde aanvraag die daarom "
@@ -2030,20 +2010,20 @@ msgstr ""
 "to be re-reviewed, please make an amendment <a "
 "href=\"%(amendment_url)s\">here</a>."
 
-#: proposals/templates/proposals/proposal_copy.html:95
+#: proposals/templates/proposals/proposal_copy.html:94
 msgid "Kopiëren"
 msgstr "Copy"
 
 #: proposals/templates/proposals/proposal_data_management.html:7
-#: proposals/utils/proposal_utils.py:121
+#: proposals/utils/proposal_utils.py:118
 msgid "Datamanagement"
 msgstr "Data management"
 
-#: proposals/templates/proposals/proposal_data_management.html:17
+#: proposals/templates/proposals/proposal_data_management.html:16
 msgid "Datamanagement en Privacy"
 msgstr "Data Management and Privacy"
 
-#: proposals/templates/proposals/proposal_data_management.html:20
+#: proposals/templates/proposals/proposal_data_management.html:18
 msgid ""
 "De Universiteit Utrecht streeft naar integriteit, duurzaamheid, en "
 "transparantie in de omgang met onderzoeksdata, waaronder persoonsgegevens. "
@@ -2055,13 +2035,13 @@ msgstr ""
 "introduction of the GDPR there are clear rules which researchers should "
 "follow with regard to data."
 
-#: proposals/templates/proposals/proposal_data_management.html:24
-#: proposals/utils/pdf_diff_logic.py:963
-#: reviews/templatetags/documents_list.py:245
+#: proposals/templates/proposals/proposal_data_management.html:22
+#: proposals/utils/pdf_diff_logic.py:974
+#: reviews/templatetags/documents_list.py:224
 msgid "Data Management Plan"
 msgstr "Data Management Plan"
 
-#: proposals/templates/proposals/proposal_data_management.html:27
+#: proposals/templates/proposals/proposal_data_management.html:25
 msgid ""
 "Een data management plan is sinds 2020 <a href=\"https://intranet.uu.nl/"
 "actueel/nieuws/nieuw-facultair-datamanagementbeleid\" "
@@ -2073,13 +2053,13 @@ msgstr ""
 "target=\"_blank\">required</a> by the Faculty of Humanities from 2020 "
 "onwards as well as by NWO or ERC if you are financed by these organizations. "
 
-#: proposals/templates/proposals/proposal_data_management.html:33
+#: proposals/templates/proposals/proposal_data_management.html:32
 msgid ""
 "De faculteit biedt uitgebreide informatie op het gebied van data management, "
 "waaronder ook <a href=\"https://www.uu.nl/en/research/research-data-"
 "management/guides/data-management-planning\" target=\"_blank\">hoe deze te "
-"schrijven</a>. <br/> Je kunt bij de faculteit ook je DMP laten nakijken door "
-"<a href=\"https://www.uu.nl/en/research/research-data-management/tools-"
+"schrijven</a>. <br /> Je kunt bij de faculteit ook je DMP laten nakijken "
+"door <a href=\"https://www.uu.nl/en/research/research-data-management/tools-"
 "services/data-management-plan-review\" target=\"_blank\">Research Data "
 "Management Support</a> of de facultaire <a href=\"mailto:datamanagement."
 "gw@uu.nl\" target=\"_blank\">datamanager</a>."
@@ -2094,7 +2074,7 @@ msgstr ""
 "target=\"_blank\">Research Data Management Support</a> or the faculty <a "
 "href=\"mailto:Datamanagement.gw@uu.nl\" target=\"_blank\">data manager</a>. "
 
-#: proposals/templates/proposals/proposal_data_management.html:38
+#: proposals/templates/proposals/proposal_data_management.html:41
 msgid ""
 "Op de website <a href=\"https://dmponline.dcc.ac.uk/\" target=\"_blank\">DMP-"
 "online</a> vind je na het inloggen met je Solis-ID templates voor een DMP. "
@@ -2106,19 +2086,19 @@ msgstr ""
 "Solis-ID. This is where you can find DMP templates mandated by NWO or ERC "
 "funding, provided by Utrecht University."
 
-#: proposals/templates/proposals/proposal_data_management.html:43
-#: proposals/templates/proposals/proposal_data_management.html:75
+#: proposals/templates/proposals/proposal_data_management.html:46
+#: proposals/templates/proposals/proposal_data_management.html:79
 msgid "Nuttige workshops:"
 msgstr "Recommended workshops"
 
-#: proposals/templates/proposals/proposal_data_management.html:45
-#: proposals/templates/proposals/proposal_data_management.html:77
+#: proposals/templates/proposals/proposal_data_management.html:48
+#: proposals/templates/proposals/proposal_data_management.html:81
 msgid ""
 "Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende "
 "workshop te volgen:"
 msgstr "If you have not already done so, it is highly recommended you attend: "
 
-#: proposals/templates/proposals/proposal_data_management.html:49
+#: proposals/templates/proposals/proposal_data_management.html:53
 msgid ""
 "<li> de workshop <a href=\"https://www.uu.nl/en/node/75859\" "
 "target=\"_blank\">Quick start to Research Data Management</a> </li>"
@@ -2126,7 +2106,7 @@ msgstr ""
 "<li>the workshop <a href=\"https://www.uu.nl/en/node/75859\" "
 "target=\"_blank\">Quick start to Research Data Management</a></li>"
 
-#: proposals/templates/proposals/proposal_data_management.html:58
+#: proposals/templates/proposals/proposal_data_management.html:61
 msgid ""
 "Voor advies op het gebied van data management planning kun je contact "
 "opnemen met de datamanager GW, Frans de Liagre Böhl via <a href=\"mailto:"
@@ -2137,11 +2117,11 @@ msgstr ""
 "target=\"_blank\">datamanagement.gw@uu.nl</a>, who is the data manager of "
 "the Faculty of Humanities."
 
-#: proposals/templates/proposals/proposal_data_management.html:62
+#: proposals/templates/proposals/proposal_data_management.html:65
 msgid "Privacy: AVG en GDPR"
 msgstr "Privacy: AVG and GDPR"
 
-#: proposals/templates/proposals/proposal_data_management.html:64
+#: proposals/templates/proposals/proposal_data_management.html:67
 msgid ""
 "Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt "
 "aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de "
@@ -2154,7 +2134,7 @@ msgstr ""
 "regulation is in line with European <a href=\"https://gdpr.eu/\" "
 "target=\"_blank\">GDPR privacy legislation</a>."
 
-#: proposals/templates/proposals/proposal_data_management.html:70
+#: proposals/templates/proposals/proposal_data_management.html:73
 msgid ""
 "De autoriteit persoonsgegevens heeft <a href=\"https://www."
 "autoriteitpersoonsgegevens.nl/nl/onderwerpen/algemene-informatie-avg/"
@@ -2167,7 +2147,7 @@ msgstr ""
 "how the AVG affects data collectors, though only in Dutch at the time of "
 "writing.    "
 
-#: proposals/templates/proposals/proposal_data_management.html:81
+#: proposals/templates/proposals/proposal_data_management.html:86
 msgid ""
 "<li> de workshop <a href=\"https://www.uu.nl/en/node/81799\" "
 "target=\"_blank\">Handling personal data in research</a> </li>"
@@ -2175,7 +2155,7 @@ msgstr ""
 "<li>the workshop <a href=\"https://www.uu.nl/en/node/81799\" "
 "target=\"_blank\">Handling personal data in research</a></li>"
 
-#: proposals/templates/proposals/proposal_data_management.html:89
+#: proposals/templates/proposals/proposal_data_management.html:94
 msgid ""
 "Voor advies op het gebied van privacy en de AVG kun je contact opnemen met "
 "de privacy officer van GW via <a href=\"mailto:privacy.gw@uu.nl\">privacy."
@@ -2202,25 +2182,25 @@ msgstr ""
 "to the original application."
 
 #: proposals/templates/proposals/proposal_form.html:7
-#: proposals/templates/proposals/proposal_form.html:76
+#: proposals/templates/proposals/proposal_form.html:78
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
-#: proposals/templates/proposals/proposal_form_pre_approved.html:81
-#: proposals/utils/pdf_diff_logic.py:418 proposals/utils/proposal_utils.py:40
-#: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33
-#: proposals/utils/validate_proposal.py:43
+#: proposals/templates/proposals/proposal_form_pre_approved.html:83
+#: proposals/utils/pdf_diff_logic.py:428 proposals/utils/proposal_utils.py:47
+#: proposals/utils/proposal_utils.py:68 proposals/utils/validate_proposal.py:40
 #: proposals/utils/validate_proposal.py:50
 #: proposals/utils/validate_proposal.py:57
+#: proposals/utils/validate_proposal.py:64
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
-#: proposals/templates/proposals/proposal_form.html:56
-#: proposals/templates/proposals/proposal_form_pre_approved.html:72
-#: proposals/templates/proposals/proposal_submit.html:33
+#: proposals/templates/proposals/proposal_form.html:58
+#: proposals/templates/proposals/proposal_form_pre_approved.html:74
+#: proposals/templates/proposals/proposal_submit.html:35
 msgid "Aantal woorden:"
 msgstr "Number of words:"
 
-#: proposals/templates/proposals/proposal_form.html:73
-#: proposals/templates/proposals/proposal_submit.html:168
+#: proposals/templates/proposals/proposal_form.html:75
+#: proposals/templates/proposals/proposal_submit.html:163
 msgid ""
 "Je bewerkt op het moment een oefenaanvraag. Deze kan niet ter beoordeling "
 "door de FETC-GW worden ingediend."
@@ -2228,7 +2208,7 @@ msgstr ""
 "You are currently editing a practice application. These can not be submitted "
 "to the FETC-H for review."
 
-#: proposals/templates/proposals/proposal_form.html:78
+#: proposals/templates/proposals/proposal_form.html:80
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder jouw "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2238,7 +2218,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form.html:105
+#: proposals/templates/proposals/proposal_form.html:110
 msgid ""
 "Als de beoogde startdatum binnen twee weken van het indienen van de aanvraag "
 "ligt, kan de FETC geen officiële goedkeuring meer geven."
@@ -2246,7 +2226,7 @@ msgstr ""
 "If the intended start date lies within two weeks of submission, the FETC-H "
 "will not be able to provide official approval for this proposal."
 
-#: proposals/templates/proposals/proposal_form_pre_approved.html:83
+#: proposals/templates/proposals/proposal_form_pre_approved.html:85
 msgid ""
 "Je past nu een aanvraag aan van een student/PhD kandidaat onder je "
 "supervisie. Let er op dat je het formulier invult alsof jij die student/PhD "
@@ -2256,7 +2236,7 @@ msgstr ""
 "supervision. Please note that this form should be filled in as if you were "
 "that student/PhD candidate. "
 
-#: proposals/templates/proposals/proposal_form_pre_approved.html:97
+#: proposals/templates/proposals/proposal_form_pre_approved.html:99
 #, python-format
 msgid ""
 "Dit formulier is bedoeld voor aanvragen die al goedgekeurd zijn door een "
@@ -2267,14 +2247,14 @@ msgstr ""
 "different committee. If this is not the case, you are required to fill in "
 "the <a href=\"%(proposal_url)s\">full form</a>."
 
-#: proposals/templates/proposals/proposal_list.html:45
-#: proposals/templates/proposals/proposal_private_archive.html:43
-#: reviews/templates/reviews/action_explaination.html:19
+#: proposals/templates/proposals/proposal_list.html:37
+#: proposals/templates/proposals/proposal_private_archive.html:36
+#: reviews/templates/reviews/action_explaination.html:18
 msgid "Uitleg"
 msgstr "Explanation"
 
-#: proposals/templates/proposals/proposal_list.html:49
-#: proposals/templates/proposals/proposal_private_archive.html:47
+#: proposals/templates/proposals/proposal_list.html:41
+#: proposals/templates/proposals/proposal_private_archive.html:40
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_next)s\" title=\"Naar volgende stap\"> om naar de "
@@ -2283,8 +2263,9 @@ msgstr ""
 "Click <img src=\"%(img_next)s\" title=\"To next step\"> to move on to the "
 "next step in the progress."
 
-#: proposals/templates/proposals/proposal_list.html:56
-#: proposals/templates/proposals/proposal_private_archive.html:54
+#: proposals/templates/proposals/proposal_list.html:50
+#: proposals/templates/proposals/proposal_private_archive.html:49
+#: reviews/templates/reviews/action_explaination.html:28
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_diff)s\" title=\"Toon verschillen\"> om de "
@@ -2295,8 +2276,8 @@ msgstr ""
 "differences between a previous version (only available for revisions/"
 "amendments)."
 
-#: proposals/templates/proposals/proposal_list.html:63
-#: proposals/templates/proposals/proposal_private_archive.html:61
+#: proposals/templates/proposals/proposal_list.html:59
+#: proposals/templates/proposals/proposal_private_archive.html:58
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_delete)s\" title=\"Verwijderen\"> om je aanvraag te "
@@ -2305,8 +2286,9 @@ msgstr ""
 "Click <img src=\"%(img_delete)s\" title=\"Delete\"> to delete your "
 "application."
 
-#: proposals/templates/proposals/proposal_list.html:70
-#: proposals/templates/proposals/proposal_private_archive.html:68
+#: proposals/templates/proposals/proposal_list.html:68
+#: proposals/templates/proposals/proposal_private_archive.html:67
+#: reviews/templates/reviews/action_explaination.html:21
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_pdf)s\" title=\"Inzien\"> om een ingediende "
@@ -2324,8 +2306,8 @@ msgstr ""
 "Click <img src=\"%(img_revise)s\" title=\"Show\"> to create a revision for "
 "an application."
 
-#: proposals/templates/proposals/proposal_list.html:82
-#: proposals/templates/proposals/proposal_private_archive.html:75
+#: proposals/templates/proposals/proposal_list.html:84
+#: proposals/templates/proposals/proposal_private_archive.html:76
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_decide)s\" title=\"Beslissen\"> om je beslissing "
@@ -2334,8 +2316,9 @@ msgstr ""
 "Click <img src=\"%(img_decide)s\" title=\"Decide\"> to make your decision "
 "(as a supervisor)."
 
-#: proposals/templates/proposals/proposal_list.html:89
-#: proposals/templates/proposals/proposal_private_archive.html:82
+#: proposals/templates/proposals/proposal_list.html:93
+#: proposals/templates/proposals/proposal_private_archive.html:85
+#: reviews/templates/reviews/action_explaination.html:57
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_hide)s\" title=\"Verbergen\"> om een ingediende "
@@ -2344,9 +2327,9 @@ msgstr ""
 "Click <img src=\"%(img_hide)s\" title=\"Hide\"> to hide a submitted "
 "application from the archive."
 
-#: proposals/templates/proposals/proposal_list.html:95
-#: proposals/templates/proposals/proposal_private_archive.html:88
-#: reviews/templates/reviews/action_explaination.html:56
+#: proposals/templates/proposals/proposal_list.html:101
+#: proposals/templates/proposals/proposal_private_archive.html:93
+#: reviews/templates/reviews/action_explaination.html:65
 #, python-format
 msgid ""
 "Klik op <img src=\"%(img_add)s\" title=\"Toevoegen\"> om een ingediende "
@@ -2355,7 +2338,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:87
+#: proposals/templates/proposals/proposal_pdf.html:86
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reviewing_committee)s-"
@@ -2364,25 +2347,25 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reviewing_committee)s-"
 "%(reference_number)s, submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:93
+#: proposals/templates/proposals/proposal_pdf.html:92
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:109
+#: proposals/templates/proposals/proposal_pdf.html:106
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:113
+#: proposals/templates/proposals/proposal_pdf.html:111
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:116
+#: proposals/templates/proposals/proposal_pdf.html:113
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:118
+#: proposals/templates/proposals/proposal_pdf.html:115
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
@@ -2408,11 +2391,11 @@ msgstr "Approval date"
 msgid "FETC-GW kamer"
 msgstr "FEtC-H chamber"
 
-#: proposals/templates/proposals/proposal_public_archive.html:34
+#: proposals/templates/proposals/proposal_public_archive.html:32
 msgid "AK"
 msgstr "GC"
 
-#: proposals/templates/proposals/proposal_public_archive.html:36
+#: proposals/templates/proposals/proposal_public_archive.html:34
 msgid "LK"
 msgstr "LC"
 
@@ -2421,8 +2404,8 @@ msgstr "LC"
 msgid "Een nieuwe aanvraag aanmelden"
 msgstr "Register a new application"
 
-#: proposals/templates/proposals/proposal_start.html:26
-#: proposals/templates/proposals/proposal_start_practice.html:28
+#: proposals/templates/proposals/proposal_start.html:25
+#: proposals/templates/proposals/proposal_start_practice.html:25
 msgid ""
 "Het reglement van de <a href=\"https://fetc-gw.wp.hum.uu.nl/reglement-"
 "algemene-kamer/\">Algemene Kamer (AK)</a> of dat van de <a href=\"https://"
@@ -2434,8 +2417,8 @@ msgstr ""
 "href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-linguistics-chamber/\" "
 "target=\"blank\">Linguistics Chamber</a>."
 
-#: proposals/templates/proposals/proposal_start.html:35
-#: proposals/templates/proposals/proposal_start_practice.html:37
+#: proposals/templates/proposals/proposal_start.html:34
+#: proposals/templates/proposals/proposal_start_practice.html:34
 msgid ""
 "Gebruik de juiste (meest recente) <a href=\"https://intranet.uu.nl/"
 "documenten-ethische-toetsingscommissie-gw\">voorbeelddocumenten</a> voor de "
@@ -2445,9 +2428,9 @@ msgstr ""
 "en/documents-ethics-assessment-committee-humanities\" "
 "target=\"_blank\">model documents</a> for <em>informed consent</em>."
 
-#: proposals/templates/proposals/proposal_start.html:40
-#: proposals/templates/proposals/proposal_start_practice.html:42
-#: proposals/templates/proposals/study_consent.html:89
+#: proposals/templates/proposals/proposal_start.html:39
+#: proposals/templates/proposals/proposal_start_practice.html:39
+#: proposals/templates/proposals/study_consent.html:88
 msgid ""
 "Studenten moeten hun begeleider vragen om deze formulieren; dezelfde "
 "voorbeeldteksten, maar op niet-officiële formulieren, zijn te vinden op <a "
@@ -2458,30 +2441,27 @@ msgstr ""
 "fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/\">this page</a>, though on non-"
 "official documents."
 
-#: proposals/templates/proposals/proposal_start.html:47
-#: proposals/templates/proposals/proposal_start_practice.html:49
-#: proposals/templates/proposals/study_start.html:67
+#: proposals/templates/proposals/proposal_start.html:46
+#: proposals/templates/proposals/proposal_start_practice.html:46
+#: proposals/templates/proposals/study_start.html:65
 msgid ""
-"\n"
-"                    Een voorstel is opgebouwd uit (van groot naar klein) (i) "
-"trajecten, (ii) sessies, (iii) taken.\n"
-"                "
+"Een voorstel is opgebouwd uit (van groot naar klein) (i) trajecten, (ii) "
+"sessies, (iii) taken."
 msgstr ""
-"\n"
 "An application consists of (i) trajectories, (ii) sessions, and (iii) tasks, "
-"in descending order of subdivision.          "
+"in descending order of subdivision. "
 
-#: proposals/templates/proposals/proposal_start.html:53
-#: proposals/templates/proposals/proposal_start_practice.html:55
-#: proposals/templates/proposals/study_start.html:73
-#: proposals/utils/pdf_diff_logic.py:327
-#: reviews/templates/reviews/committee_members_workload.html:24
+#: proposals/templates/proposals/proposal_start.html:52
+#: proposals/templates/proposals/proposal_start_practice.html:52
+#: proposals/templates/proposals/study_start.html:71
+#: proposals/utils/pdf_diff_logic.py:337
+#: reviews/templates/reviews/committee_members_workload.html:23
 msgid "Traject"
 msgstr "Trajectory"
 
-#: proposals/templates/proposals/proposal_start.html:54
-#: proposals/templates/proposals/proposal_start_practice.html:56
-#: proposals/templates/proposals/study_start.html:74
+#: proposals/templates/proposals/proposal_start.html:53
+#: proposals/templates/proposals/proposal_start_practice.html:53
+#: proposals/templates/proposals/study_start.html:72
 msgid ""
 "Als je met verschillende deelnemersgroepen werkt die een verschillend "
 "onderzoekstraject doorlopen waarvoor verschillende informed consent "
@@ -2491,8 +2471,8 @@ msgstr ""
 "not follow the same instructions during your research, they traverse "
 "different trajectories, and require separate informed consent documents. "
 
-#: proposals/templates/proposals/proposal_start.html:56
-#: proposals/templates/proposals/proposal_start_practice.html:58
+#: proposals/templates/proposals/proposal_start.html:57
+#: proposals/templates/proposals/proposal_start_practice.html:57
 #: proposals/templates/proposals/study_start.html:76
 msgid ""
 "<u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een "
@@ -2501,27 +2481,27 @@ msgstr ""
 "<u>For example</u>: parents of children up to 15 years of age, teachers, or "
 "an experimental and control group that receive significantly different tasks."
 
-#: proposals/templates/proposals/proposal_start.html:62
+#: proposals/templates/proposals/proposal_start.html:63
 #: proposals/templates/proposals/proposal_start_practice.html:63
-#: proposals/templates/proposals/study_start.html:81
+#: proposals/templates/proposals/study_start.html:82
 msgid "Sessie"
 msgstr "Session"
 
-#: proposals/templates/proposals/proposal_start.html:63
+#: proposals/templates/proposals/proposal_start.html:64
 #: proposals/templates/proposals/proposal_start_practice.html:64
-#: proposals/templates/proposals/study_start.html:82
+#: proposals/templates/proposals/study_start.html:83
 msgid "Alle taken/onderdelen die iemand op één dag uitvoert."
 msgstr ""
 "All tasks or procedures that a participant completes in a day combined. "
 
 #: proposals/templates/proposals/proposal_start.html:69
-#: proposals/templates/proposals/proposal_start_practice.html:70
+#: proposals/templates/proposals/proposal_start_practice.html:69
 #: proposals/templates/proposals/study_start.html:88
 msgid "Taak"
 msgstr "Task"
 
 #: proposals/templates/proposals/proposal_start.html:70
-#: proposals/templates/proposals/proposal_start_practice.html:71
+#: proposals/templates/proposals/proposal_start_practice.html:70
 #: proposals/templates/proposals/study_start.html:89
 msgid ""
 "Een taak of onderdeel van je onderzoek. <p> <u>Bijvoorbeeld</u>: het "
@@ -2530,25 +2510,25 @@ msgstr ""
 " A task or procedure within your study. <p> <u>For example</u>: completing "
 "an interview, questionnaire, or language test.</p>"
 
-#: proposals/templates/proposals/proposal_start.html:80
-#: proposals/templates/proposals/proposal_start_pre_approved.html:42
-#: proposals/templates/proposals/proposal_start_pre_assessment.html:31
+#: proposals/templates/proposals/proposal_start.html:79
+#: proposals/templates/proposals/proposal_start_pre_approved.html:37
+#: proposals/templates/proposals/proposal_start_pre_assessment.html:43
 msgid "Volgende stap >>"
 msgstr "Next step >>"
 
 #: proposals/templates/proposals/proposal_start_practice.html:7
-#: proposals/templates/proposals/proposal_start_practice.html:14
+#: proposals/templates/proposals/proposal_start_practice.html:13
 msgid "Een nieuwe aanvraag aanmelden (oefenportaal)"
 msgstr "Register a new application (practice portal)"
 
-#: proposals/templates/proposals/proposal_start_practice.html:80
+#: proposals/templates/proposals/proposal_start_practice.html:78
 msgid "Houd er rekening mee dat een oefenaanvraag niet ingediend kan worden."
 msgstr ""
 "Please be advised that a practice application cannot be submitted to the "
 "FETC-H."
 
-#: proposals/templates/proposals/proposal_start_pre_approved.html:9
-#: proposals/templates/proposals/proposal_start_pre_approved.html:18
+#: proposals/templates/proposals/proposal_start_pre_approved.html:7
+#: proposals/templates/proposals/proposal_start_pre_approved.html:14
 msgid ""
 "Een nieuwe aanvraag aanmelden (die al goedgekeurd is door een andere "
 "ethische toetsingscomissie)"
@@ -2556,7 +2536,7 @@ msgstr ""
 "Register a new application (that has been approved by another ethics "
 "committee)"
 
-#: proposals/templates/proposals/proposal_start_pre_approved.html:21
+#: proposals/templates/proposals/proposal_start_pre_approved.html:16
 #, python-format
 msgid ""
 "Je wilt een nieuwe aanvraag ter toetsing bij de FETC-GW aanmelden, die al "
@@ -2572,7 +2552,7 @@ msgstr ""
 "yourself and the committee members a great deal of time by making sure you "
 "are properly informed."
 
-#: proposals/templates/proposals/proposal_start_pre_approved.html:31
+#: proposals/templates/proposals/proposal_start_pre_approved.html:26
 #, python-format
 msgid ""
 "Gebruik bij het invullen s.v.p. geen afkortingen waar de FETC-GW wellicht "
@@ -2595,7 +2575,7 @@ msgstr "Ethical assessment for grant application"
 msgid "Nieuwe FETC-aanvraag voor (al dan niet goedgekeurde) subsidieaanvragen"
 msgstr "Submit a new application to supplement a grant application"
 
-#: proposals/templates/proposals/proposal_start_pre_assessment.html:19
+#: proposals/templates/proposals/proposal_start_pre_assessment.html:17
 msgid ""
 "Soms is bij het indienen van een aanvraag bij een subsidieverstrekker een "
 "ethische verklaring nodig."
@@ -2603,7 +2583,7 @@ msgstr ""
 "Sometimes grant providers will require assessment by an ethics committee as "
 "part of their grant application procedure."
 
-#: proposals/templates/proposals/proposal_start_pre_assessment.html:20
+#: proposals/templates/proposals/proposal_start_pre_assessment.html:22
 msgid ""
 "Goedgekeurde NWO-aanvragen hebben ook een ethische verklaring nodig alvorens "
 "een startdatum vastgesteld kan worden."
@@ -2612,7 +2592,7 @@ msgstr ""
 "supplement a grant application once the grant has been awarded. It is "
 "however still required before a starting date can be determined."
 
-#: proposals/templates/proposals/proposal_start_pre_assessment.html:23
+#: proposals/templates/proposals/proposal_start_pre_assessment.html:28
 msgid ""
 "In deze gevallen kunnen onderzoekers de FETC-GW verzoeken om de "
 "onderzoeksaanvraag te laten toetsen. Dit kan via deze route van de portal"
@@ -2620,7 +2600,7 @@ msgstr ""
 "In these cases, researchers can request an assessment of their application "
 "by the FEtC-H through this route"
 
-#: proposals/templates/proposals/proposal_start_pre_assessment.html:25
+#: proposals/templates/proposals/proposal_start_pre_assessment.html:34
 msgid ""
 "NB: De toetsing kan alleen op hoofdlijnen plaatsvinden en vervangt NIET de "
 "reguliere ethische toetsing van een onderzoek; elke mensgebonden studie die "
@@ -2634,77 +2614,47 @@ msgstr ""
 "process."
 
 #: proposals/templates/proposals/proposal_submit.html:8
-#: proposals/templates/proposals/proposal_submit.html:47
-#: proposals/utils/proposal_utils.py:49 proposals/utils/proposal_utils.py:58
+#: proposals/templates/proposals/proposal_submit.html:49
+#: proposals/utils/proposal_utils.py:59 proposals/utils/proposal_utils.py:73
 msgid "Aanvraag voor voortoetsing klaar voor versturen"
 msgstr "Application for preliminary assessment ready to submit"
 
 #: proposals/templates/proposals/proposal_submit.html:10
-#: proposals/templates/proposals/proposal_submit.html:49
+#: proposals/templates/proposals/proposal_submit.html:51
 msgid "Concept-aanmelding klaar voor versturen"
 msgstr "Draft application ready to submit"
 
 #: proposals/templates/proposals/proposal_submit.html:12
-#: proposals/templates/proposals/proposal_submit.html:51
+#: proposals/templates/proposals/proposal_submit.html:53
 msgid "Aanmelding klaar voor versturen"
 msgstr "Application ready to submit"
 
-#: proposals/templates/proposals/proposal_submit.html:56
-msgid ""
-"\n"
-"                        Je aanvraag voor voortoetsing is compleet.\n"
-"                    "
-msgstr ""
-"\n"
-"    Your application for preliminary assessment is complete.\n"
-"    "
+#: proposals/templates/proposals/proposal_submit.html:58
+msgid "Je aanvraag voor voortoetsing is compleet."
+msgstr "Your application for preliminary assessment is complete."
 
-#: proposals/templates/proposals/proposal_submit.html:59
+#: proposals/templates/proposals/proposal_submit.html:61
 #: proposals/templates/proposals/proposal_submit.html:76
 msgid ""
-"\n"
-"                        Als je er zeker van bent dat je aanvraag op adequate "
-"wijze is gespecifieerd kan je de aanmelding\n"
-"                        nu ter beoordeling naar de FETC-GW versturen.\n"
-"                    "
+"Als je er zeker van bent dat je aanvraag op adequate wijze is gespecifieerd "
+"kan je de aanmelding nu ter beoordeling naar de FETC-GW versturen."
 msgstr ""
-"\n"
-"    If you are sure your application is adequately described, you can now "
-"submit the application\n"
-"    to the FEtC-H for assessment.\n"
-"    "
+"If you are sure your application is adequately described, you can now submit "
+"the application to the FEtC-H for assessment."
 
-#: proposals/templates/proposals/proposal_submit.html:65
-msgid ""
-"\n"
-"                        Je concept-aanmelding is compleet.\n"
-"                    "
-msgstr ""
-"\n"
-"    Your draft application is complete.\n"
-"    "
+#: proposals/templates/proposals/proposal_submit.html:66
+msgid "Je concept-aanmelding is compleet."
+msgstr "Your draft application is complete."
 
-#: proposals/templates/proposals/proposal_submit.html:68
+#: proposals/templates/proposals/proposal_submit.html:69
 msgid ""
-"\n"
-"                        Je kan nu je concept-aanmelding ter beoordeling naar "
-"je supervisor versturen.\n"
-"                    "
+"Je kan nu je concept-aanmelding ter beoordeling naar je supervisor versturen."
 msgstr ""
-"\n"
-"    You can now send your draft application to your supervisor for "
-"assessment.\n"
-"    "
+"You can now send your draft application to your supervisor for assessment."
 
 #: proposals/templates/proposals/proposal_submit.html:73
-msgid ""
-"\n"
-"                        Je aanmelding is compleet.\n"
-"                    "
-msgstr ""
-"\n"
-"    Your application is complete.\n"
-"    "
+msgid "Je aanmelding is compleet."
+msgstr "Your application is complete."
 
 #: proposals/templates/proposals/proposal_submit.html:83
 msgid ""
@@ -2726,7 +2676,7 @@ msgstr ""
 "start page; the draft application can be saved for any later changes and "
 "submission."
 
-#: proposals/templates/proposals/proposal_submit.html:101
+#: proposals/templates/proposals/proposal_submit.html:100
 #, python-format
 msgid ""
 "Je hebt nog geen toestemmingsverklaring of informatiebrief toegevoegd voor "
@@ -2741,7 +2691,7 @@ msgstr ""
 "you can return later; your application has already been saved and can be "
 "found under \"My drafts\"."
 
-#: proposals/templates/proposals/proposal_submit.html:113
+#: proposals/templates/proposals/proposal_submit.html:112
 #, python-format
 msgid ""
 "Je hebt aangeven dat je interventie een extra taak heeft, maar nog geen "
@@ -2752,11 +2702,11 @@ msgstr ""
 "the task-based research form is missing for trajectory %(study_order)s.You "
 "can add it on <a href=\"%(study_link)s\">this page</a>."
 
-#: proposals/templates/proposals/proposal_submit.html:128
+#: proposals/templates/proposals/proposal_submit.html:125
 msgid "Er zijn nog errors gevonden op de volgende pagina's:"
 msgstr "Errors were found on the following pages:"
 
-#: proposals/templates/proposals/proposal_submit.html:141
+#: proposals/templates/proposals/proposal_submit.html:136
 msgid ""
 "Dit komt waarschijnlijk doordat je nog niet alle verplichte velden heeft "
 "ingevuld. Je kan je aanmelding pas versturen wanneer deze fouten "
@@ -2765,11 +2715,11 @@ msgstr ""
 "This is probably because you have not yet filled in all required fields. You "
 "can submit your application when these errors have been corrected."
 
-#: proposals/templates/proposals/proposal_submit.html:149
+#: proposals/templates/proposals/proposal_submit.html:144
 msgid "Controleer uw beoogde startdatum"
 msgstr "Check your intended start date"
 
-#: proposals/templates/proposals/proposal_submit.html:151
+#: proposals/templates/proposals/proposal_submit.html:146
 msgid ""
 "Omdat de beoogde startdatum binnen twee weken van vandaag ligt, kan de FETC "
 "helaas geen officiële goedkeuring meer geven voor deze aanvraag. Controleer "
@@ -2779,7 +2729,7 @@ msgstr ""
 "of today, the FETC-H will not be able to provide official approval for this "
 "application. Please make sure the entered date is still correct."
 
-#: proposals/templates/proposals/proposal_submit.html:155
+#: proposals/templates/proposals/proposal_submit.html:150
 #, python-format
 msgid ""
 "De beoogde startdatum vindt u op <a href=\"%(first_page_url)s\">deze pagina</"
@@ -2788,20 +2738,20 @@ msgstr ""
 "The intended start date can be edited on <a href=\"%(first_page_url)s\">this "
 "page</a>."
 
-#: proposals/templates/proposals/proposal_submit.html:175
+#: proposals/templates/proposals/proposal_submit.html:170
 msgid "Aanvraag voor voortoetsing versturen"
 msgstr "Submit application for preliminary assessment"
 
-#: proposals/templates/proposals/proposal_submit.html:177
+#: proposals/templates/proposals/proposal_submit.html:172
 msgid "Terug naar beoordeling >>"
 msgstr "Back to review >>"
 
-#: proposals/templates/proposals/proposal_submit.html:179
+#: proposals/templates/proposals/proposal_submit.html:174
 msgid "Concept-aanmelding versturen"
 msgstr "Submit draft application"
 
-#: proposals/templates/proposals/proposal_submit.html:181
-#: proposals/utils/pdf_diff_logic.py:971
+#: proposals/templates/proposals/proposal_submit.html:176
+#: proposals/utils/pdf_diff_logic.py:982
 msgid "Aanmelding versturen"
 msgstr "Submit application"
 
@@ -2836,7 +2786,7 @@ msgstr "Your application has been submitted."
 msgid "Je ontvangt een e-mail ter bevestiging."
 msgstr "You will receive a confirmation email."
 
-#: proposals/templates/proposals/proposal_submitted.html:40
+#: proposals/templates/proposals/proposal_submitted.html:39
 #, python-format
 msgid ""
 "Klik <a href=\"%(submitted_url)s\">hier</a> om je ingediende aanvragen in te "
@@ -2845,7 +2795,7 @@ msgstr ""
 "Click <a href=\"%(submitted_url)s\">here</a> to see your submitted "
 "applications."
 
-#: proposals/templates/proposals/proposal_update_attachments.html:17
+#: proposals/templates/proposals/proposal_update_attachments.html:15
 #, python-format
 msgid ""
 "Op deze pagina kan je de formulieren aanpassen behorende bij de aanvraag "
@@ -2854,12 +2804,12 @@ msgstr ""
 "On this page you can edit the forms related to the proposal "
 "%(title)s(reference number <em>%(ref_number)s</em>)"
 
-#: proposals/templates/proposals/proposal_update_date_start.html:14
-#: proposals/templates/proposals/proposal_update_date_start.html:28
+#: proposals/templates/proposals/proposal_update_date_start.html:13
+#: proposals/templates/proposals/proposal_update_date_start.html:31
 msgid "Startdatum aanpassen"
 msgstr "Edit start date"
 
-#: proposals/templates/proposals/proposal_update_date_start.html:17
+#: proposals/templates/proposals/proposal_update_date_start.html:15
 #, python-format
 msgid ""
 "Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s "
@@ -2878,24 +2828,23 @@ msgstr ""
 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement"
 msgstr "Informed consent school director/ head of the institution"
 
-#: proposals/templates/proposals/study_consent.html:74
+#: proposals/templates/proposals/study_consent.html:72
 msgid "Informed consent formulieren uploaden"
 msgstr "Upload Informed consent forms"
 
-#: proposals/templates/proposals/study_consent.html:77
+#: proposals/templates/proposals/study_consent.html:74
 msgid ""
 "Hier kan je de Informed consent formulieren uploaden voor de opgegeven "
 "traject(en). Optioneel kan je indien nodig maximaal 10 paar extra "
-"formulieren uploaden. <br/> Klik hiervoor op 'Voeg extra formulieren' "
+"formulieren uploaden. <br /> Klik hiervoor op 'Voeg extra formulieren' "
 "onderaan de pagina. Deze velden kan je weer weg halen door alle formulieren "
 "te wissen."
 msgstr ""
-"        You can upload the informed consent forms for your trajectories "
-"here. If needed, you can also upload up to 10 sets of additional forms. <br/"
-">         These extra fields can be removed by clearing all forms in one "
-"section.     "
+"You can upload the informed consent forms for your trajectories here. If "
+"needed, you can also upload up to 10 sets of additional forms. <br/> These "
+"extra fields can be removed by clearing all forms in one section."
 
-#: proposals/templates/proposals/study_consent.html:85
+#: proposals/templates/proposals/study_consent.html:83
 msgid ""
 "Gebruik de juiste (meest recente) <a href=\"https://intranet.uu.nl/"
 "documenten-ethische-toetsingscommissie-gw\" "
@@ -2906,7 +2855,7 @@ msgstr ""
 "en/documents-ethics-assessment-committee-humanities\" "
 "target=\"_blank\">model documents</a> for <em>informed consent</em>."
 
-#: proposals/templates/proposals/study_consent.html:95
+#: proposals/templates/proposals/study_consent.html:93
 msgid ""
 "Let op dat je documenten geen redactionele fouten en/of taalfouten bevatten: "
 "een aanvraag kan hierom direct voor revisie worden teruggestuurd."
@@ -2915,7 +2864,7 @@ msgstr ""
 "grammatical errors. Your application may be sent straight back for revision "
 "because of these."
 
-#: proposals/templates/proposals/study_consent.html:98
+#: proposals/templates/proposals/study_consent.html:96
 msgid ""
 "Bij ontvangst worden alle bestandsnamen gewijzigd, zet hier dus geen "
 "belangrijke informatie in."
@@ -2923,7 +2872,7 @@ msgstr ""
 "Files are renamed upon arrival, so please do not put information in the "
 "filename that you later rely on."
 
-#: proposals/templates/proposals/study_consent.html:104
+#: proposals/templates/proposals/study_consent.html:103
 msgid ""
 "Omdat er in één of meer trajecten onderzoek wordt uitgevoerd op een externe "
 "locatie waar toestemming voor vereist is, vragen we daar om een tweede set "
@@ -2939,18 +2888,18 @@ msgstr ""
 "head of department of a medical institution. If applicable, please include "
 "the information letter for parents or guardians."
 
-#: proposals/templates/proposals/study_consent.html:132
+#: proposals/templates/proposals/study_consent.html:136
 msgid "Voeg extra formulieren toe"
 msgstr "Add additional forms"
 
-#: proposals/templates/proposals/study_consent.html:138
+#: proposals/templates/proposals/study_consent.html:142
 msgid "Extra formulieren"
 msgstr "Additional forms"
 
 #: proposals/templates/proposals/study_start.html:7
-#: proposals/templates/proposals/study_start.html:64
-#: proposals/utils/pdf_diff_logic.py:520
-#: proposals/utils/validate_proposal.py:87
+#: proposals/templates/proposals/study_start.html:63
+#: proposals/utils/pdf_diff_logic.py:530
+#: proposals/utils/validate_proposal.py:94
 msgid "Eén of meerdere trajecten?"
 msgstr "One or more trajectories?"
 
@@ -2975,20 +2924,20 @@ msgstr ""
 "You can now describe the nature of <em>each trajectory</em> of the study on "
 "the following pages."
 
-#: proposals/templates/proposals/table_with_header_diff.html:13
+#: proposals/templates/proposals/table_with_header_diff.html:11
 msgid "Originele aanvraag"
 msgstr "Original application"
 
-#: proposals/templates/proposals/table_with_header_diff.html:14
+#: proposals/templates/proposals/table_with_header_diff.html:12
 msgid "Revisie/amendement"
 msgstr "Revision/amendment"
 
-#: proposals/templates/proposals/translated_consent_forms.html:25
+#: proposals/templates/proposals/translated_consent_forms.html:24
 #: proposals/utils/validate_proposal.py:223
 msgid "Vertaling informed consent formulieren"
 msgstr "Translation of informed consent forms"
 
-#: proposals/templates/proposals/translated_consent_forms.html:29
+#: proposals/templates/proposals/translated_consent_forms.html:26
 msgid ""
 "Documenten moet in het Nederlands of in het Engels worden ingediend. Echter, "
 "om je deelnemers op een adequate manier te informeren kan het noodzakelijk "
@@ -3074,12 +3023,12 @@ msgid "Revisie/amendement van"
 msgstr "Revision/amendment of"
 
 #: proposals/templates/proposals/wmo_application.html:7
-#: proposals/templates/proposals/wmo_application.html:27
-#: proposals/utils/pdf_diff_logic.py:512
+#: proposals/templates/proposals/wmo_application.html:26
+#: proposals/utils/pdf_diff_logic.py:522
 msgid "Aanmelding bij de METC"
 msgstr "Registration with the METC"
 
-#: proposals/templates/proposals/wmo_application.html:33
+#: proposals/templates/proposals/wmo_application.html:34
 msgid ""
 "Zolang je aanvraag nog niet is beoordeeld door de METC, kan je niet verder "
 "in het aanmeldingsproces."
@@ -3088,17 +3037,17 @@ msgstr ""
 "the application process."
 
 #: proposals/templates/proposals/wmo_check.html:7
-#: proposals/templates/proposals/wmo_check.html:26
+#: proposals/templates/proposals/wmo_check.html:27
 msgid "WMO-check"
 msgstr "WMO check"
 
-#: proposals/templates/proposals/wmo_check.html:31
+#: proposals/templates/proposals/wmo_check.html:37
 msgid "Opnieuw beginnen"
 msgstr "Start again"
 
 #: proposals/templates/proposals/wmo_form.html:7
 #: proposals/templates/proposals/wmo_form.html:30
-#: proposals/utils/pdf_diff_logic.py:487
+#: proposals/utils/pdf_diff_logic.py:497
 msgid ""
 "Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?"
 msgstr ""
@@ -3119,138 +3068,138 @@ msgstr ""
 "This section was present in the original application, but was removed for "
 "the revision."
 
-#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:119
+#: proposals/utils/pdf_diff_logic.py:248 reviews/models.py:111
 msgid "Onbekend"
 msgstr "Unknown"
 
-#: proposals/utils/pdf_diff_logic.py:281
+#: proposals/utils/pdf_diff_logic.py:291
 msgid "Download"
 msgstr "Download"
 
-#: proposals/utils/pdf_diff_logic.py:284
+#: proposals/utils/pdf_diff_logic.py:294
 msgid "Niet aangeleverd"
 msgstr "Not provided"
 
-#: proposals/utils/pdf_diff_logic.py:307 tasks/templates/tasks/task_end.html:7
-#: tasks/templates/tasks/task_end.html:18
+#: proposals/utils/pdf_diff_logic.py:317 tasks/templates/tasks/task_end.html:7
+#: tasks/templates/tasks/task_end.html:16
 msgid "Overzicht van het takenonderzoek"
 msgstr "Overview of task-based research"
 
-#: proposals/utils/pdf_diff_logic.py:320 proposals/utils/pdf_diff_logic.py:347
-#: proposals/utils/pdf_diff_logic.py:356 proposals/utils/pdf_diff_logic.py:380
+#: proposals/utils/pdf_diff_logic.py:330 proposals/utils/pdf_diff_logic.py:357
+#: proposals/utils/pdf_diff_logic.py:366 proposals/utils/pdf_diff_logic.py:390
 msgid "Traject "
 msgstr "Trajectory "
 
-#: proposals/utils/pdf_diff_logic.py:350 proposals/utils/pdf_diff_logic.py:383
+#: proposals/utils/pdf_diff_logic.py:360 proposals/utils/pdf_diff_logic.py:393
 msgid "sessie "
 msgstr "session "
 
-#: proposals/utils/pdf_diff_logic.py:363 proposals/utils/pdf_diff_logic.py:391
+#: proposals/utils/pdf_diff_logic.py:373 proposals/utils/pdf_diff_logic.py:401
 msgid "Sessie "
 msgstr "Session "
 
-#: proposals/utils/pdf_diff_logic.py:385 proposals/utils/pdf_diff_logic.py:393
+#: proposals/utils/pdf_diff_logic.py:395 proposals/utils/pdf_diff_logic.py:403
 msgid ", taak "
 msgstr ", task "
 
-#: proposals/utils/pdf_diff_logic.py:538
+#: proposals/utils/pdf_diff_logic.py:548
 #: studies/templates/studies/study_form.html:7
-#: studies/templates/studies/study_form.html:82
+#: studies/templates/studies/study_form.html:80
 msgid "De deelnemers"
 msgstr "Participants"
 
-#: proposals/utils/pdf_diff_logic.py:742
+#: proposals/utils/pdf_diff_logic.py:752
 #: studies/templates/studies/session_start.html:7
-#: studies/templates/studies/session_start.html:17
+#: studies/templates/studies/session_start.html:16
 #: tasks/templates/tasks/task_form.html:7
-#: tasks/templates/tasks/task_form.html:30
+#: tasks/templates/tasks/task_form.html:27
 #: tasks/templates/tasks/task_start.html:7
-#: tasks/templates/tasks/task_start.html:28
+#: tasks/templates/tasks/task_start.html:27
 msgid "Het takenonderzoek en interviews"
 msgstr "Task-based research and interviews"
 
-#: proposals/utils/pdf_diff_logic.py:830
+#: proposals/utils/pdf_diff_logic.py:840
 #: studies/templates/studies/study_end.html:7
-#: studies/templates/studies/study_end.html:28
+#: studies/templates/studies/study_end.html:27
 msgid "Overzicht en eigen beoordeling van het gehele onderzoek"
 msgstr "Overview and self-assessment of the entire study"
 
-#: proposals/utils/pdf_diff_logic.py:939
+#: proposals/utils/pdf_diff_logic.py:950
 msgid "Extra formulieren "
 msgstr "Additional forms "
 
-#: proposals/utils/proposal_utils.py:42 proposals/utils/validate_proposal.py:69
-#: proposals/utils/validate_proposal.py:76
+#: proposals/utils/proposal_utils.py:51 proposals/utils/validate_proposal.py:76
+#: proposals/utils/validate_proposal.py:83
 msgid "Ethische toetsing nodig door een METC?"
 msgstr "Ethical assessment by a METC necessary?"
 
-#: proposals/utils/proposal_utils.py:68
+#: proposals/utils/proposal_utils.py:87
 msgid "Algemeen"
 msgstr "General"
 
-#: proposals/utils/proposal_utils.py:73
+#: proposals/utils/proposal_utils.py:91
 msgid "METC"
 msgstr "METC"
 
-#: proposals/utils/proposal_utils.py:87
+#: proposals/utils/proposal_utils.py:98
 msgid "Trajecten"
 msgstr "Trajectories"
 
-#: proposals/utils/proposal_utils.py:100
+#: proposals/utils/proposal_utils.py:108
 msgid "Uploaden"
 msgstr "Upload"
 
-#: proposals/utils/proposal_utils.py:107
+#: proposals/utils/proposal_utils.py:111
 msgid "Vertaling"
 msgstr "Translation"
 
-#: proposals/utils/proposal_utils.py:114
+#: proposals/utils/proposal_utils.py:115
 msgid "Formulieren"
 msgstr "Forms"
 
-#: proposals/utils/proposal_utils.py:122
+#: proposals/utils/proposal_utils.py:119
 msgid "Versturen"
 msgstr "Submit"
 
-#: proposals/utils/proposal_utils.py:415
+#: proposals/utils/proposal_utils.py:417
 msgid "FETC-GW: gereviseerde aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: A revised application uses lab facilities"
 
-#: proposals/utils/proposal_utils.py:417
+#: proposals/utils/proposal_utils.py:419
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
-#: proposals/utils/validate_proposal.py:98
+#: proposals/utils/validate_proposal.py:105
 msgid "De deelnemers (traject {})"
 msgstr "Participants (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:106
+#: proposals/utils/validate_proposal.py:113
 msgid "De onderzoekstype(n) (traject {})"
 msgstr "Type(s) of research (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:119
-#: proposals/utils/validate_proposal.py:128
+#: proposals/utils/validate_proposal.py:123
+#: proposals/utils/validate_proposal.py:132
 msgid "Het interventieonderzoek (traject {})"
 msgstr "Intervention study (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:143
-#: proposals/utils/validate_proposal.py:152
+#: proposals/utils/validate_proposal.py:144
+#: proposals/utils/validate_proposal.py:153
 msgid "Het observatieonderzoek (traject {})"
 msgstr "Observational study (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:163
+#: proposals/utils/validate_proposal.py:164
 msgid "Het takenonderzoek (traject {})"
 msgstr "Task-based research: trajectory {}"
 
-#: proposals/utils/validate_proposal.py:178
+#: proposals/utils/validate_proposal.py:179
 msgid "Het takenonderzoek: sessie {} (traject {})"
 msgstr "Task-based research: session {} trajectory {}"
 
-#: proposals/utils/validate_proposal.py:195
+#: proposals/utils/validate_proposal.py:196
 msgid "Het takenonderzoek: sessie {} taak {} (traject {})"
 msgstr "Task-based research: session {} task {} (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:212
+#: proposals/utils/validate_proposal.py:213
 msgid "Overzicht van takenonderzoek: sessie {} (traject {})"
 msgstr "Overview of task-based research: session {} (trajectory {})"
 
@@ -3258,40 +3207,40 @@ msgstr "Overview of task-based research: session {} (trajectory {})"
 msgid "AVG en Data Management"
 msgstr "AVG and Data Management"
 
-#: proposals/views/proposal_views.py:45
+#: proposals/views/proposal_views.py:63
 msgid "Publiek archief"
 msgstr "Public archive"
 
-#: proposals/views/proposal_views.py:46
+#: proposals/views/proposal_views.py:64
 msgid "Dit overzicht toont alle goedgekeurde aanvragen."
 msgstr "This overview shows all approved applications."
 
-#: proposals/views/proposal_views.py:65
+#: proposals/views/proposal_views.py:83
 msgid "Mijn aanvraag"
 msgstr "My application"
 
-#: proposals/views/proposal_views.py:66
+#: proposals/views/proposal_views.py:84
 msgid "Dit overzicht toont al je aanvragen."
 msgstr "This overview shows all your applications."
 
-#: proposals/views/proposal_views.py:79
+#: proposals/views/proposal_views.py:99
 msgid "Dit overzicht toont al je nog niet ingediende aanvragen."
 msgstr "This overview shows all the applications you have not yet submitted."
 
-#: proposals/views/proposal_views.py:91
+#: proposals/views/proposal_views.py:113
 msgid "Dit overzicht toont al je ingediende aanvragen."
 msgstr "This overview shows all the applications you have submitted."
 
-#: proposals/views/proposal_views.py:103
+#: proposals/views/proposal_views.py:127
 msgid "Dit overzicht toont al je beoordeelde aanvragen."
 msgstr "This overview shows all your applications that have been assessed."
 
-#: proposals/views/proposal_views.py:116
+#: proposals/views/proposal_views.py:142
 msgid ""
 "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent."
 msgstr "This overview shows all your supervised applications."
 
-#: proposals/views/proposal_views.py:129
+#: proposals/views/proposal_views.py:159
 msgid ""
 "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of "
 "eindverantwoordelijke bij betrokken bent."
@@ -3299,60 +3248,60 @@ msgstr ""
 "This overview shows all practice applications in which you are involved as a "
 "student, researcher or accountable researcher."
 
-#: proposals/views/proposal_views.py:248
+#: proposals/views/proposal_views.py:279
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:398
+#: proposals/views/proposal_views.py:432
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:499
+#: proposals/views/proposal_views.py:532
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
-#: proposals/views/study_views.py:61
+#: proposals/views/study_views.py:62
 msgid "Consent opgeslagen"
 msgstr "Consent saved"
 
-#: proposals/views/wmo_views.py:52
+#: proposals/views/wmo_views.py:56
 msgid "WMO-gegevens opgeslagen"
 msgstr "WMO information saved"
 
-#: proposals/views/wmo_views.py:65
+#: proposals/views/wmo_views.py:69
 msgid "WMO-gegevens bewerkt"
 msgstr "WMO information edited"
 
-#: proposals/views/wmo_views.py:148
+#: proposals/views/wmo_views.py:156
 msgid "Je onderzoek hoeft niet te worden beoordeeld door de METC."
 msgstr "Your application does not require assessment by an METC."
 
-#: proposals/views/wmo_views.py:155
+#: proposals/views/wmo_views.py:164
 #, python-brace-format
 msgid ""
 "Neem contact op met <a href=\"{link}\">{secretary}</a> om de twijfels weg te "
 "nemen."
 msgstr "Contact <a href=\"{link}\">{secretary}</a> to make sure."
 
-#: proposals/views/wmo_views.py:161
+#: proposals/views/wmo_views.py:171
 msgid "Je onderzoek zal moeten worden beoordeeld door de METC."
 msgstr "Your application will require assessment by an METC."
 
-#: reviews/api/views.py:31 reviews/api/views.py:320
+#: reviews/api/views.py:32 reviews/api/views.py:316
 #: reviews/templates/reviews/vue_templates/decision_list.html:111
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:61
 #: reviews/templates/reviews/vue_templates/review_list.html:116
 msgid "Stadium"
 msgstr "Stage"
 
-#: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:31
+#: reviews/api/views.py:36 reviews/api/views.py:320 reviews/models.py:31
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
 #: reviews/templates/reviews/vue_templates/review_list.html:183
 msgid "Route"
 msgstr "Route"
 
-#: reviews/api/views.py:53 reviews/api/views.py:284 reviews/api/views.py:346
+#: reviews/api/views.py:54 reviews/api/views.py:281 reviews/api/views.py:342
 msgid "Start datum"
 msgstr "Start date review"
 
@@ -3368,303 +3317,225 @@ msgstr "long route (4-weeks)"
 msgid "Direct terug naar aanvrager (Nog niet in behandeling)"
 msgstr "Return directly to applicant (not yet under review)"
 
-#: reviews/forms.py:33 reviews/menus.py:60 reviews/mixins.py:127
+#: reviews/forms.py:34 reviews/menus.py:66 reviews/mixins.py:173
 msgid "Algemene Kamer"
 msgstr "General Chamber"
 
-#: reviews/forms.py:34 reviews/menus.py:67 reviews/mixins.py:130
+#: reviews/forms.py:35 reviews/menus.py:76 reviews/mixins.py:176
 msgid "Linguïstiek Kamer"
 msgstr "Linguistics Chamber"
 
-#: reviews/forms.py:66
+#: reviews/forms.py:68
 msgid "Selecteer de commissieleden"
 msgstr "Select committee members"
 
-#: reviews/forms.py:75
+#: reviews/forms.py:78
 msgid "Er moet tenminste één beoordelaar geselecteerd worden."
 msgstr "You must select at least one reviewer."
 
-#: reviews/forms.py:110
+#: reviews/forms.py:119
 msgid "Voeg deze aanvraag toe aan het archief"
 msgstr "Add this application to the archive"
 
-#: reviews/forms.py:116
+#: reviews/forms.py:127
 msgid "Opmerkingen over revisie"
 msgstr "Comments about this revision"
 
-#: reviews/forms.py:123
+#: reviews/forms.py:133
 msgid "Bevestig beëindiging"
 msgstr "Confirm termination of this review"
 
-#: reviews/forms.py:156
+#: reviews/forms.py:167
 msgid "Start datum periode:"
 msgstr "Start date period:"
 
-#: reviews/forms.py:157
+#: reviews/forms.py:168
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
-#: reviews/menus.py:14 reviews/views.py:71
+#: reviews/menus.py:18 reviews/views.py:72
 msgid "Mijn openstaande besluiten"
 msgstr "My pending decisions"
 
-#: reviews/menus.py:18
+#: reviews/menus.py:22
 msgid "Al mijn besluiten"
 msgstr "All my decisions"
 
-#: reviews/menus.py:22
+#: reviews/menus.py:26
 msgid "Alle openstaande besluiten commissieleden"
 msgstr "All pending decisions committee members"
 
-#: reviews/menus.py:27
+#: reviews/menus.py:31
 msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
-#: reviews/menus.py:32 reviews/views.py:230
+#: reviews/menus.py:36 reviews/views.py:229
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
-#: reviews/menus.py:37 reviews/views.py:242
+#: reviews/menus.py:41 reviews/views.py:241
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:42 reviews/views.py:254
+#: reviews/menus.py:46 reviews/views.py:253
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
-#: reviews/menus.py:47 reviews/views.py:276
+#: reviews/menus.py:51 reviews/views.py:275
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
-#: reviews/menus.py:52
+#: reviews/menus.py:56
 msgid "Overzicht werkverdeling commissieleden"
 msgstr "Overview workload committee members"
 
-#: reviews/models.py:13
+#: reviews/models.py:12
 msgid "Beoordeling door eindverantwoordelijke"
 msgstr "Assessment by researcher with final responsibility"
 
-#: reviews/models.py:14
+#: reviews/models.py:13
 msgid "Aanstelling commissieleden"
 msgstr "Appointment of committee members"
 
-#: reviews/models.py:15
+#: reviews/models.py:14
 msgid "Beoordeling door commissie"
 msgstr "Assessment by committee"
 
-#: reviews/models.py:16
+#: reviews/models.py:15
 msgid "Afsluiting door secretaris"
 msgstr "Conclusion by secretary"
 
-#: reviews/models.py:17
+#: reviews/models.py:16
 msgid "Afgesloten"
 msgstr "Concluded"
 
-#: reviews/models.py:20
+#: reviews/models.py:19
 msgid "Goedkeuring door FETC-GW"
 msgstr "Approval by FEtC-H"
 
-#: reviews/models.py:21
+#: reviews/models.py:20
 msgid "Revisie noodzakelijk"
 msgstr "Revision necessary"
 
-#: reviews/models.py:22
+#: reviews/models.py:21
 msgid "Afwijzing door FETC-GW"
 msgstr "Rejection by FEtC-H"
 
-#: reviews/models.py:23
+#: reviews/models.py:22
 msgid "Open review met lange (4-weken) route"
 msgstr "Open review on long (4-week) route"
 
-#: reviews/models.py:24
+#: reviews/models.py:23
 msgid "Laat opnieuw beoordelen door METC"
 msgstr "Submit for reassessment by METC"
 
-#: reviews/models.py:25
+#: reviews/models.py:24
 msgid "Positief advies van FETC-GW, post-hoc"
 msgstr "Post hoc positive advice by FEtC-H"
 
-#: reviews/models.py:26
+#: reviews/models.py:25
 msgid "Negatief advies van FETC-GW, post-hoc"
 msgstr "Post hoc negative advice by FETC-H"
 
-#: reviews/models.py:27
+#: reviews/models.py:26
 msgid "Niet verder in behandeling genomen"
 msgstr "Not to be assessed further"
 
-#: reviews/models.py:37 reviews/models.py:164
+#: reviews/models.py:32 reviews/models.py:157
 #: reviews/templates/reviews/review_table.html:9
 msgid "Beslissing"
 msgstr "Decision"
 
-#: reviews/models.py:131
+#: reviews/models.py:123
 msgid "lange (4-weken) route"
 msgstr "long (4-week) route"
 
-#: reviews/models.py:132
+#: reviews/models.py:124
 msgid "korte (2-weken) route"
 msgstr "short (2-week) route"
 
-#: reviews/models.py:133
+#: reviews/models.py:125
 msgid "nog geen route"
 msgstr "no route assigned"
 
-#: reviews/models.py:159
+#: reviews/models.py:152
 msgid "goedgekeurd"
 msgstr "endorsed"
 
-#: reviews/models.py:160
+#: reviews/models.py:153
 msgid "niet goedgekeurd"
 msgstr "not endorsed"
 
-#: reviews/models.py:161
+#: reviews/models.py:154
 msgid "revisie noodzakelijk"
 msgstr "revision necessary"
 
-#: reviews/templates/reviews/action_explaination.html:22
-#, python-format
-msgid ""
-"\n"
-"                Klik op <img src=\"%(img_pdf)s\" title=\"Inzien\"> om een "
-"ingediende aanvraag in te zien.\n"
-"            "
-msgstr ""
-"\n"
-"        Click <img src=\"%(img_pdf)s\" title=\"Show\"> to view a submitted "
-"application.\n"
-"        "
-
-#: reviews/templates/reviews/action_explaination.html:27
-#, python-format
-msgid ""
-"\n"
-"                Klik op <img src=\"%(img_diff)s\" title=\"Toon "
-"verschillen\"> om de verschillen met de voorgaande\n"
-"                versie te zien (alleen beschikbaar voor revisies/"
-"amendementen).\n"
-"            "
-msgstr ""
-"\n"
-"        Click <img src=\"%(img_diff)s\" title=\"Show differences\"> to show "
-"differences between a previous version (only available for revisions/"
-"amendments).\n"
-"        "
-
-#: reviews/templates/reviews/action_explaination.html:33
+#: reviews/templates/reviews/action_explaination.html:36
 #, python-format
 msgid ""
-"\n"
-"                Klik op <img src=\"%(img_details)s\" title=\"Toon details\"> "
-"om alle details en beoordelingen van\n"
-"                een ingediende aanvraag te zien.\n"
-"            "
+"Klik op <img src=\"%(img_details)s\" title=\"Toon details\"> om alle details "
+"en beoordelingen van een ingediende aanvraag te zien."
 msgstr ""
-"\n"
-"        Click <img src=\"%(img_details)s\" title=\"Show details\"> to view "
-"details of a submitted application.\n"
-"        "
+"Click <img src=\"%(img_details)s\" title=\"Show details\"> to view details "
+"of a submitted application."
 
-#: reviews/templates/reviews/action_explaination.html:39
+#: reviews/templates/reviews/action_explaination.html:44
 #, python-format
 msgid ""
-"\n"
-"                Klik op <img src=\"%(img_decide)s\" title=\"Beslissen\"> om "
-"je beslissing door te geven.\n"
-"            "
+"Klik op <img src=\"%(img_decide)s\" title=\"Beslissen\"> om je beslissing "
+"door te geven."
 msgstr ""
-"\n"
-"        Click <img src=\"%(img_decide)s\" title=\"Decide\"> to make your "
-"decision.\n"
-"        "
+"Click <img src=\"%(img_decide)s\" title=\"Decide\"> to make your decision "
+"(as a supervisor)."
 
-#: reviews/templates/reviews/action_explaination.html:46
+#: reviews/templates/reviews/action_explaination.html:53
 msgid "Uitleg secretaris"
 msgstr "Explanation for secretary"
 
-#: reviews/templates/reviews/action_explaination.html:50
-#, python-format
-msgid ""
-"\n"
-"                    Klik op <img src=\"%(img_hide)s\" title=\"Verbergen\"> "
-"om een ingediende aanvraag te verbergen uit het\n"
-"                    archief.\n"
-"                "
-msgstr ""
-"\n"
-"        Click <img src=\"%(img_hide)s\" title=\"Hide\"> to hide a submitted "
-"application from the archive.\n"
-"        "
-
-#: reviews/templates/reviews/action_explaination.html:62
+#: reviews/templates/reviews/action_explaination.html:73
 #, python-format
 msgid ""
-"\n"
-"                    Klik op <img src=\"%(img_add_reviewers)s\" "
-"title=\"Aanstellen\"> om beoordelaars aan te stellen.\n"
-"                "
+"Klik op <img src=\"%(img_add_reviewers)s\" title=\"Aanstellen\"> om "
+"beoordelaars aan te stellen."
 msgstr ""
-"\n"
-"        Click <img src=\"%(img_add_reviewers)s\" title=\"Assign\"> to assign "
-"reviewers.\n"
-"  "
+"Click <img src=\"%(img_add_reviewers)s\" title=\"Assign\"> to assign "
+"reviewers."
 
-#: reviews/templates/reviews/action_explaination.html:67
+#: reviews/templates/reviews/action_explaination.html:80
 #, python-format
 msgid ""
-"\n"
-"                    Klik op <img src=\"%(img_change_chamber)s\" "
-"title=\"Verplaats naar andere kamer\"> om een aanvraag\n"
-"                    te verplaatsen naar een andere kamer.\n"
-"                "
+"Klik op <img src=\"%(img_change_chamber)s\" title=\"Verplaats naar andere "
+"kamer\"> om een aanvraag te verplaatsen naar een andere kamer."
 msgstr ""
-"\n"
-"                    Click on <img src=\"%(img_change_chamber)s\" "
-"title=\"Move to other chamber\"> to move an application \n"
-"                    to a different chamber.\n"
-"                "
+"Click on <img src=\"%(img_change_chamber)s\" title=\"Move to other "
+"chamber\"> to move an application to a different chamber."
 
-#: reviews/templates/reviews/action_explaination.html:73
+#: reviews/templates/reviews/action_explaination.html:88
 #, python-format
 msgid ""
-"\n"
-"                    Klik op <img src=\"%(img_close)s\" title=\"Afsluiten\"> "
-"om een aanvraag af te sluiten.\n"
-"                "
+"Klik op <img src=\"%(img_close)s\" title=\"Afsluiten\"> om een aanvraag af "
+"te sluiten."
 msgstr ""
-"\n"
-"                    Click on <img src=\"%(img_close)s\" title=\"Conclude\"> "
-"to conclude an application.\n"
-"                "
+"Click on <img src=\"%(img_close)s\" title=\"Conclude\"> to conclude an "
+"application."
 
-#: reviews/templates/reviews/action_explaination.html:78
+#: reviews/templates/reviews/action_explaination.html:95
 #, python-format
 msgid ""
-"\n"
-"                    Klik op <img src=\"%(img_confirm)s\" "
-"title=\"Bevestigingsbrief\"> om aan te geven dat de\n"
-"                    bevestigingsbrief is verstuurd.\n"
-"                "
+"Klik op <img src=\"%(img_confirm)s\" title=\"Bevestigingsbrief\"> om aan te "
+"geven dat de bevestigingsbrief is verstuurd."
 msgstr ""
-"\n"
-"                    Click on <img src=\"%(img_confirm)s\" "
-"title=\"Confirmation letter\"> to note that the\n"
-"                    confirmation letter has been sent.\n"
-"                "
+"Click on <img src=\"%(img_confirm)s\" title=\"Confirmation letter\"> to note "
+"that the confirmation letter has been sent."
 
-#: reviews/templates/reviews/action_explaination.html:84
+#: reviews/templates/reviews/action_explaination.html:103
 #, python-format
 msgid ""
-"\n"
-"                    Klik op <img src=\"%(img_confirmed)s\" "
-"title=\"Bevestigingsbrief\"> om de opgegeven datum\n"
-"                    van de bevestigingsbrief te veranderen.\n"
-"                "
+"Klik op <img src=\"%(img_confirmed)s\" title=\"Bevestigingsbrief\"> om de "
+"opgegeven datum van de bevestigingsbrief te veranderen."
 msgstr ""
-"\n"
-"                    Click on <img src=\"%(img_confirmed)s\" "
-"title=\"Confirmation letter\"> to change the date of \n"
-"                    the confirmation letter.\n"
-"                "
+"Click on <img src=\"%(img_confirmed)s\" title=\"Confirmation letter\"> to "
+"change the date of the confirmation letter."
 
 #: reviews/templates/reviews/auto_review.html:3
 msgid "Uitkomst automatische review"
@@ -3688,13 +3559,13 @@ msgid "Redenen"
 msgstr "Reasons"
 
 #: reviews/templates/reviews/change_chamber_form.html:7
-#: reviews/templates/reviews/change_chamber_form.html:14
+#: reviews/templates/reviews/change_chamber_form.html:13
 msgid "Beoordelende kamer wijzigen"
 msgstr "Change reviewing chamber"
 
-#: reviews/templates/reviews/change_chamber_form.html:18
-#: reviews/templates/reviews/review_assign_form.html:48
-#: reviews/templates/reviews/review_discontinue_form.html:74
+#: reviews/templates/reviews/change_chamber_form.html:21
+#: reviews/templates/reviews/review_assign_form.html:49
+#: reviews/templates/reviews/review_discontinue_form.html:73
 msgid "OK"
 msgstr "OK"
 
@@ -3707,49 +3578,49 @@ msgstr "%(committee)s workload overview"
 msgid "Lopende reviews"
 msgstr "Ongoing reviews"
 
-#: reviews/templates/reviews/committee_members_workload.html:23
-#: reviews/templates/reviews/committee_members_workload.html:78
+#: reviews/templates/reviews/committee_members_workload.html:22
+#: reviews/templates/reviews/committee_members_workload.html:70
 #: reviews/templates/reviews/review_table.html:8
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:68
 msgid "Reviewer"
 msgstr "Reviewer"
 
-#: reviews/templates/reviews/committee_members_workload.html:38
-#: reviews/templates/reviews/committee_members_workload.html:80
+#: reviews/templates/reviews/committee_members_workload.html:37
+#: reviews/templates/reviews/committee_members_workload.html:72
 msgid "Korte route"
 msgstr "Short route"
 
-#: reviews/templates/reviews/committee_members_workload.html:40
+#: reviews/templates/reviews/committee_members_workload.html:39
 msgid "Lange route"
 msgstr "Long route"
 
-#: reviews/templates/reviews/committee_members_workload.html:63
+#: reviews/templates/reviews/committee_members_workload.html:57
 msgid "Werkverdeling overzicht van afgelopen periode"
 msgstr "Workload overview of past period"
 
-#: reviews/templates/reviews/committee_members_workload.html:65
+#: reviews/templates/reviews/committee_members_workload.html:58
 msgid ""
 "Vul hieronder een start- en einddatum in voor de periode van dit overzicht."
 msgstr "Select a start- and enddate for the period of the overview below."
 
-#: reviews/templates/reviews/committee_members_workload.html:72
+#: reviews/templates/reviews/committee_members_workload.html:64
 msgid "Periode toepassen"
 msgstr "Apply period"
 
-#: reviews/templates/reviews/committee_members_workload.html:79
+#: reviews/templates/reviews/committee_members_workload.html:71
 msgid "Totaal"
 msgstr "Total"
 
-#: reviews/templates/reviews/committee_members_workload.html:81
+#: reviews/templates/reviews/committee_members_workload.html:73
 msgid "Lange Route"
 msgstr "Long route"
 
 #: reviews/templates/reviews/decision_form.html:7
-#: reviews/templates/reviews/decision_form.html:17
+#: reviews/templates/reviews/decision_form.html:16
 msgid "Aanvraag beoordelen"
 msgstr "Assess the application"
 
-#: reviews/templates/reviews/decision_form.html:24
+#: reviews/templates/reviews/decision_form.html:22
 #, python-format
 msgid ""
 "Je kunt nu een go of no-go geven voor de aanvraag <em>%(title)s</em>, "
@@ -3757,16 +3628,16 @@ msgid ""
 "target=\"_blank\">hier</a> in te zien (downloadt als PDF)."
 msgstr ""
 "    You can now give a go or no-go for the application <em>%(title)s</em>, "
-"%(refnum)s in %(chamber)s.\n"
+"%(refnum)s in %(chamber)s."
 "    You can see the details of this application <a href=\"%(pdf_url)s\" "
 "target=\"_blank\">here</a> (downloads as PDF)."
 
-#: reviews/templates/reviews/decision_form.html:32
+#: reviews/templates/reviews/decision_form.html:30
 #, python-format
-msgid "Je kunt nu de aanvraag <em>%(title)s</em> bekijken.<br/>"
-msgstr "You can now (re)view this application here: <em>%(title)s</em>."
+msgid "Je kunt nu de aanvraag <em>%(title)s</em> bekijken. <br />"
+msgstr "You can now (re)view this application here: <em>%(title)s</em>. <br />"
 
-#: reviews/templates/reviews/decision_form.html:37
+#: reviews/templates/reviews/decision_form.html:36
 msgid ""
 "Als de aanvraag (incl. geïnformeerde toestemmingsformulieren) in orde is, "
 "klik dan op ‘goedgekeurd’ en ‘Beslissing opslaan’ hieronder; dan wordt de "
@@ -3776,7 +3647,7 @@ msgstr ""
 "'endorsed' and 'Save decision' below; the application will then be submitted "
 "to the FEtC-H. "
 
-#: reviews/templates/reviews/decision_form.html:44
+#: reviews/templates/reviews/decision_form.html:43
 msgid ""
 "Als de aanvraag nog niet in orde is, dan zijn er twee mogelijkheden om de "
 "aanvraag aan te passen:"
@@ -3784,10 +3655,10 @@ msgstr ""
 "If the application is not yet in order, there are two methods to amend the "
 "study: "
 
-#: reviews/templates/reviews/decision_form.html:51
+#: reviews/templates/reviews/decision_form.html:50
 #, python-format
 msgid ""
-"door de supervisor (jijzelf)<br/> Als supervisor kan je deze aanvraag <a "
+"door de supervisor (jijzelf) <br /> Als supervisor kan je deze aanvraag <a "
 "href=\"%(update_url)s\" target=\"_blank\">hier</a> aanpassen. Daarna word je "
 "teruggeleid naar deze pagina en kun je hieronder de aanvraag goedkeuren; dat "
 "betekent dat de aanvraag wordt ingediend bij de FETC-GW."
@@ -3799,20 +3670,20 @@ msgstr ""
 
 #: reviews/templates/reviews/decision_form.html:59
 msgid ""
-"door de indiener (je student of promovendus)<br/> Indien je wilt dat de "
+"door de indiener (je student of promovendus) <br /> Indien je wilt dat de "
 "indiener de aanvraag zelf aanpast voordat je de studie kunt goedkeuren en "
 "daarmee bij de FETC-GW indient, selecteer dan 'revisie noodzakelijk' of "
 "‘niet goedgekeurd’ hieronder, voeg eventuele opmerkingen toe, en klik op "
 "'Beslissing opslaan'. Zodra je dit gedaan hebt kan de indiener weer "
-"aanpassingen doen. <br/>"
+"aanpassingen doen. <br />"
 msgstr ""
 "by the submitter (your student or PhD candidate)<br/>If you want the "
 "submitter to amend the application before you approve it (and thereby submit "
 "it to the FEtC-H), select 'revision necessary' or 'not endorsed' below, add "
 "any comments, and click 'Save decision'. Once you have done this, the "
-"submitter can make changes again. <br/> "
+"submitter can make changes again. <br /> "
 
-#: reviews/templates/reviews/decision_form.html:70
+#: reviews/templates/reviews/decision_form.html:71
 msgid ""
 "Als de indiener de gevraagde wijzigingen heeft doorgevoerd en opnieuw heeft "
 "verstuurd, zal je de aangepaste aanvraag opnieuw moeten beoordelen."
@@ -3820,77 +3691,66 @@ msgstr ""
 "Once the submitter has made the requested changes and resubmitted the "
 "application, you will have to re-evaluate the application. "
 
-#: reviews/templates/reviews/decision_form.html:80
+#: reviews/templates/reviews/decision_form.html:81
 #, python-format
 msgid ""
-"\n"
-"                            Dit is een revisie van of amendement op een "
-"vorige aanvraag. De verschillen met de vorige\n"
-"                            aanvraag zijn <a href=\"%(diff_url)s\">hier</a> "
-"in te zien.\n"
-"                        "
+"Dit is een revisie van of amendement op een vorige aanvraag. De verschillen "
+"met de vorige aanvraag zijn <a href=\"%(diff_url)s\">hier</a> in te zien."
 msgstr ""
-"\n"
-"    This is a revision or amendment of a previous application. You can check "
-"the differences compared to the previous application <a "
-"href=\"%(diff_url)s\">here</a>.\n"
-"    "
+"This is a revision or amendment of a previous application. You can check the "
+"differences compared to the previous application <a "
+"href=\"%(diff_url)s\">here</a>."
 
-#: reviews/templates/reviews/decision_form.html:93
+#: reviews/templates/reviews/decision_form.html:96
 msgid "Beslissing opslaan"
 msgstr "Save decision"
 
-#: reviews/templates/reviews/documents_list.html:36
-#: reviews/templates/reviews/documents_list.html:38
+#: reviews/templates/reviews/documents_list.html:26
+#: reviews/templates/reviews/documents_list.html:28
 msgid "Data Management Plan wijzigen"
 msgstr "Edit Data Management Plan"
 
-#: reviews/templates/reviews/documents_list.html:44
-#: reviews/templates/reviews/documents_list.html:46
+#: reviews/templates/reviews/documents_list.html:33
+#: reviews/templates/reviews/documents_list.html:35
 msgid "Documenten wijzigen"
 msgstr "Edit documents"
 
 #: reviews/templates/reviews/review_assign_form.html:7
-#: reviews/templates/reviews/review_assign_form.html:32
+#: reviews/templates/reviews/review_assign_form.html:29
 msgid "Commissieleden aanstellen"
 msgstr "Appoint committee members"
 
-#: reviews/templates/reviews/review_assign_form.html:36
+#: reviews/templates/reviews/review_assign_form.html:31
 #, python-format
 msgid ""
 "<p> Kies hier de geschikte route en commissieleden voor de aanvraag "
 "<em>%(title)s</em>. klik <a href=\"%(workload_url)s\">hier</a> voor een "
-"overzicht van de werkverdeling van deze commissie. <p\\>"
+"overzicht van de werkverdeling van deze commissie. </p>"
 msgstr ""
 "<p> Choose the appropriate route and committee members for the application "
 "<em>%(title)s</em> here. Click <a href=\"%(workload_url)s\">here</a> to see "
-"an overview of the workload for each committee member. <p\\>"
+"an overview of the workload for each committee member. </p>"
 
 #: reviews/templates/reviews/review_close_form.html:7
-#: reviews/templates/reviews/review_close_form.html:25
-#: reviews/templates/reviews/review_close_form.html:43
+#: reviews/templates/reviews/review_close_form.html:24
+#: reviews/templates/reviews/review_close_form.html:41
 msgid "Review afsluiten"
 msgstr "Conclude review"
 
-#: reviews/templates/reviews/review_close_form.html:28
+#: reviews/templates/reviews/review_close_form.html:26
 #, python-format
 msgid ""
-"\n"
-"                    Sluit hier de beoordeling van de aanvraag <em>%(title)s</"
-"em> af. Hieronder volgen de individuele\n"
-"                    beslissingen.\n"
-"                "
+"Sluit hier de beoordeling van de aanvraag <em>%(title)s</em> af. Hieronder "
+"volgen de individuele beslissingen."
 msgstr ""
-"\n"
-"\tConclude the review of application <em>%(title)s</em> here. The individual "
-"decisions follow below.\n"
-"\t"
+"Conclude the review of application <em>%(title)s</em> here. The individual "
+"decisions follow below."
 
-#: reviews/templates/reviews/review_close_form.html:33
+#: reviews/templates/reviews/review_close_form.html:31
 msgid "Individuele beslissingen"
 msgstr "Individual decisions"
 
-#: reviews/templates/reviews/review_close_form.html:35
+#: reviews/templates/reviews/review_close_form.html:33
 msgid "Uiteindelijk besluit"
 msgstr "Final decision"
 
@@ -3920,152 +3780,90 @@ msgstr ""
 
 #: reviews/templates/reviews/review_detail.html:11
 #, python-format
-msgid ""
-"\n"
-"        Details van besluitvorming bij aanmelding %(proposal)s\n"
-"    "
-msgstr ""
-"\n"
-"Details on the review process of application %(proposal)s\n"
-"     "
+msgid "Details van besluitvorming bij aanmelding %(proposal)s"
+msgstr "Details on the review process of application %(proposal)s"
 
 #: reviews/templates/reviews/review_detail.html:21
 #, python-format
-msgid ""
-"\n"
-"                    Details van besluitvorming bij aanmelding "
-"<em>%(proposal)s</em>\n"
-"                "
-msgstr ""
-"\n"
-"Details on the review process of application <em>%(proposal)s</em>\n"
-"     "
+msgid "Details van besluitvorming bij aanmelding <em>%(proposal)s</em>"
+msgstr "Details on the review process of application %(proposal)s"
 
-#: reviews/templates/reviews/review_detail.html:36
+#: reviews/templates/reviews/review_detail.html:33
 msgid "Reviewers"
 msgstr "Reviewers"
 
-#: reviews/templates/reviews/review_detail.html:39
+#: reviews/templates/reviews/review_detail.html:35
 msgid "Handelingen"
 msgstr "Actions"
 
-#: reviews/templates/reviews/review_detail.html:47
+#: reviews/templates/reviews/review_detail.html:40
 msgid "Geen handelingen beschikbaar"
 msgstr "No actions available"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:22
+#: reviews/templates/reviews/review_detail_sidebar.html:18
 msgid "Referentie"
 msgstr "Reference"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:25
+#: reviews/templates/reviews/review_detail_sidebar.html:19
 msgid "Commissie"
 msgstr "Committee"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:30
+#: reviews/templates/reviews/review_detail_sidebar.html:23
 #, python-format
-msgid "%(r_or_a)s van<br/> %(parent)s"
-msgstr "%(r_or_a)s of<br/> %(parent)s"
+msgid "%(r_or_a)s van <br /> %(parent)s"
+msgstr "%(r_or_a)s of <br/> %(parent)s"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:40
+#: reviews/templates/reviews/review_detail_sidebar.html:36
 msgid "Aanvrager(s)"
 msgstr "Applicant"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:50
+#: reviews/templates/reviews/review_detail_sidebar.html:43
 msgid "Supervisor"
 msgstr ""
 
-#: reviews/templates/reviews/review_detail_sidebar.html:54
+#: reviews/templates/reviews/review_detail_sidebar.html:46
 #, python-format
-msgid ""
-"\n"
-"                Reviewronde gestart op<br/> %(date_start)s.\n"
-"            "
-msgstr ""
-"\n"
-"    Reviewing round started on %(date_start)s.\n"
-"        "
+msgid "Reviewronde gestart op <br /> %(date_start)s."
+msgstr "eviewing round started on %(date_start)s."
 
-#: reviews/templates/reviews/review_detail_sidebar.html:60
+#: reviews/templates/reviews/review_detail_sidebar.html:54
 #, python-format
-msgid ""
-"\n"
-"                    Reviewronde beëindigd op<br/> %(date_end)s.\n"
-"                "
-msgstr ""
-"\n"
-"    Reviewing round ended on %(date_end)s.\n"
-"        "
+msgid "Reviewronde beëindigd op <br /> %(date_end)s."
+msgstr "Reviewing round ended on %(date_end)s."
 
-#: reviews/templates/reviews/review_detail_sidebar.html:67
+#: reviews/templates/reviews/review_detail_sidebar.html:63
 #, python-format
-msgid ""
-"\n"
-"                    Afhandeling:<br/> %(continuation)s.\n"
-"                "
-msgstr ""
-"\n"
-"        Continuation: %(continuation)s.\n"
-"        "
+msgid "Afhandeling: <br /> %(continuation)s."
+msgstr "Continuation: %(continuation)s."
 
-#: reviews/templates/reviews/review_detail_sidebar.html:73
+#: reviews/templates/reviews/review_detail_sidebar.html:71
 #, python-format
-msgid ""
-"\n"
-"                        Bevestiging verzonden op<br/> %(date_confirmed)s.\n"
-"                    "
-msgstr ""
-"\n"
-"    Confirmation sent on %(date_confirmed)s.\n"
-"        "
+msgid "Bevestiging verzonden op <br /> %(date_confirmed)s."
+msgstr "Confirmation sent on %(date_confirmed)s."
 
 #: reviews/templates/reviews/review_detail_sidebar.html:77
 #, python-format
-msgid ""
-"\n"
-"                            Opmerkingen:<br/> %(comments)s.\n"
-"                        "
-msgstr ""
-"\n"
-"        Comments: %(comments)s.\n"
-"        "
+msgid "Opmerkingen: <br /> %(comments)s."
+msgstr "Comments: <br /> %(comments)s."
 
-#: reviews/templates/reviews/review_detail_sidebar.html:87
-msgid ""
-"\n"
-"                        Dit is een aanvraag voor voortoetsing.\n"
-"                    "
-msgstr ""
-"\n"
-"    This is an application for preliminary assessment.\n"
-"    "
+#: reviews/templates/reviews/review_detail_sidebar.html:89
+msgid "Dit is een aanvraag voor voortoetsing."
+msgstr "This is an application for preliminary assessment"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:96
+#: reviews/templates/reviews/review_detail_sidebar.html:98
 msgid "Dit is een beslissing van een eindverantwoordelijke"
 msgstr "This is a supervisor review"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:107
-msgid ""
-"\n"
-"                Deze aanvraag heeft een revisie gehad tijdens het "
-"beslisproces.\n"
-"            "
+#: reviews/templates/reviews/review_detail_sidebar.html:108
+msgid "Deze aanvraag heeft een revisie gehad tijdens het beslisproces."
 msgstr ""
-"\n"
-"        A revision was made to this application after it was submitted to "
-"the FEtC-H .\n"
-"    "
+"A revision was made to this application after it was submitted to the FEtC-H"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:111
-msgid ""
-"\n"
-"                    Er zijn de volgende opmerkingen bijgevoegd:<br/>\n"
-"                "
-msgstr ""
-"\n"
-"            The following comments have been provided:<br/>\n"
-"        "
+#: reviews/templates/reviews/review_detail_sidebar.html:114
+msgid "Er zijn de volgende opmerkingen bijgevoegd: <br />"
+msgstr "The following comments have been provided: <br />"
 
-#: reviews/templates/reviews/review_detail_sidebar.html:119
+#: reviews/templates/reviews/review_detail_sidebar.html:122
 msgid "Documenten"
 msgstr "Documents"
 
@@ -4073,11 +3871,11 @@ msgstr "Documents"
 msgid "Beoordeling beëindigen"
 msgstr "Terminate review"
 
-#: reviews/templates/reviews/review_discontinue_form.html:32
+#: reviews/templates/reviews/review_discontinue_form.html:29
 msgid "Afhandeling definitief beëindigen"
 msgstr "Terminate this review"
 
-#: reviews/templates/reviews/review_discontinue_form.html:36
+#: reviews/templates/reviews/review_discontinue_form.html:31
 msgid ""
 "Als een aanvraag definitief niet meer door de FETC-GW afgehandeld gaat "
 "worden, en deze in de weg staat, kan er voor gekozen worden deze te "
@@ -4086,7 +3884,7 @@ msgstr ""
 "If a proposal will not be further assessed by the FEtC-H and its open review "
 "is getting in the way, it can be terminated using this form."
 
-#: reviews/templates/reviews/review_discontinue_form.html:43
+#: reviews/templates/reviews/review_discontinue_form.html:38
 msgid ""
 "Een beëindigde aanvraag verschijnt niet meer in de pagina's van de "
 "secretaris en beoordelaars. Deze aanvraag kan ook niet meer gereviseerd "
@@ -4098,11 +3896,11 @@ msgstr ""
 "however it may still be copied. A terminated application still shows up in "
 "the list \"all submitted applications\" for future reference."
 
-#: reviews/templates/reviews/review_discontinue_form.html:54
+#: reviews/templates/reviews/review_discontinue_form.html:48
 msgid "Attentie"
 msgstr "Warning"
 
-#: reviews/templates/reviews/review_discontinue_form.html:56
+#: reviews/templates/reviews/review_discontinue_form.html:49
 msgid ""
 "Deze aanvraag heeft op dit moment geen lopende beoordeling. Om deze aanvraag "
 "definitief te beëindigen, moeten we de uitkomst van laatste beoordeling (zie "
@@ -4114,11 +3912,11 @@ msgstr ""
 "left sidebar. Please keep in mind that this can be confusing to the "
 "submitter."
 
-#: reviews/templates/reviews/review_discontinue_form.html:64
+#: reviews/templates/reviews/review_discontinue_form.html:57
 msgid "Aanvraag"
 msgstr "Application"
 
-#: reviews/templates/reviews/review_discontinue_form.html:65
+#: reviews/templates/reviews/review_discontinue_form.html:58
 #, python-format
 msgid "<em>%(title)s</em> door %(author)s"
 msgstr "<em>%(title)s</em> by %(author)s"
@@ -4141,7 +3939,7 @@ msgid "Verplaats naar andere kamer"
 msgstr "Move study to different reviewing chamber"
 
 #: reviews/templates/reviews/vue_templates/review_list.html:95
-#: reviews/utils/review_actions.py:282
+#: reviews/utils/review_actions.py:264
 msgid "Verberg aanvraag uit het archief"
 msgstr "Remove this application from the archive"
 
@@ -4153,87 +3951,87 @@ msgstr "Add this application to the archive"
 msgid "Reviewronde beëindigd: "
 msgstr "Reviewing round ended: "
 
-#: reviews/templatetags/documents_list.py:145
+#: reviews/templatetags/documents_list.py:138
 msgid "Hoofdtraject"
 msgstr "Main trajectory"
 
-#: reviews/templatetags/documents_list.py:147
+#: reviews/templatetags/documents_list.py:140
 msgid "Traject {}: <i>{}</i>"
 msgstr "Trajectory {}: <i>{}</i>"
 
-#: reviews/templatetags/documents_list.py:158
+#: reviews/templatetags/documents_list.py:150
 msgid "Extra documenten {}"
 msgstr "Extra documents {}"
 
-#: reviews/templatetags/documents_list.py:213
+#: reviews/templatetags/documents_list.py:196
 msgid "Aanmelding"
 msgstr "Application"
 
-#: reviews/templatetags/documents_list.py:215
+#: reviews/templatetags/documents_list.py:198
 msgid "Aanvraag in PDF-vorm"
 msgstr "Application in PDF format"
 
-#: reviews/templatetags/documents_list.py:228
+#: reviews/templatetags/documents_list.py:210
 msgid "Eerdere goedkeuring"
 msgstr "Prior approval"
 
-#: reviews/templatetags/documents_list.py:236
+#: reviews/templatetags/documents_list.py:217
 msgid "Aanvraag bij voortoetsing"
 msgstr "Application for preliminary assessment"
 
-#: reviews/templatetags/documents_list.py:257
+#: reviews/templatetags/documents_list.py:240
 msgid "Beslissing METC"
 msgstr "Decision by METC"
 
-#: reviews/templatetags/documents_list.py:282
+#: reviews/templatetags/documents_list.py:262
 msgid "Informed consent"
 msgstr "Informed consent"
 
-#: reviews/templatetags/documents_list.py:283
+#: reviews/templatetags/documents_list.py:263
 msgid "Informatiebrief"
 msgstr "Information letter"
 
-#: reviews/templatetags/documents_list.py:284
+#: reviews/templatetags/documents_list.py:265
 msgid "Consent declaratie directeur/departementshoofd"
 msgstr "Declaration of consent school director/head of the department"
 
-#: reviews/templatetags/documents_list.py:286
+#: reviews/templatetags/documents_list.py:270
 msgid "Informatiebrief directeur/departementshoofd"
 msgstr "Information letter school director/head of the department"
 
-#: reviews/templatetags/documents_list.py:288
+#: reviews/templatetags/documents_list.py:274
 msgid "Informatiebrief ouders"
 msgstr "Information letter for the parents"
 
-#: reviews/templatetags/documents_list.py:296
+#: reviews/templatetags/documents_list.py:282
 msgid "Toestemmingsdocument observatie"
 msgstr "Consent document for observation"
 
-#: reviews/utils/review_actions.py:130
+#: reviews/utils/review_actions.py:118
 msgid "Geef jouw beslissing en/of commentaar door"
 msgstr "Provide feedback on this proposal"
 
-#: reviews/utils/review_actions.py:156
+#: reviews/utils/review_actions.py:141
 msgid "Deze versie afhandelen"
 msgstr "Conclude this version"
 
-#: reviews/utils/review_actions.py:186
+#: reviews/utils/review_actions.py:169
 msgid "Beëindig definitief de afhandeling van deze aanvraag"
 msgstr "Discontinue assessment of this application"
 
-#: reviews/utils/review_actions.py:216
+#: reviews/utils/review_actions.py:197
 msgid "Verander aangestelde commissieleden"
 msgstr "Change appointment of committee members"
 
-#: reviews/utils/review_actions.py:246
+#: reviews/utils/review_actions.py:229
 msgid "Datum van bevestigingsbrief aanpassen"
 msgstr "Change date of confirmation letter"
 
-#: reviews/utils/review_actions.py:284
+#: reviews/utils/review_actions.py:266
 msgid "Plaats aanvraag in het archief."
 msgstr "Add this application to the archive"
 
-#: reviews/utils/review_actions.py:304
+#: reviews/utils/review_actions.py:283
 msgid "Startdatum wijzigen"
 msgstr "Edit start date"
 
@@ -4241,57 +4039,57 @@ msgstr "Edit start date"
 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding"
 msgstr "FEtC-H {}: confirmation of draft application submission"
 
-#: reviews/utils/review_utils.py:92
+#: reviews/utils/review_utils.py:108
 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke"
 msgstr "FEtC-H {}: assess as researcher with final responsibility"
 
-#: reviews/utils/review_utils.py:142
+#: reviews/utils/review_utils.py:168
 msgid "FETC-GW {}: aanmelding ontvangen"
 msgstr "FEtC-H {}: application received"
 
-#: reviews/utils/review_utils.py:241
+#: reviews/utils/review_utils.py:293
 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing"
 msgstr "FEtC-H {}: new application for preliminary assessment"
 
-#: reviews/utils/review_utils.py:255
+#: reviews/utils/review_utils.py:314
 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing"
 msgstr ""
 "FEtC-H {}: confirmation of submission of application for preliminary "
 "assessment"
 
-#: reviews/utils/review_utils.py:306
+#: reviews/utils/review_utils.py:370
 msgid "FETC-GW {}: nieuwe aanvraag ingediend"
 msgstr "FEtC-H {}: new application submitted"
 
-#: reviews/utils/review_utils.py:321
+#: reviews/utils/review_utils.py:387
 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd"
 msgstr "FEtC-H {}: new decision added"
 
-#: reviews/utils/review_utils.py:364
+#: reviews/utils/review_utils.py:432
 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld"
 msgstr "FEtC-H {}: a supervisor has reviewed your application"
 
-#: reviews/utils/review_utils.py:390
+#: reviews/utils/review_utils.py:459
 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen."
 msgstr ""
 "The application contains the participation of adults incapable of informed "
 "consent."
 
-#: reviews/utils/review_utils.py:393
+#: reviews/utils/review_utils.py:463
 msgid "De aanvraag bevat het gebruik van misleiding."
 msgstr "The application contains the use of misrepresentation."
 
-#: reviews/utils/review_utils.py:396
+#: reviews/utils/review_utils.py:468
 msgid ""
 "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)"
 msgstr ""
 "A hierarchal relationship between researcher(s) and participant(s) exists."
 
-#: reviews/utils/review_utils.py:399
+#: reviews/utils/review_utils.py:473
 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens."
 msgstr "This study collects special or sensitive personal details."
 
-#: reviews/utils/review_utils.py:402
+#: reviews/utils/review_utils.py:478
 msgid ""
 "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht "
 "verhoogde kwetsbaarheid met zich meebrengen."
@@ -4299,7 +4097,7 @@ msgstr ""
 "The study selects participants based on particular characteristics which "
 "might entail increased vulnerability."
 
-#: reviews/utils/review_utils.py:408
+#: reviews/utils/review_utils.py:488
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op "
 "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen "
@@ -4309,7 +4107,7 @@ msgstr ""
 "study, in part or in its entirety, is so burdensome that despite acquiring "
 "informed consent it might raise questions."
 
-#: reviews/utils/review_utils.py:412
+#: reviews/utils/review_utils.py:496
 msgid ""
 "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op "
 "psychische of fysieke schade bij deelname aan het onderzoek meer dan "
@@ -4319,7 +4117,7 @@ msgstr ""
 "psychological or physical harm in participating in the study are more than "
 "minimal."
 
-#: reviews/utils/review_utils.py:419
+#: reviews/utils/review_utils.py:507
 #, python-brace-format
 msgid ""
 "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-"
@@ -4330,14 +4128,14 @@ msgstr ""
 "non-task elements ({d} minutes) is greater than the task duration limit "
 "({max_d} minutes) for the age group {ag}."
 
-#: reviews/utils/review_utils.py:436
+#: reviews/utils/review_utils.py:533
 #, python-brace-format
 msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}"
 msgstr ""
 "The application contains sessions with participants in the following "
 "setting: {s}"
 
-#: reviews/utils/review_utils.py:440
+#: reviews/utils/review_utils.py:541
 msgid ""
 "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met "
 "informed consent achteraf."
@@ -4345,7 +4143,7 @@ msgstr ""
 "The study observes participants in a non-public space and works with "
 "retrospective informed consent."
 
-#: reviews/utils/review_utils.py:442
+#: reviews/utils/review_utils.py:547
 msgid ""
 "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke "
 "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie "
@@ -4355,77 +4153,77 @@ msgstr ""
 "(e.g. a digital discussion group), and takes part actively in the discussion "
 "and/or collects data which can be traced back to individuals."
 
-#: reviews/utils/review_utils.py:447
+#: reviews/utils/review_utils.py:554
 msgid "De aanvraag bevat het gebruik van {}"
 msgstr "The application makes use of {}"
 
-#: reviews/utils/review_utils.py:468
+#: reviews/utils/review_utils.py:580
 msgid ""
 "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar."
 msgstr ""
 "The application contains psychophysiological measurements on children under "
 "{} year(s) old."
 
-#: reviews/views.py:61
+#: reviews/views.py:62
 msgid "Mijn besluiten"
 msgstr "My results"
 
-#: reviews/views.py:83
+#: reviews/views.py:84
 msgid "Openstaande besluiten commissieleden"
 msgstr "Pending decisions committee members"
 
-#: reviews/views.py:201
+#: reviews/views.py:202
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
-#: reviews/views.py:567
-msgid ""vind je alle aanvragen waarvan je de eindverantwoordelijke bent
+#: reviews/views.py:570
+msgid ""
 "Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer "
 "toevoegen/aanpassen"
 msgstr ""
 "This application has already been assessed, so you cannot add/change your "
 "assessment"
 
-#: studies/forms.py:41
+#: studies/forms.py:50
 msgid ""
 "Maakt jouw onderzoek gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?"
 msgstr ""
 "Does your research make use of (adult) participants <u>incapable</u> of "
 "informed consent?"
 
-#: studies/forms.py:83
+#: studies/forms.py:98
 msgid "Je dient minimaal een bijzonder kenmerk te selecteren."
 msgstr "You are required to select at least one special characteristic."
 
-#: studies/forms.py:85
+#: studies/forms.py:105
 msgid "Je dient minimaal één type gegevens te selecteren."
 msgstr "You are required to select at least one characteristic."
 
-#: studies/forms.py:92
+#: studies/forms.py:121
 msgid "Leg uit wat de hiërarchische relatie is."
 msgstr "Explain the nature of this hierarchal relationship."
 
-#: studies/forms.py:122
+#: studies/forms.py:158
 msgid "Je dient minstens één van de opties te selecteren"
 msgstr "You must select at least one of the options"
 
-#: studies/models.py:54
+#: studies/models.py:53
 msgid "{}-{} jaar"
 msgstr "{}-{} years old"
 
-#: studies/models.py:56
+#: studies/models.py:55
 msgid "{} jaar en ouder"
 msgstr "{} years old and above"
 
-#: studies/models.py:128 studies/templates/studies/study_form.html:26
+#: studies/models.py:131 studies/templates/studies/study_form.html:26
 msgid "Werving"
 msgstr "Recruitment"
 
-#: studies/models.py:142
+#: studies/models.py:144
 msgid "Naam traject"
 msgstr "Trajectory title"
 
-#: studies/models.py:149
+#: studies/models.py:148
 msgid "Uit welke leeftijdscategorie(ën) bestaat je deelnemersgroep?"
 msgstr "What is/are the age category/ies of your participants?"
 
@@ -4437,14 +4235,14 @@ msgstr ""
 "If the intended age group is 5-7 year-olds, for example, then you should "
 "fill in 4-5 and 6-11."
 
-#: studies/models.py:153
+#: studies/models.py:156
 msgid ""
 "Maakt je onderzoek gebruik van wils<u>on</u>bekwame (volwassen) deelnemers?"
 msgstr ""
 "Does your application contain the use of (adult) participants <u>incapable</"
 "u> of informed consent?"
 
-#: studies/models.py:155
+#: studies/models.py:160
 msgid ""
 "Wilsonbekwame volwassenen zijn volwassenen waarvan redelijkerwijs mag worden "
 "aangenomen dat ze onvoldoende kunnen inschatten wat hun eventuele deelname "
@@ -4460,11 +4258,11 @@ msgstr ""
 "express their own opinion). Here informed consent should always be obtained "
 "from a relevant representative."
 
-#: studies/models.py:168
+#: studies/models.py:173
 msgid "Worden er bijzondere persoonsgegevens verzameld?"
 msgstr "Will you collect any special or sensitive personal details?"
 
-#: studies/models.py:169
+#: studies/models.py:175
 msgid ""
 "zie de <a href='https://intranet.uu.nl/documenten-ethische-"
 "toetsingscommissie-gw'             target='_blank'>Richtlijnen</a>"
@@ -4473,12 +4271,12 @@ msgstr ""
 "nl/en/knowledgebase/documents-ethics-assessment-committee-"
 "humanities\">regulations</a>."
 
-#: studies/models.py:178
+#: studies/models.py:185
 msgid "Geef aan welke bijzondere persoonsgegevens worden verzameld:"
 msgstr ""
 "Please select which kinds of special personal details may be collected:"
 
-#: studies/models.py:183
+#: studies/models.py:190
 msgid ""
 "Deelnemers kunnen geïncludeerd worden op bepaalde bijzondere kenmerken. Is "
 "dit in jouw onderzoek bij (een deel van) de deelnemers het geval?"
@@ -4486,7 +4284,7 @@ msgstr ""
 "Participants can be included based on particular characteristics. Is this "
 "the case with (some of) the participants in this application?"
 
-#: studies/models.py:185
+#: studies/models.py:194
 msgid ""
 "In de meeste gevallen kun je dit soort gegevens alleen verzamelen als je "
 "daar toestemming voor hebt: zie de <a href='https://fetc-gw.wp.hum.uu.nl/wp-"
@@ -4506,12 +4304,12 @@ msgstr ""
 "href='mailto:privacy.gw@uu.nl'>privacy officer</a> before submitting your "
 "application."
 
-#: studies/models.py:198
+#: studies/models.py:208
 msgid ""
 "Selecteer de medische gegevens van je proefpersonen die worden verzameld"
 msgstr "Select the medical details of your participants that are recorded"
 
-#: studies/models.py:204
+#: studies/models.py:214
 msgid ""
 "Is het, om de onderzoeksvraag beantwoord te krijgen, noodzakelijk om het "
 "geselecteerde type deelnemer aan het onderzoek te laten meedoen?"
@@ -4519,7 +4317,7 @@ msgstr ""
 "In order to answer the research question, is it necessary for the selected "
 "type of participants to participate in the study?"
 
-#: studies/models.py:207
+#: studies/models.py:219
 msgid ""
 "Is het bijvoorbeeld noodzakelijk om kinderen te testen, of zou je de vraag "
 "ook kunnen beantwoorden door volwassen deelnemers te testen?"
@@ -4527,15 +4325,15 @@ msgstr ""
 "For example, is it necessary to test children, or would it be possible to "
 "answer the research question by testing adults?"
 
-#: studies/models.py:214
+#: studies/models.py:227
 msgid "Leg uit waarom"
 msgstr "Explain why"
 
-#: studies/models.py:218
+#: studies/models.py:229
 msgid "Hoe worden de deelnemers geworven?"
 msgstr "How will the participants be recruited?"
 
-#: studies/models.py:221
+#: studies/models.py:234
 #, python-brace-format
 msgid ""
 "Er zijn specifieke voorbeelddocumenten voor het gebruik van             "
@@ -4544,12 +4342,12 @@ msgstr ""
 "There are specific template documents for using Amazon Mechanical Turk/"
 "Prolific <a href=\"{link}\">here</a>."
 
-#: studies/models.py:228
+#: studies/models.py:243
 msgid "Welke vergoeding krijgt de deelnemer voor hun deelname?"
 msgstr ""
 "What compensation will participants receive for taking part in this study?"
 
-#: studies/models.py:229
+#: studies/models.py:245
 msgid ""
 "Het standaardbedrag voor vergoeding aan de deelnemers is €10,- per uur. "
 "Minderjarigen mogen geen geld ontvangen, maar wel een cadeautje."
@@ -4557,26 +4355,26 @@ msgstr ""
 "The standard sum for compensation of participants is €10 per hour. Minors "
 "are not permitted to receive money, but can be given a gift."
 
-#: studies/models.py:241
+#: studies/models.py:257
 msgid ""
 "Bestaat een hiërarchische relatie tussen onderzoeker(s) en deelnemer(s)?"
 msgstr ""
 "Does a hierarchal relationship between researcher(s) and participant(s) "
 "exist?"
 
-#: studies/models.py:247
+#: studies/models.py:264
 msgid "Zo ja, wat is de relatie (bijv. docent-student)?"
 msgstr "If so, what is the nature of the relationship (e.g. teacher-student)?"
 
-#: studies/models.py:260
+#: studies/models.py:272
 msgid "Taakonderzoek en interviews"
 msgstr "Task-based research and interviews"
 
-#: studies/models.py:265
+#: studies/models.py:276
 msgid "Hoeveel sessies met taakonderzoek zullen de deelnemers doorlopen?"
 msgstr "How many sessions of tasks will the participants take part in?"
 
-#: studies/models.py:268
+#: studies/models.py:283
 msgid ""
 "Wanneer je bijvoorbeeld eerst de deelnemer een taak/aantal taken laat doen "
 "tijdens een eerste bezoek aan het lab en je laat de deelnemer nog een keer "
@@ -4590,7 +4388,7 @@ msgstr ""
 "experiment to consist of two sessions. If multiple tasks are executed on the "
 "same day, with breaks in between, this is still considered to be one session."
 
-#: studies/models.py:275
+#: studies/models.py:293
 msgid ""
 "Is er binnen bovenstaand onderzoekstraject sprake van misleiding van de "
 "deelnemer?"
@@ -4598,7 +4396,7 @@ msgstr ""
 "Does the above research trajectory involve misrepresentation to the "
 "participant?"
 
-#: studies/models.py:277
+#: studies/models.py:297
 msgid ""
 "Misleiding is het doelbewust verschaffen van inaccurate informatie over het "
 "doel en/of belangrijke aspecten van de gang van zaken tijdens het onderzoek. "
@@ -4615,7 +4413,7 @@ msgstr ""
 "crucial memory task without announcing it, or giving false feedback. Fillers "
 "do not count as misrepresentation."
 
-#: studies/models.py:288
+#: studies/models.py:311
 msgid ""
 "Geef een toelichting en beschrijf hoe en wanneer de deelnemer zal worden "
 "gedebrieft."
@@ -4623,7 +4421,7 @@ msgstr ""
 "Give an explanation and describe how and when the participant will be "
 "debriefed."
 
-#: studies/models.py:292
+#: studies/models.py:318
 msgid ""
 "Bevat bovenstaand onderzoekstraject elementen die <em>tijdens</em> de "
 "deelname niet-triviale negatieve emoties kunnen opwekken? Denk hierbij "
@@ -4636,11 +4434,11 @@ msgstr ""
 "consider emotionally probing questions, insulting utterances, negative "
 "feedback, and frustrating, difficult, (very) long and/or (very) boring tasks."
 
-#: studies/models.py:301
+#: studies/models.py:328
 msgid "Licht je antwoord toe."
 msgstr "Explain your answer."
 
-#: studies/models.py:304
+#: studies/models.py:331
 msgid ""
 "Bevat bovenstaand onderzoekstraject elementen die tijdens de deelname "
 "zodanig belastend zijn dat deze <em>ondanks de verkregen informed consent</"
@@ -4653,7 +4451,7 @@ msgstr ""
 "questions (or even cause outrage), for example from colleagues, the "
 "participants themselves, or parents or other representatives?"
 
-#: studies/models.py:309
+#: studies/models.py:339
 msgid ""
 "Dit zou bijvoorbeeld het geval kunnen zijn bij een 'onmenselijk' lange en "
 "uitputtende taak, een zeer confronterende vragenlijst, of voortdurend "
@@ -4670,7 +4468,7 @@ msgstr ""
 "sessions, not distress at a later date which was caused by the research "
 "project."
 
-#: studies/models.py:320
+#: studies/models.py:354
 msgid ""
 "Licht je antwoord toe. Geef concrete voorbeelden van de relevante aspecten "
 "van jouw onderzoek (bijv. representatieve voorbeelden van mogelijk zeer "
@@ -4683,7 +4481,7 @@ msgstr ""
 "utterances in the task, or of very confrontational questions in a "
 "questionnaire), so that the committee can form a proper picture."
 
-#: studies/models.py:327
+#: studies/models.py:364
 msgid ""
 "Zijn de risico's op psychische, fysieke, of andere (bijv. economische, "
 "juridische) schade door deelname aan bovenstaand onderzoekstraject <em>meer "
@@ -4695,7 +4493,7 @@ msgstr ""
 "em> minimal? I.e. is the chance of and/or magnitude of potential damage to "
 "participants clearly <em>above</em> that of the \"background risk\"?"
 
-#: studies/models.py:332
+#: studies/models.py:372
 msgid ""
 "Achtergrondrisico is datgene dat gezonde, gemiddelde burgers in de relevante "
 "leeftijdscategorie normaalgesproken in het dagelijks leven ten deel valt. "
@@ -4722,16 +4520,16 @@ msgstr ""
 "evaluation, intelligence test, or heart rate measurement after physical "
 "exercise, all of which performed under professional supervision."
 
-#: studies/models.py:437
+#: studies/models.py:479
 #, python-format
 msgid "Study details for proposal %s"
 msgstr "Study details for proposal %s"
 
-#: studies/models.py:442
+#: studies/models.py:484
 msgid "Maak je gebruik van passieve informed consent?"
 msgstr "Will you use passive informed consent?"
 
-#: studies/models.py:443
+#: studies/models.py:487
 msgid ""
 "Wanneer je kinderen via een instelling (dus ook school) werft en je de "
 "ouders niet laat ondertekenen, maar in plaats daarvan de leiding van die "
@@ -4747,7 +4545,7 @@ msgstr ""
 "a>."
 
 # studies/models.py:229
-#: studies/models.py:453
+#: studies/models.py:500
 msgid ""
 "Licht je antwoord toe. Wij willen je wijzen op het reglement, sectie 3.1 'd' "
 "en 'e'. Passive consent is slechts in enkele gevallen toegestaan en draagt "
@@ -4757,16 +4555,16 @@ msgstr ""
 "'d' and 'e'. Passive consent is allowed under certain situations but is not "
 "preferred by the committee."
 
-#: studies/models.py:469
+#: studies/models.py:517
 msgid "Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"
 msgstr ""
 "Please upload the declaration of consent here (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:477
+#: studies/models.py:525
 msgid "Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)"
 msgstr "Please upload the information letter here (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:486
+#: studies/models.py:534
 msgid ""
 "Upload hier de toestemmingsverklaring voor de leiding of het management van "
 "de instelling (in .pdf of .doc(x)-format)"
@@ -4774,7 +4572,7 @@ msgstr ""
 "Please upload the declaration of consent for the management of the school or "
 "institution (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:489
+#: studies/models.py:539
 msgid ""
 "Upload indien mogelijk een ondertekende versie van het document. Upload als "
 "deze nog niet bestaat een blanco versie, en stuur de ondertekende versie "
@@ -4785,7 +4583,7 @@ msgstr ""
 "and follow up by sending a signed copy to the secretary of the FEtC-H once "
 "available."
 
-#: studies/models.py:496
+#: studies/models.py:547
 msgid ""
 "Upload hier de informatiebrief voor de leiding of het management van de "
 "instelling (in .pdf of .doc(x)-formaat)"
@@ -4793,7 +4591,7 @@ msgstr ""
 "Please upload the the information letter for the management of the school or "
 "institution (in .pdf or .doc(x)-format)"
 
-#: studies/models.py:505
+#: studies/models.py:557
 msgid ""
 "Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ."
 "doc(x)-formaat)"
@@ -4801,66 +4599,52 @@ msgstr ""
 "Please upload the the information letter for parents or guardians here (in ."
 "pdf or .doc(x)-format)"
 
-#: studies/templates/studies/session_start.html:21
+#: studies/templates/studies/session_start.html:19
 msgid ""
-"\n"
-"                In de volgende vragen gaan we nader in op wat je in jouw "
-"onderzoek van je deelnemers zal verlangen. Daarbij gelden de volgende "
-"definities:\n"
-"                "
+"In de volgende vragen gaan we nader in op wat je in jouw onderzoek van je "
+"deelnemers zal verlangen. Daarbij gelden de volgende definities:"
 msgstr ""
-"\n"
-"    The following questions probe further into the demands of your task-"
-"based study on your participants. The following definitions will apply:\n"
-"    "
+"The following questions probe further into the demands of your task-based "
+"study on your participants. The following definitions will apply:"
 
-#: studies/templates/studies/session_start.html:26
+#: studies/templates/studies/session_start.html:24
 msgid ""
-"\n"
-"                <strong>Sessie:</strong> Het geheel van de voor je onderzoek "
-"benodigde betrokkenheid die je op één dag van een deelnemer vraagt. Bij een "
+"<strong>Sessie:</strong> Het geheel van de voor je onderzoek benodigde "
+"betrokkenheid die je op één dag van een deelnemer vraagt. Bij een "
 "labonderzoek is dat bijvoorbeeld alles wat er van onderzoekswege gebeurt "
 "vanaf het moment dat je de deelnemer ontvangt tot het moment dat je afscheid "
 "neemt, inclusief de benodigde pauzes. En bij een internet-vragenlijst is dat "
 "alles wat er van onderzoekswege gebeurt vanaf het welkomstscherm tot de "
 "afronding van de (reeks) vragenlijst(en), wederom inclusief benodigde "
 "pauzes. Bij veldwerk is dat de tijd dat je met de deelnemer in interactie "
-"bent op één dag.\n"
-"                "
-msgstr ""
-"\n"
-"    <strong>Session</strong>: The entirety of the commitment which you "
-"require of a participant in one day. In lab-based research, for example, "
-"that means everything which happens as part of the research from the moment "
-"you welcome the participant to the moment you part company from them, "
-"including any necessary breaks. In an internet survey this means everything "
-"which happens as part of the research from the welcome screen to the "
-"conclusion of the (series of) survey(s), again including any necessary "
-"breaks. For fieldwork, it refers to the time that you interact with the "
-"participant on one day.\n"
-"    "
-
-#: studies/templates/studies/session_start.html:31
-msgid ""
-"\n"
-"                <strong>Taak:</strong> Een coherente verzameling handelingen "
-"die je via een gesproken of geschreven taak-instructie aan de deelnemer "
-"oplegt, en ook als zodanig als 'taak' in een artikel zou beschrijven "
-"(bijvoorbeeld: \"Beluister de volgende 200 zinnetjes en druk op een knop als "
-"je een fout ontdekt\", \"Vul persoonlijkheidsvragenlijst X in\", \"Speel 10 "
-"minuten met je kind zoals je dat thuis doet\", “houd 1 week een dagboek bij "
-"van jouw media-gebruik”, “wil je je gender identiteit beschrijven”, “maak "
-"foto’s van plekken in jouw leefomgeving die je bedreigend en inspirerend "
-"vindt”, “zoek en deel met ons 10 foto’s uit jouw prive-archief om je "
-"levensverhaal te kunnen vertellen”). Indien de specifieke opdracht aan de "
-"deelnemer per item varieert (bijvoorbeeld: \"bij een Nederlandse zin "
-"beoordeel je de betekenis, bij een Engelse zin de grammatica\"), beschouw "
-"dit dan gewoon als één taak.\n"
-"                "
-msgstr ""
-"\n"
-"    <strong>Task</strong>: This refers to a coherent collection of actions "
-"which you instruct the participant to perform via a spoken or written set of "
+"bent op één dag."
+msgstr ""
+"<strong>Session</strong>: The entirety of the commitment which you require "
+"of a participant in one day. In lab-based research, for example, that means "
+"everything which happens as part of the research from the moment you welcome "
+"the participant to the moment you part company from them, including any "
+"necessary breaks. In an internet survey this means everything which happens "
+"as part of the research from the welcome screen to the conclusion of the "
+"(series of) survey(s), again including any necessary breaks. For fieldwork, "
+"it refers to the time that you interact with the participant on one day."
+
+#: studies/templates/studies/session_start.html:29
+msgid ""
+"<strong>Taak:</strong> Een coherente verzameling handelingen die je via een "
+"gesproken of geschreven taak-instructie aan de deelnemer oplegt, en ook als "
+"zodanig als 'taak' in een artikel zou beschrijven (bijvoorbeeld: \"Beluister "
+"de volgende 200 zinnetjes en druk op een knop als je een fout ontdekt\", "
+"\"Vul persoonlijkheidsvragenlijst X in\", \"Speel 10 minuten met je kind "
+"zoals je dat thuis doet\", “houd 1 week een dagboek bij van jouw media-"
+"gebruik”, “wil je je gender identiteit beschrijven”, “maak foto’s van "
+"plekken in jouw leefomgeving die je bedreigend en inspirerend vindt”, “zoek "
+"en deel met ons 10 foto’s uit jouw prive-archief om je levensverhaal te "
+"kunnen vertellen”). Indien de specifieke opdracht aan de deelnemer per item "
+"varieert (bijvoorbeeld: \"bij een Nederlandse zin beoordeel je de betekenis, "
+"bij een Engelse zin de grammatica\"), beschouw dit dan gewoon als één taak."
+msgstr ""
+"<strong>Task</strong>: This refers to a coherent collection of actions which "
+"you instruct the participant to perform via a spoken or written set of "
 "instructions, and which would also be described as a 'task' in an article (e."
 "g. \"Listen to the following 200 sentences and press a button when you hear "
 "a mistake\", \"Fill in personality questionnaire X\", \"Play with your child "
@@ -4876,102 +4660,62 @@ msgstr ""
 "For each session we will ask the same questions in the following pages."
 
 #: studies/templates/studies/study_design.html:7
-#: studies/templates/studies/study_design.html:17
+#: studies/templates/studies/study_design.html:16
 msgid "De onderzoekstype(n)"
 msgstr "Type(s) of research"
 
-#: studies/templates/studies/study_design.html:21
+#: studies/templates/studies/study_design.html:19
 msgid ""
-"\n"
-"                    De FETC-GW onderscheidt 3 typen onderzoek (die evt. ook "
-"samen in één aanvraag voor kunnen komen):\n"
-"                "
+"De FETC-GW onderscheidt 3 typen onderzoek (die evt. ook samen in één "
+"aanvraag voor kunnen komen):"
 msgstr ""
-"\n"
-"    The FEtC-H distinguishes 3 types of research (which may all be used "
-"within one application):\n"
-"    "
+"The FEtC-H distinguishes 3 types of research (which may all be used within "
+"one application):"
 
-#: studies/templates/studies/study_design.html:28
+#: studies/templates/studies/study_design.html:26
 msgid ""
-"\n"
-"                            <strong>Interventieonderzoek</strong>:</br >\n"
-"                            De onderzoeker manipuleert d.m.v. een "
-"<em>interventie</em> de context waarin de deelnemers in hun normale leven "
-"doen wat ze normaliter ook doen. <br />\n"
-"                            De effecten kunnen gelijktijdig en/of achteraf "
-"worden geobserveerd.\n"
-"                        "
+"<strong>Interventieonderzoek</strong>: <br /> De onderzoeker manipuleert d.m."
+"v. een <em>interventie</em> de context waarin de deelnemers in hun normale "
+"leven doen wat ze normaliter ook doen. <br /> De effecten kunnen "
+"gelijktijdig en/of achteraf worden geobserveerd."
 msgstr ""
-"\n"
-"                            <strong>Interventional research</strong>:</br >\n"
-"                            The researcher uses an <em>intervention</em> to "
-"manipulate the context in which participants do what they would otherwise "
-"also do in their daily lives.<br />Effects may be measured immediately or "
-"after the fact.\n"
-"         "
+"<strong>Interventional research</strong>:<br /> The researcher uses an "
+"<em>intervention</em> to manipulate the context in which participants do "
+"what they would otherwise also do in their daily lives.<br />Effects may be "
+"measured immediately or after the fact."
 
 #: studies/templates/studies/study_design.html:37
 msgid ""
-"\n"
-"                            <strong>Observatieonderzoek</strong>:</br >\n"
-"                            De onderzoeker observeert deelnemers in hun "
-"normale leven, maar grijpt hier niet op in.\n"
-"                        "
+"<strong>Observatieonderzoek</strong>: <br /> De onderzoeker observeert "
+"deelnemers in hun normale leven, maar grijpt hier niet op in."
 msgstr ""
-"\n"
-"                            <strong>Observational research</strong>:</br >\n"
-"The researcher observes participants in their daily lives, but does not "
-"interfere.\n"
-"       "
+"<strong>Observational research</strong>: <br /> The researcher observes "
+"participants in their daily lives, but does not interfere."
 
-#: studies/templates/studies/study_design.html:45
+#: studies/templates/studies/study_design.html:46
 msgid ""
-"\n"
-"                            <strong>Taakonderzoek en Interviews</strong>:</"
-"br >\n"
-"                            De onderzoeker\n"
-"                            <ul>\n"
-"                                <li>legt deelnemers een taak op (bijv. "
-"vragenlijst, experiment) of </li>\n"
-"                                <li>neemt een interview af, of </li>\n"
-"                                <li>vraagt deelnemer deel te nemen aan een "
-"focusgroep.</li>\n"
-"                            </ul><br />\n"
-"                            Onderzoek in het ILS-lab is vanwege de locatie "
-"per definitie altijd taakonderzoek (óók als de deelnemers na ontvangst "
-"alleen maar worden geobserveerd).\n"
-"                        "
+"<strong>Taakonderzoek en Interviews</strong>: <br /> De onderzoeker <ul> "
+"<li>legt deelnemers een taak op (bijv. vragenlijst, experiment) of</li> "
+"<li>neemt een interview af, of</li> <li>vraagt deelnemer deel te nemen aan "
+"een focusgroep.</li> </ul> <br /> Onderzoek in het ILS-lab is vanwege de "
+"locatie per definitie altijd taakonderzoek (óók als de deelnemers na "
+"ontvangst alleen maar worden geobserveerd)."
 msgstr ""
-"\n"
-"                            <strong>Task-based research and interviews</"
-"strong>:</br >\n"
-"                            The researcher\n"
-"                            <ul>\n"
-"                                <li>gives participants a task to fulfil "
-"(such as a questionnaire or experiment), or </li>\n"
-"                                <li>interviews participants, or </li>\n"
-"                                <li>asks participants to partake in a focus "
-"group.</li>\n"
-"                            </ul><br />\n"
-"                            Research that takes place at the ILS-labs is "
-"always categorized as task-based research due to the location (even if "
-"participants are only observed after their arrival).\n"
-"                        "
-
-#: studies/templates/studies/study_design.html:63
+"<strong>Task-based research and interviews</strong>:<br />The researcher<ul> "
+"<li>gives participants a task to fulfil (such as a questionnaire or "
+"experiment), or </li> <li>interviews participants, or </li><li>asks "
+"participants to partake in a focus group.</li> </ul><br />Research that "
+"takes place at the ILS-labs is  always categorized as task-based research "
+"due to the location (even if participants are only observed after their "
+"arrival)."
+
+#: studies/templates/studies/study_design.html:67
 msgid ""
-"\n"
-"                                    Om welk type onderzoek gaat het hier?\n"
-"                                    Je kan meerdere opties aankruisen.\n"
-"                                "
+"Om welk type onderzoek gaat het hier? Je kan meerdere opties aankruisen."
 msgstr ""
-"\n"
-"        What type of research will be used here?\n"
-"        You can select multiple options.\n"
-"        "
+"What type of research will be used here? You can select multiple options."
 
-#: studies/templates/studies/study_design.html:79
+#: studies/templates/studies/study_design.html:83
 msgid ""
 "Dit is bijvoorbeeld het geval wanneer je een observatiedeel combineert met "
 "een taakonderzoeksdeel, of met een interventiedeel (in dezelfde sessie, of "
@@ -4988,167 +4732,121 @@ msgstr ""
 "otherwise would not be carried out) you should specify this separately as "
 "task-based research."
 
-#: studies/templates/studies/study_design.html:95
+#: studies/templates/studies/study_design.html:99
 msgid ""
-"\n"
-"                        Voor elk door jou aangekruiste type onderzoek kan je "
-"op de hiernavolgende pagina's\n"
-"                        de relevante informatie verschaffen.\n"
-"                    "
+"Voor elk door jou aangekruiste type onderzoek kan je op de hiernavolgende "
+"pagina's de relevante informatie verschaffen."
 msgstr ""
-"\n"
-"        For each type of research selected you can supply the relevant "
-"information\n"
-"        on the following pages.\n"
-"        "
+"For each type of research selected you can supply the relevant information "
+"on the following pages."
 
-#: studies/templates/studies/study_end.html:32
+#: studies/templates/studies/study_end.html:30
 #, python-format
-msgid ""
-"\n"
-"                    Deelnemers uit de leeftijdscategorieën "
-"<em>%(age_groups)s</em>\n"
-"                "
-msgstr ""
-"\n"
-"    Participants from the age categories <em>%(age_groups)s</em>\n"
-"    "
+msgid "Deelnemers uit de leeftijdscategorieën <em>%(age_groups)s</em>"
+msgstr "Participants from the age categories <em>%(age_groups)s</em>"
 
-#: studies/templates/studies/study_end.html:36
+#: studies/templates/studies/study_end.html:34
 #, python-format
-msgid ""
-"\n"
-"                        en met de bijzondere kenmerken <em>%(traits)s</em>\n"
-"                    "
-msgstr ""
-"\n"
-"    and with the following special characteristics <em>%(traits)s</em>\n"
-"    "
+msgid "en met de bijzondere kenmerken <em>%(traits)s</em>"
+msgstr "and with the following special characteristics <em>%(traits)s</em>"
 
-#: studies/templates/studies/study_end.html:40
-msgid ""
-"\n"
-"                        zonder bijzondere kenmerken\n"
-"                    "
-msgstr ""
-"\n"
-"    without any special characteristics\n"
-"    "
+#: studies/templates/studies/study_end.html:38
+msgid "zonder bijzondere kenmerken"
+msgstr "without any special characteristics"
 
-#: studies/templates/studies/study_end.html:45
-msgid ""
-"\n"
-"                        en zijnde <em>wilsonbekwaam</em>\n"
-"                    "
-msgstr ""
-"\n"
-"   who are also <em>incapable of giving informed consent</em>\n"
-"    "
+#: studies/templates/studies/study_end.html:43
+msgid "en zijnde <em>wilsonbekwaam</em>"
+msgstr "who are also <em>incapable of giving informed consent</em>"
 
-#: studies/templates/studies/study_end.html:49
-msgid ""
-"\n"
-"                    zullen aan de volgende onderdelen meedoen:\n"
-"                "
-msgstr ""
-"\n"
-"    will participate in the following parts:\n"
-"    "
+#: studies/templates/studies/study_end.html:47
+msgid "zullen aan de volgende onderdelen meedoen:"
+msgstr "will participate in the following parts:"
 
-#: studies/templates/studies/study_end.html:61
+#: studies/templates/studies/study_end.html:59
 msgid "Interventie bewerken"
 msgstr "Edit intervention"
 
-#: studies/templates/studies/study_end.html:68
+#: studies/templates/studies/study_end.html:66
 msgid "Aantal sessies (per week)"
 msgstr "Number of session (per week)"
 
-#: studies/templates/studies/study_end.html:69
+#: studies/templates/studies/study_end.html:67
 msgid "Duur per sessie (in minuten)"
 msgstr "Session duration (in minutes)"
 
-#: studies/templates/studies/study_end.html:70
+#: studies/templates/studies/study_end.html:68
 msgid "Controlegroep?"
 msgstr "Control group?"
 
-#: studies/templates/studies/study_end.html:78
+#: studies/templates/studies/study_end.html:76
+#: studies/templates/studies/study_end.html:114
+#: studies/templates/studies/study_end.html:115
 #: studies/templates/studies/study_end.html:116
 #: studies/templates/studies/study_end.html:117
-#: studies/templates/studies/study_end.html:118
-#: studies/templates/studies/study_end.html:119
 msgid "ja, nee"
 msgstr "yes, no"
 
-#: studies/templates/studies/study_end.html:92
+#: studies/templates/studies/study_end.html:90
 msgid "Observatie bewerken"
 msgstr "Edit observation"
 
-#: studies/templates/studies/study_end.html:99
+#: studies/templates/studies/study_end.html:97
 msgid "Aantal dagen"
 msgstr "Number of days"
 
-#: studies/templates/studies/study_end.html:100
+#: studies/templates/studies/study_end.html:98
 msgid "Duur per sessie (in uren)"
 msgstr "Duration per session (in hours)"
 
-#: studies/templates/studies/study_end.html:101
+#: studies/templates/studies/study_end.html:99
 msgid "Anoniem?"
 msgstr "Anonymous?"
 
-#: studies/templates/studies/study_end.html:102
+#: studies/templates/studies/study_end.html:100
 msgid "Doelgroep?"
 msgstr "Target group?"
 
-#: studies/templates/studies/study_end.html:103
+#: studies/templates/studies/study_end.html:101
 msgid "Niet openbaar?"
 msgstr "Non-public?"
 
-#: studies/templates/studies/study_end.html:104
+#: studies/templates/studies/study_end.html:102
 msgid "Toestemming nodig?"
 msgstr "Permission necessary?"
 
-#: studies/templates/studies/study_end.html:106
+#: studies/templates/studies/study_end.html:104
 msgid "Instantie"
 msgstr "Institution"
 
-#: studies/templates/studies/study_end.html:108
+#: studies/templates/studies/study_end.html:106
 #: tasks/templates/tasks/task_list.html:9
 msgid "Registratie via"
 msgstr "Recording via"
 
-#: studies/templates/studies/study_end.html:133
+#: studies/templates/studies/study_end.html:129
 msgid "Takenonderzoek met de volgende opbouw:"
 msgstr "Task-based research structured as follows:"
 
-#: studies/templates/studies/study_end.html:142
+#: studies/templates/studies/study_end.html:138
 #: tasks/templates/tasks/session_confirm_delete.html:6
-#: tasks/templates/tasks/session_confirm_delete.html:14
+#: tasks/templates/tasks/session_confirm_delete.html:12
 msgid "Sessie verwijderen"
 msgstr "Delete session"
 
-#: studies/templates/studies/study_end.html:146
-#: tasks/templates/tasks/task_end.html:23
+#: studies/templates/studies/study_end.html:143
+#: tasks/templates/tasks/task_end.html:20
 msgid "Deze sessie bestaat uit de volgende taken:"
 msgstr "This session consists of the following tasks:"
 
-#: studies/templates/studies/study_end.html:156
+#: studies/templates/studies/study_end.html:153
 msgid ""
-"\n"
-"                    Beantwoord op basis van dit overzicht de volgende "
-"vragen,\n"
-"                    en ga daarbij uit van het naar verwachting meest "
-"kwetsbare c.q.\n"
-"                    minst belastbare (bijv. jongste) geselecteerde "
-"deelnemerstype\n"
-"                    dat dit traject doorloopt.\n"
-"                "
+"Beantwoord op basis van dit overzicht de volgende vragen, en ga daarbij uit "
+"van het naar verwachting meest kwetsbare c.q. minst belastbare (bijv. "
+"jongste) geselecteerde deelnemerstype dat dit traject doorloopt."
 msgstr ""
-"\n"
-"    On the basis of this overview answer the following questions\n"
-"    with respect to those participants who are most vulnerable or least\n"
-"    able to bear any burden (e.g. the youngest) to follow this\n"
-"    trajectory.\n"
-"    "
+"On the basis of this overview answer the following questions with respect to "
+"those participants who are most vulnerable or least able to bear any burden "
+"(e.g. the youngest) to follow this trajectory."
 
 #: studies/templates/studies/study_form.html:22
 msgid "De leeftijdsgroep van je deelnemers"
@@ -5174,42 +4872,26 @@ msgstr "Compensation"
 msgid "Hiërarchie"
 msgstr "Hierarchy"
 
-#: studies/templates/studies/study_form.html:90
+#: studies/templates/studies/study_form.html:85
 #, python-format
 msgid ""
-"\n"
-"                        Let op! Je hebt de vraag <a href=\"%(url)s\">'In "
-"welke hoedanigheid ben je betrokken bij deze aanvraag?'</a> nog niet "
-"ingevuld, waardoor deze pagina nog kan veranderen op basis van je antwoord.\n"
-"                    "
+"Let op! Je hebt de vraag <a href=\"%(url)s\">'In welke hoedanigheid ben je "
+"betrokken bij deze aanvraag?'</a> nog niet ingevuld, waardoor deze pagina "
+"nog kan veranderen op basis van je antwoord."
 msgstr ""
-"\n"
-"                Warning! The question <a href=\"%(url)s\">'In welke "
-"hoedanigheid ben je betrokken bij deze aanvraag?'</a> has not been answered "
-"yet. This page might change depending on your answer.\n"
-"            "
+"Warning! The question <a href=\"%(url)s\">'In what capacity are you involved "
+"in this application?'</a> has not been answered yet. This page might change "
+"depending on your answer."
 
 #: studies/templates/studies/study_title.html:6
 #, python-format
-msgid ""
-"\n"
-"    Traject %(order)s (<em>%(name)s</em>)\n"
-"    "
-msgstr ""
-"\n"
-"    Trajectory %(order)s (<em>%(name)s</em>)\n"
-"    "
+msgid "Traject %(order)s (<em>%(name)s</em>)"
+msgstr "Trajectory %(order)s (<em>%(name)s</em>)"
 
 #: studies/templates/studies/study_title.html:10
 #, python-format
-msgid ""
-"\n"
-"    Traject %(order)s\n"
-"    "
-msgstr ""
-"\n"
-"    Trajectory %(order)s\n"
-"    "
+msgid "Traject %(order)s"
+msgstr "Trajectory %(order)s"
 
 #: studies/templatetags/describe_documents.py:23
 msgid "bestand"
@@ -5239,7 +4921,7 @@ msgstr "information letter for parents"
 msgid "data management plan"
 msgstr "data management plan"
 
-#: studies/templatetags/describe_documents.py:62
+#: studies/templatetags/describe_documents.py:64
 msgid ""
 "\n"
 "            {} bij {} van aanvraag {}-{}: <i>{}</i>\n"
@@ -5249,7 +4931,7 @@ msgstr ""
 "{} of {} in application {}-{}: <i>{}</i>\n"
 "      "
 
-#: studies/templatetags/describe_documents.py:71
+#: studies/templatetags/describe_documents.py:76
 msgid ""
 "\n"
 "            {} van aanvraag {}-{}: <i>{}</i>\n"
@@ -5259,48 +4941,48 @@ msgstr ""
 "{} of application {}-{}: <i>{}</i>\n"
 "      "
 
-#: studies/utils.py:63
+#: studies/utils.py:67
 msgid "Deelnemers"
 msgstr "Participants"
 
-#: studies/utils.py:69
+#: studies/utils.py:73
 msgid "Onderzoekstype(n)"
 msgstr "Type(s) of research"
 
-#: studies/utils.py:84
+#: studies/utils.py:88
 msgid "Overzicht"
 msgstr "Overview"
 
-#: studies/utils.py:92
+#: studies/utils.py:96
 msgid "Traject {}"
 msgstr "Trajectory {}"
 
-#: studies/views/session_views.py:22
+#: studies/views/session_views.py:24
 #, python-format
 msgid "%(sessions_number)s sessie(s) voor studie %(title)s aangemaakt"
 msgstr "%(sessions_number)s sessions for application %(title)s created"
 
-#: studies/views/study_views.py:29
+#: studies/views/study_views.py:36
 msgid "Studie opgeslagen"
 msgstr "Application saved"
 
-#: studies/views/study_views.py:63
+#: studies/views/study_views.py:70
 msgid "Traject opgeslagen"
 msgstr "Trajectory saved"
 
-#: tasks/forms.py:17
+#: tasks/forms.py:19
 msgid "Is deze sessie een kopie van een voorgaande sessie?"
 msgstr "Is this session a copy of a previous session?"
 
-#: tasks/forms.py:18
+#: tasks/forms.py:20
 msgid "Na het kopiëren zijn alle velden bewerkbaar."
 msgstr "All fields can be edited after copying."
 
-#: tasks/forms.py:23
+#: tasks/forms.py:26
 msgid "Te kopiëren sessie"
 msgstr "Session to be copied"
 
-#: tasks/forms.py:101 tasks/models.py:137
+#: tasks/forms.py:125 tasks/models.py:144
 msgid ""
 "Wat is de duur van deze taak van begin tot eind in <strong>minuten</strong>, "
 "dus vanaf het moment dat de taak van start gaat tot en met het einde van de "
@@ -5314,7 +4996,7 @@ msgstr ""
 "criterion), <strong>indicate the maximum duration that can reasonably be "
 "expected</strong>."
 
-#: tasks/forms.py:181
+#: tasks/forms.py:217
 msgid "Totale sessieduur moet minstens gelijk zijn aan netto sessieduur."
 msgstr ""
 "The total duration of the session must be at least as long as the net "
@@ -5325,7 +5007,7 @@ msgid "Hoeveel taken worden er binnen deze sessie bij de deelnemer afgenomen?"
 msgstr ""
 "How many tasks will each participant have to carry out in this session?"
 
-#: tasks/models.py:17
+#: tasks/models.py:21
 msgid ""
 "Wanneer je bijvoorbeeld eerst de deelnemer observeert en de deelnemer "
 "vervolgens een vragenlijst afneemt, dan vul je hierboven \"2\" in. "
@@ -5337,7 +5019,7 @@ msgstr ""
 "session debriefing and a short (<3 minute) exit interview are not counted as "
 "tasks."
 
-#: tasks/models.py:24
+#: tasks/models.py:30
 #, python-format
 msgid ""
 "De totale geschatte netto taakduur van je sessie komt op basis van je opgave "
@@ -5351,19 +5033,19 @@ msgstr ""
 "task, breaks between tasks, and debriefing? (in case of a lab visit from "
 "entering the lab until leaving)"
 
-#: tasks/models.py:84
+#: tasks/models.py:88
 msgid "Sessie {}"
 msgstr "Session {}"
 
-#: tasks/models.py:98
+#: tasks/models.py:102
 msgid "Vastlegging gedrag"
 msgstr "Registration of behaviour"
 
-#: tasks/models.py:121
+#: tasks/models.py:125
 msgid "Wat is de naam van de taak?"
 msgstr "What is the title of the task?"
 
-#: tasks/models.py:127
+#: tasks/models.py:132
 msgid ""
 "Beschrijf de taak die de deelnemer moet uitvoeren, en leg kort uit hoe deze "
 "taak (en de eventuele manipulaties daarbinnen) aan de beantwoording van jouw "
@@ -5379,7 +5061,7 @@ msgstr ""
 "participant. The committee members need to be in the clear on your exact "
 "plans."
 
-#: tasks/models.py:149
+#: tasks/models.py:158
 msgid ""
 "Hoe wordt het gedrag of de toestand van de deelnemer bij deze taak "
 "vastgelegd?"
@@ -5387,7 +5069,7 @@ msgstr ""
 "How will the behaviour or the state of the participant be recorded in this "
 "task?"
 
-#: tasks/models.py:150
+#: tasks/models.py:161
 msgid ""
 "Opnames zijn nooit anoniem en niet te anonimiseren. Let hierop bij het "
 "gebruik van de term         ‘anoniem’ of ‘geanonimiseerd’ in je documenten "
@@ -5405,11 +5087,11 @@ msgstr ""
 "versie-1.1_21dec2021.pdf' target='_blank'>Guidelines for Informed Consent, "
 "‘Audio and Video’ (in Dutch)</a>."
 
-#: tasks/models.py:164
+#: tasks/models.py:176
 msgid "Kies het soort meting"
 msgstr "Select the type of measurement"
 
-#: tasks/models.py:175
+#: tasks/models.py:188
 msgid ""
 "Krijgt de deelnemer tijdens of na deze taak feedback op hun gedrag of "
 "toestand?"
@@ -5417,54 +5099,37 @@ msgstr ""
 "Will the participant receive feedback on their behaviour or state during or "
 "after this task?"
 
-#: tasks/models.py:182
+#: tasks/models.py:196
 msgid "Beschrijf hoe de feedback wordt gegeven."
 msgstr "Describe how the feedback will be given."
 
-#: tasks/models.py:206
+#: tasks/models.py:220
 msgid "Taak {} in sessie {}"
 msgstr "Task {} in session {}"
 
 #: tasks/templates/tasks/session_title.html:6
 #, python-format
-msgid ""
-"\n"
-"    Traject %(study_order)s (<em>%(study_name)s</em>), sessie %(order)s\n"
-"    "
+msgid "Traject %(study_order)s (<em>%(study_name)s</em>), sessie %(order)s"
 msgstr ""
-"\n"
-"    Trajectory %(study_order)s (<em>%(study_name)s</em>), session %(order)s\n"
-"    "
+"Trajectory %(study_order)s (<em>%(study_name)s</em>), session %(order)s"
 
 #: tasks/templates/tasks/session_title.html:12
 #, python-format
-msgid ""
-"\n"
-"    Traject %(study_order)s (<em>%(study_name)s</em>)\n"
-"    "
-msgstr ""
-"\n"
-"    Trajectory %(study_order)s (<em>%(study_name)s</em>)\n"
-"    "
+msgid "Traject %(study_order)s (<em>%(study_name)s</em>)"
+msgstr "Trajectory %(study_order)s (<em>%(study_name)s</em>)"
 
 #: tasks/templates/tasks/session_title.html:18
 #, python-format
-msgid ""
-"\n"
-"    Sessie %(order)s\n"
-"    "
-msgstr ""
-"\n"
-"    Session %(order)s\n"
-"    "
+msgid "Sessie %(order)s"
+msgstr "Session %(order)s"
 
 #: tasks/templates/tasks/task_confirm_delete.html:6
-#: tasks/templates/tasks/task_confirm_delete.html:13
-#: tasks/templates/tasks/task_list.html:29
+#: tasks/templates/tasks/task_confirm_delete.html:12
+#: tasks/templates/tasks/task_list.html:32
 msgid "Taak verwijderen"
 msgstr "Delete task"
 
-#: tasks/templates/tasks/task_end.html:27
+#: tasks/templates/tasks/task_end.html:24
 msgid "Beantwoord op basis van dit overzicht de volgende vragen:"
 msgstr "Answer the following questions on the basis of this overview:"
 
@@ -5492,40 +5157,30 @@ msgstr "We will ask the same questions for each task on the next few pages."
 #: tasks/templates/tasks/task_title.html:6
 #, python-format
 msgid ""
-"\n"
-"    Traject %(study_order)s (<em>%(study_name)s</em>), sessie "
-"%(session_order)s, taak %(order)s\n"
-"    "
+"Traject %(study_order)s (<em>%(study_name)s</em>), sessie %(session_order)s, "
+"taak %(order)s"
 msgstr ""
-"\n"
-"    Trajectory %(study_order)s (<em>%(study_name)s</em>), session "
-"%(session_order)s, task %(order)s\n"
-"    "
+"Trajectory %(study_order)s (<em>%(study_name)s</em>), session "
+"%(session_order)s, task %(order)s"
 
 #: tasks/templates/tasks/task_title.html:12
 #, python-format
-msgid ""
-"\n"
-"    Sessie %(session_order)s, taak %(order)s\n"
-"    "
-msgstr ""
-"\n"
-"    Session %(session_order)s, task %(order)s\n"
-"    "
+msgid "Sessie %(session_order)s, taak %(order)s"
+msgstr "Session %(session_order)s, task %(order)s"
 
-#: tasks/utils.py:32
+#: tasks/utils.py:36
 msgid "Takenonderzoek"
 msgstr "Task-based research"
 
-#: tasks/utils.py:40
+#: tasks/utils.py:45
 msgid "Het takenonderzoek: sessie {}"
 msgstr "Task-based research: session {}"
 
-#: tasks/utils.py:47
+#: tasks/utils.py:54
 msgid "Overzicht van takenonderzoek: sessie {}"
 msgstr "Overview of task-based research: session {}"
 
-#: tasks/utils.py:62
+#: tasks/utils.py:71
 msgid "Het takenonderzoek: sessie {} taak {}"
 msgstr "Task-based research: session {} task {}"
 
@@ -5533,19 +5188,19 @@ msgstr "Task-based research: session {} task {}"
 msgid "Sessie verwijderd"
 msgstr "Session deleted"
 
-#: tasks/views/session_views.py:55
+#: tasks/views/session_views.py:56
 #, python-format
 msgid "%(tasks_number)s ta(a)k(en) aangemaakt"
 msgstr "%(tasks_number)s task(s) created"
 
-#: tasks/views/session_views.py:131
+#: tasks/views/session_views.py:135
 msgid "Taken toevoegen beëindigd"
 msgstr "Finished adding tasks"
 
-#: tasks/views/task_views.py:21
+#: tasks/views/task_views.py:22
 msgid "Taak bewerkt"
 msgstr "Task edited"
 
-#: tasks/views/task_views.py:50
+#: tasks/views/task_views.py:56
 msgid "Taak verwijderd"
 msgstr "Task deleted"

From b6788d434cdc07c2a82bbd29271def3349e06368 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 15:36:40 +0100
Subject: [PATCH 120/148] ci: run linter checks for PR's

---
 .../workflows/check-missing-migrations.yml    | 24 ---------
 .github/workflows/pr-checks.yml               | 52 +++++++++++++++++++
 2 files changed, 52 insertions(+), 24 deletions(-)
 delete mode 100644 .github/workflows/check-missing-migrations.yml
 create mode 100644 .github/workflows/pr-checks.yml

diff --git a/.github/workflows/check-missing-migrations.yml b/.github/workflows/check-missing-migrations.yml
deleted file mode 100644
index 1d5423359..000000000
--- a/.github/workflows/check-missing-migrations.yml
+++ /dev/null
@@ -1,24 +0,0 @@
-name: Check for missing migrations
-
-on:
-  pull_request:
-jobs:
-  run-check:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Install OS dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install libldap2-dev libsasl2-dev libssl-dev gettext poppler-utils poppler-data libpoppler-cpp-dev
-      - uses: actions/checkout@v2
-      - name: Set up Python
-        uses: actions/setup-python@v2
-        with:
-          python-version: 3.9
-      - name: Install Dependencies
-        run: |
-          python -m pip install --upgrade pip
-          pip install -r requirements.txt
-      - name: Check for missing migrations
-        run: |
-          python manage.py makemigrations --check --dry-run
diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
new file mode 100644
index 000000000..93d9efd15
--- /dev/null
+++ b/.github/workflows/pr-checks.yml
@@ -0,0 +1,52 @@
+name: PR checks
+
+on:
+  pull_request:
+jobs:
+  check-migrations:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install OS dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libldap2-dev libsasl2-dev libssl-dev gettext poppler-utils poppler-data libpoppler-cpp-dev
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Check for missing migrations
+        run: |
+          python manage.py makemigrations --check --dry-run
+  check-djlint:
+    runs-on: ubuntu-latest
+    steps:
+      - name: Install OS dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get install libldap2-dev libsasl2-dev libssl-dev gettext poppler-utils poppler-data libpoppler-cpp-dev
+      - uses: actions/checkout@v2
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.9
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Check for missing migrations
+        run: |
+          djlint . --check
+  black-check: # Rhymes with blackjack :D
+    name: Check if Black thinks everything is correctly formatted
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: psf/black@stable
+        with:
+          src: . # Change if you don't want to run black on the entire repo.
+

From 70bc5891ebd2a4dac237c8d06e5cd03e2041b542 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 15:39:23 +0100
Subject: [PATCH 121/148] chore: add ignore revs file

---
 .git-blame-ignore-revs | 5 +++++
 1 file changed, 5 insertions(+)
 create mode 100644 .git-blame-ignore-revs

diff --git a/.git-blame-ignore-revs b/.git-blame-ignore-revs
new file mode 100644
index 000000000..281e74073
--- /dev/null
+++ b/.git-blame-ignore-revs
@@ -0,0 +1,5 @@
+# Black reformat
+135eb9119066aedf946aaf3d22cbb839d59fc038
+
+# DJLint reformat
+664077453c8fe393cdd8db692a33d515e5db6f69
\ No newline at end of file

From 6a4209fdb69e253b3fed2095b7e06c08b96b4800 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 15:49:23 +0100
Subject: [PATCH 122/148] style: fixed 'intentionally' wrong indentation

This is totally not a formatting problem I used to check the checker, which I accidentally left in while committing.
Well.... At least we know the CI check works :')
---
 studies/templates/studies/study_design.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/studies/templates/studies/study_design.html b/studies/templates/studies/study_design.html
index c6f8bb79f..d0ed355dc 100644
--- a/studies/templates/studies/study_design.html
+++ b/studies/templates/studies/study_design.html
@@ -17,7 +17,7 @@ <h2>{% trans "De onderzoekstype(n)" %}</h2>
             {% include "studies/study_title.html" %}
             <p>
                 {% blocktrans trimmed %}
-        De FETC-GW onderscheidt 3 typen onderzoek (die evt. ook samen in één aanvraag voor kunnen komen):
+                    De FETC-GW onderscheidt 3 typen onderzoek (die evt. ook samen in één aanvraag voor kunnen komen):
                 {% endblocktrans %}
             </p>
             <ul>

From f39b194c42d042d1bbdfa179aa46a01257951f22 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 16:00:36 +0100
Subject: [PATCH 123/148] fix: prevented djlint from messing up one line

Okay, didn't realize there is this one case where we use Django-in-CSS. Luckily it's just the one. Right?
---
 proposals/templates/easy_pdf/base.html | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/proposals/templates/easy_pdf/base.html b/proposals/templates/easy_pdf/base.html
index 669599076..27de4b5c4 100644
--- a/proposals/templates/easy_pdf/base.html
+++ b/proposals/templates/easy_pdf/base.html
@@ -10,13 +10,9 @@
             {% block layout_style %}
                 <style type="text/css">
                     @page {
-                        size: {
-                                {
-                                pagesize|default: "A4"
-                            }
-                        }
-
-                        ;
+                        {# djlint:off #}
+                        size: {{ pagesize|default:"A4" }};
+                        {# djlint:on #}
                         margin-left: 2.5cm;
                         margin-right: 2.5cm;
                         margin-top: 2.5cm;

From a7d2156cd2e8a8a4afc4e9ac547be2cadf0ea1dd Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 16:50:17 +0100
Subject: [PATCH 124/148] fix: use the right ignore directive

---
 proposals/templates/easy_pdf/base.html | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/proposals/templates/easy_pdf/base.html b/proposals/templates/easy_pdf/base.html
index 27de4b5c4..0c1e8350d 100644
--- a/proposals/templates/easy_pdf/base.html
+++ b/proposals/templates/easy_pdf/base.html
@@ -10,9 +10,9 @@
             {% block layout_style %}
                 <style type="text/css">
                     @page {
-                        {# djlint:off #}
+                        /* beautify ignore:start */
                         size: {{ pagesize|default:"A4" }};
-                        {# djlint:on #}
+                        /* beautify ignore:end */
                         margin-left: 2.5cm;
                         margin-right: 2.5cm;
                         margin-top: 2.5cm;

From c549d1c64f0cd16103bc148bd64daabe7997ea30 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Fri, 12 Jan 2024 17:03:28 +0100
Subject: [PATCH 125/148] ci: stop DJLint from judging dependencies

---
 .github/workflows/pr-checks.yml | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pr-checks.yml b/.github/workflows/pr-checks.yml
index 93d9efd15..f672f6466 100644
--- a/.github/workflows/pr-checks.yml
+++ b/.github/workflows/pr-checks.yml
@@ -4,6 +4,7 @@ on:
   pull_request:
 jobs:
   check-migrations:
+    name: Check if there are any missing migrations
     runs-on: ubuntu-latest
     steps:
       - name: Install OS dependencies
@@ -23,6 +24,7 @@ jobs:
         run: |
           python manage.py makemigrations --check --dry-run
   check-djlint:
+    name: Check if DJLint thinks everything is correctly formatted
     runs-on: ubuntu-latest
     steps:
       - name: Install OS dependencies
@@ -38,9 +40,10 @@ jobs:
         run: |
           python -m pip install --upgrade pip
           pip install -r requirements.txt
-      - name: Check for missing migrations
+      - name: Run DJLint
+        # This exclude flag is needed because Github downloads dependencies there, which causes djlint to judge those
         run: |
-          djlint . --check
+          djlint . --check --exclude src
   black-check: # Rhymes with blackjack :D
     name: Check if Black thinks everything is correctly formatted
     runs-on: ubuntu-latest
@@ -48,5 +51,5 @@ jobs:
       - uses: actions/checkout@v2
       - uses: psf/black@stable
         with:
-          src: . # Change if you don't want to run black on the entire repo.
+          src: .
 

From 6d1e9136385b857865813259085c0d5e75ff29b3 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Tue, 16 Jan 2024 17:23:36 +0100
Subject: [PATCH 126/148] fix: repaired a broken translation

---
 locale/en/LC_MESSAGES/django.po       | 11 +++++++----
 main/templates/base/form_buttons.html |  8 ++------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index cb1ab438b..a721b5a66 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-12 15:35+0100\n"
+"POT-Creation-Date: 2024-01-16 17:20+0100\n"
 "PO-Revision-Date: 2023-11-07 10:36+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -399,6 +399,10 @@ msgstr "Back to the beginning of the trajectory"
 msgid "Terug naar begin sessie"
 msgstr "Back to the beginning of the session"
 
+#: main/templates/base/form_buttons.html:34
+msgid "Opslaan en volgende stap >>"
+msgstr "Save and go to next step >>"
+
 #: main/templates/base/login_header.html:6
 msgid "Welkom {}"
 msgstr "Welcome {}"
@@ -3628,9 +3632,8 @@ msgid ""
 "target=\"_blank\">hier</a> in te zien (downloadt als PDF)."
 msgstr ""
 "    You can now give a go or no-go for the application <em>%(title)s</em>, "
-"%(refnum)s in %(chamber)s."
-"    You can see the details of this application <a href=\"%(pdf_url)s\" "
-"target=\"_blank\">here</a> (downloads as PDF)."
+"%(refnum)s in %(chamber)s.    You can see the details of this application <a "
+"href=\"%(pdf_url)s\" target=\"_blank\">here</a> (downloads as PDF)."
 
 #: reviews/templates/reviews/decision_form.html:30
 #, python-format
diff --git a/main/templates/base/form_buttons.html b/main/templates/base/form_buttons.html
index b0dd91b59..a3dd2e285 100644
--- a/main/templates/base/form_buttons.html
+++ b/main/templates/base/form_buttons.html
@@ -31,15 +31,11 @@
             {% endif %}
         {% endif %}
         {% if not no_forward %}
+            {% trans 'Opslaan en volgende stap >>' as default_next_text %}
             <input class="button button-colored continue-button"
                    type="submit"
                    name="save_continue"
-                   value="{{ next_text|default:_("
-                   Opslaan
-                   en
-                   volgende
-                   stap>
-            >") }}" />
+                   value="{{ next_text|default:default_next_text }}" />
         {% endif %}
     </div>
 </div>

From 12c46cad58499507c99eef4c9bf59f6b973e6527 Mon Sep 17 00:00:00 2001
From: Michael Villeneuve <m.l.villeneuve@uu.nl>
Date: Wed, 17 Jan 2024 10:48:45 +0100
Subject: [PATCH 127/148] fix: Missing letter and <br /> inconsistencies

---
 locale/en/LC_MESSAGES/django.po | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index a721b5a66..8e5318fe7 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-16 17:20+0100\n"
-"PO-Revision-Date: 2023-11-07 10:36+0100\n"
+"PO-Revision-Date: 2024-01-17 10:48+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
 "Language: en\n"
@@ -3827,22 +3827,22 @@ msgstr ""
 #: reviews/templates/reviews/review_detail_sidebar.html:46
 #, python-format
 msgid "Reviewronde gestart op <br /> %(date_start)s."
-msgstr "eviewing round started on %(date_start)s."
+msgstr "Reviewing round started on <br /> %(date_start)s."
 
 #: reviews/templates/reviews/review_detail_sidebar.html:54
 #, python-format
 msgid "Reviewronde beëindigd op <br /> %(date_end)s."
-msgstr "Reviewing round ended on %(date_end)s."
+msgstr "Reviewing round ended on <br /> %(date_end)s."
 
 #: reviews/templates/reviews/review_detail_sidebar.html:63
 #, python-format
 msgid "Afhandeling: <br /> %(continuation)s."
-msgstr "Continuation: %(continuation)s."
+msgstr "Continuation: <br /> %(continuation)s."
 
 #: reviews/templates/reviews/review_detail_sidebar.html:71
 #, python-format
 msgid "Bevestiging verzonden op <br /> %(date_confirmed)s."
-msgstr "Confirmation sent on %(date_confirmed)s."
+msgstr "Confirmation sent on <br /> %(date_confirmed)s."
 
 #: reviews/templates/reviews/review_detail_sidebar.html:77
 #, python-format

From 85f368779a2b24c06a75045898d832a48e652a11 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 18 Jan 2024 15:35:41 +0100
Subject: [PATCH 128/148] Requests from #596. minor tweaks to workload view

---
 reviews/menus.py | 2 +-
 reviews/views.py | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/reviews/menus.py b/reviews/menus.py
index 5a224020d..74ff62302 100644
--- a/reviews/menus.py
+++ b/reviews/menus.py
@@ -55,7 +55,7 @@ def create_committee_menu(commitee: str) -> List[MenuItem]:
         MenuItem(
             _("Overzicht werkverdeling commissieleden"),
             reverse("reviews:workload", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_secretary(x.user),
         ),
     ]
 
diff --git a/reviews/views.py b/reviews/views.py
index 0430a062f..815071cd4 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -98,7 +98,7 @@ class CommitteeMembersWorkloadView(
     def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.today = date.today()
-        self.start_date = self.today - timedelta(days=365)
+        self.start_date = self.today - timedelta(days=90)
         self.end_date = self.today
 
     def post(self, request, *args, **kwargs):

From aef9f02469657451e6e512100143f16a3ffe3748 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Thu, 1 Feb 2024 15:12:36 +0100
Subject: [PATCH 129/148] fix: made sure fixtures are loaded in the correct
 order

---
 main/management/commands/load_fixtures.py                     | 4 +++-
 tasks/fixtures/{registrations.json => 00_registrations.json}  | 0
 .../{registrationkinds.json => 01_registrationkinds.json}     | 0
 3 files changed, 3 insertions(+), 1 deletion(-)
 rename tasks/fixtures/{registrations.json => 00_registrations.json} (100%)
 rename tasks/fixtures/{registrationkinds.json => 01_registrationkinds.json} (100%)

diff --git a/main/management/commands/load_fixtures.py b/main/management/commands/load_fixtures.py
index 47a091100..617f1ea53 100644
--- a/main/management/commands/load_fixtures.py
+++ b/main/management/commands/load_fixtures.py
@@ -7,6 +7,8 @@
 
 def list_fixtures_in_dir(rel_path):
     files = os.listdir(rel_path)
+    # Sort the list alphabetically for consistent load-order
+    files.sort()
 
     def is_fixture(fn):
         return fn.lower()[-5:] == ".json"
@@ -15,11 +17,11 @@ def is_fixture(fn):
 
 
 fixture_dirs = {
+    "main": list_fixtures_in_dir("main/fixtures/"),
     "proposals": list_fixtures_in_dir("proposals/fixtures/"),
     "studies": list_fixtures_in_dir("studies/fixtures/"),
     "tasks": list_fixtures_in_dir("tasks/fixtures/"),
     "observations": list_fixtures_in_dir("observations/fixtures/"),
-    "main": list_fixtures_in_dir("main/fixtures/"),
 }
 
 
diff --git a/tasks/fixtures/registrations.json b/tasks/fixtures/00_registrations.json
similarity index 100%
rename from tasks/fixtures/registrations.json
rename to tasks/fixtures/00_registrations.json
diff --git a/tasks/fixtures/registrationkinds.json b/tasks/fixtures/01_registrationkinds.json
similarity index 100%
rename from tasks/fixtures/registrationkinds.json
rename to tasks/fixtures/01_registrationkinds.json

From fcec5389314b8b5d741171ca01a0a65772dbd6a5 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 1 Feb 2024 15:46:30 +0100
Subject: [PATCH 130/148] more #596. Added PO group and changed fetc_filters.py

---
 fetc/constants.py                 |  1 +
 main/fixtures/groups.json         |  8 ++++++
 main/templatetags/fetc_filters.py | 45 +++++++++++++++++++++----------
 reviews/api/views.py              | 23 +++++++++++++---
 reviews/menus.py                  | 18 ++++++-------
 reviews/views.py                  | 24 ++++++++++++-----
 6 files changed, 86 insertions(+), 33 deletions(-)

diff --git a/fetc/constants.py b/fetc/constants.py
index bac996c73..96d9745c5 100644
--- a/fetc/constants.py
+++ b/fetc/constants.py
@@ -7,6 +7,7 @@
 GROUP_LINGUISTICS_CHAMBER = "LK"
 GROUP_GENERAL_CHAMBER = "AK"
 GROUP_CHAIR = "Voorzitter"
+GROUP_PO = "Privacy officer"
 
 # Route durations
 PREASSESSMENT_ROUTE_WEEKS = 1
diff --git a/main/fixtures/groups.json b/main/fixtures/groups.json
index 70574198c..de1159e26 100644
--- a/main/fixtures/groups.json
+++ b/main/fixtures/groups.json
@@ -38,5 +38,13 @@
         },
         "model": "auth.group",
         "pk": 5
+    },
+    {
+        "fields": {
+            "name": "Privacy officer",
+            "permissions": []
+        },
+        "model": "auth.group",
+        "pk": 6
     }
 ]
\ No newline at end of file
diff --git a/main/templatetags/fetc_filters.py b/main/templatetags/fetc_filters.py
index 9129012de..45ae00e6a 100644
--- a/main/templatetags/fetc_filters.py
+++ b/main/templatetags/fetc_filters.py
@@ -5,15 +5,26 @@
 register = template.Library()
 
 
+def is_in_groups(current_user, groups):
+    """
+    Check whether the current user is in specific groups, specified in the
+    groups argument, like eg.:
+
+    groups = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
+    """
+    user_groups = current_user.groups.all()
+    group_objects = [Group.objects.get(name=group) for group in groups]
+
+    return any(group in user_groups for group in group_objects)
+
+
 @register.filter
 def in_linguistics_chamber(current_user):
     """
     Check whether the current user is in the 'ETCL' or 'Secretaris' group
     """
-    return (
-        Group.objects.get(name=settings.GROUP_LINGUISTICS_CHAMBER)
-        in current_user.groups.all()
-        or Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    return is_in_groups(
+        current_user, [settings.LINGUISTICS_CHAMBER, settings.GROUP_SECRETARY]
     )
 
 
@@ -22,10 +33,8 @@ def in_general_chamber(current_user):
     """
     Check whether the current user is in the 'FETC' or 'Secretaris' group
     """
-    return (
-        Group.objects.get(name=settings.GROUP_GENERAL_CHAMBER)
-        in current_user.groups.all()
-        or Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    return is_in_groups(
+        current_user, [settings.GROUP_GENERAL_CHAMBER, settings.GROUP_SECRETARY]
     )
 
 
@@ -34,16 +43,24 @@ def is_secretary(current_user):
     """
     Check whether the current user is in the 'Secretary' group
     """
-    return Group.objects.get(name=settings.GROUP_SECRETARY) in current_user.groups.all()
+    return is_in_groups(current_user, [settings.GROUP_SECRETARY])
 
 
 @register.filter
 def is_chair_or_secretary(current_user):
     """
-    Check whether the current user is in the 'Chair' or 'Secretary' Group
+    Check whether the current user is in the 'Secretary' or 'Chair' group
     """
-    user_groups = current_user.groups.all()
-    return (
-        Group.objects.get(name=settings.GROUP_CHAIR) in user_groups
-        or Group.objects.get(name=settings.GROUP_SECRETARY) in user_groups
+    return is_in_groups(current_user, [settings.GROUP_SECRETARY, settings.GROUP_CHAIR])
+
+
+@register.filter
+def is_po_chair_or_secretary(current_user):
+    """
+    Check whether the current user is in the 'Secretary', 'Privacy officer'
+    or 'Chair' group
+    """
+    return is_in_groups(
+        current_user,
+        [settings.GROUP_SECRETARY, settings.GROUP_CHAIR, settings.GROUP_PO],
     )
diff --git a/reviews/api/views.py b/reviews/api/views.py
index 242d3a5cb..420f9a212 100644
--- a/reviews/api/views.py
+++ b/reviews/api/views.py
@@ -22,6 +22,7 @@ class BaseDecisionApiView(GroupRequiredMixin, CommitteeMixin, FancyListApiView):
     group_required = [
         settings.GROUP_SECRETARY,
         settings.GROUP_CHAIR,
+        settings.GROUP_PO,
         settings.GROUP_GENERAL_CHAMBER,
         settings.GROUP_LINGUISTICS_CHAMBER,
     ]
@@ -224,6 +225,7 @@ class OpenDecisionsApiView(BaseDecisionApiView):
     group_required = [
         settings.GROUP_SECRETARY,
         settings.GROUP_CHAIR,
+        settings.GROUP_PO,
     ]
 
     def get_queryset(self):
@@ -266,6 +268,7 @@ class OpenSupervisorDecisionApiView(BaseDecisionApiView):
     group_required = [
         settings.GROUP_SECRETARY,
         settings.GROUP_CHAIR,
+        settings.GROUP_PO,
     ]
 
     sort_definitions = [
@@ -367,6 +370,7 @@ class ToConcludeReviewApiView(BaseReviewApiView):
     group_required = [
         settings.GROUP_SECRETARY,
         settings.GROUP_CHAIR,
+        settings.GROUP_PO,
     ]
 
     def get_queryset(self):
@@ -415,7 +419,11 @@ class InRevisionApiView(BaseReviewApiView):
     but for which a revision has not yet been submitted"""
 
     default_sort = ("date_start", "desc")
-    group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
+    group_required = [
+        settings.GROUP_SECRETARY,
+        settings.GROUP_CHAIR,
+        settings.GROUP_PO,
+    ]
 
     def get_queryset(self):
         # 1. Find reviews of revisions:
@@ -452,7 +460,12 @@ class AllOpenReviewsApiView(BaseReviewApiView):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
+        group_required = [
+            settings.GROUP_SECRETARY,
+            settings.GROUP_CHAIR,
+            settings.GROUP_PO,
+        ]
+        settings.GROUP_PO,
 
         if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
@@ -503,7 +516,11 @@ class AllReviewsApiView(BaseReviewApiView):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
+        group_required = [
+            settings.GROUP_SECRETARY,
+            settings.GROUP_CHAIR,
+            settings.GROUP_PO,
+        ]
 
         if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
diff --git a/reviews/menus.py b/reviews/menus.py
index 74ff62302..03e5f0a00 100644
--- a/reviews/menus.py
+++ b/reviews/menus.py
@@ -7,12 +7,12 @@
 from main.templatetags.fetc_filters import (
     in_general_chamber,
     in_linguistics_chamber,
-    is_secretary,
     is_chair_or_secretary,
+    is_po_chair_or_secretary,
 )
 
-
 def create_committee_menu(commitee: str) -> List[MenuItem]:
+
     return [
         MenuItem(
             _("Mijn openstaande besluiten"),
@@ -25,37 +25,37 @@ def create_committee_menu(commitee: str) -> List[MenuItem]:
         MenuItem(
             _("Alle openstaande besluiten commissieleden"),
             reverse("reviews:open", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_po_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Alle openstaande besluiten eindverantwoordelijken"),
             reverse("reviews:open_supervisors", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_po_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Nog af te handelen aanvragen"),
             reverse("reviews:to_conclude", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_po_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Aanvragen in revisie"),
             reverse("reviews:in_revision", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_po_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Alle lopende aanvragen"),
             reverse("reviews:all_open", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_po_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Alle ingezonden aanvragen"),
             reverse("reviews:archive", args=[commitee]),
-            check=lambda x: is_chair_or_secretary(x.user),
+            check=lambda x: is_po_chair_or_secretary(x.user),
         ),
         MenuItem(
             _("Overzicht werkverdeling commissieleden"),
             reverse("reviews:workload", args=[commitee]),
-            check=lambda x: is_secretary(x.user),
+            check=lambda x: is_chair_or_secretary(x.user),
         ),
     ]
 
diff --git a/reviews/views.py b/reviews/views.py
index 815071cd4..5ec8e407f 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -45,6 +45,7 @@ class BaseDecisionListView(GroupRequiredMixin, CommitteeMixin, generic.TemplateV
         settings.GROUP_GENERAL_CHAMBER,
         settings.GROUP_LINGUISTICS_CHAMBER,
         settings.GROUP_CHAIR,
+        settings.GROUP_PO,
     ]
 
     def get_context_data(self, **kwargs):
@@ -76,7 +77,7 @@ def get_context_data(self, **kwargs):
 
 
 class DecisionOpenView(BaseDecisionListView):
-    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR, settings.GROUP_PO)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -194,7 +195,7 @@ class SupervisorDecisionOpenView(BaseDecisionListView):
     This page displays all proposals to be reviewed by supervisors.
     """
 
-    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR, settings.GROUP_PO)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -210,7 +211,7 @@ def get_context_data(self, **kwargs):
 
 class BaseReviewListView(GroupRequiredMixin, CommitteeMixin, generic.TemplateView):
     template_name = "reviews/ufl_list.html"
-    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR, settings.GROUP_PO)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data()
@@ -221,7 +222,7 @@ def get_context_data(self, **kwargs):
 
 
 class ToConcludeProposalView(BaseReviewListView):
-    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR, settings.GROUP_PO)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -233,7 +234,7 @@ def get_context_data(self, **kwargs):
 
 
 class InRevisionReviewsView(BaseReviewListView):
-    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR)
+    group_required = (settings.GROUP_SECRETARY, settings.GROUP_CHAIR, settings.GROUP_PO)
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
@@ -258,7 +259,11 @@ def get_context_data(self, **kwargs):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
+        group_required = [
+            settings.GROUP_SECRETARY,
+            settings.GROUP_CHAIR,
+            settings.GROUP_PO,
+        ]
 
         if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
@@ -280,7 +285,11 @@ def get_context_data(self, **kwargs):
     def get_group_required(self):
         # Depending on committee kwarg we test for the correct group
 
-        group_required = [settings.GROUP_SECRETARY, settings.GROUP_CHAIR]
+        group_required = [
+            settings.GROUP_SECRETARY,
+            settings.GROUP_CHAIR,
+            settings.GROUP_PO,
+        ]
 
         if self.committee.name == "AK":
             group_required += [settings.GROUP_GENERAL_CHAMBER]
@@ -304,6 +313,7 @@ def get_group_required(self):
         group_required = [
             settings.GROUP_SECRETARY,
             settings.GROUP_CHAIR,
+            settings.GROUP_PO,
             obj.proposal.reviewing_committee.name,
         ]
 

From 9549e7523ce7e9bb817f93eaa42a87fbadcabf3d Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 1 Feb 2024 16:02:35 +0100
Subject: [PATCH 131/148] Fixes #597.

---
 locale/en/LC_MESSAGES/django.po               | 55 ++++++++++++-------
 .../migrations/0053_auto_20240201_1557.py     | 27 +++++++++
 proposals/models.py                           |  4 +-
 3 files changed, 63 insertions(+), 23 deletions(-)
 create mode 100644 proposals/migrations/0053_auto_20240201_1557.py

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 8e5318fe7..c2bf8733f 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-16 17:20+0100\n"
+"POT-Creation-Date: 2024-02-01 15:58+0100\n"
 "PO-Revision-Date: 2024-01-17 10:48+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -269,8 +269,8 @@ msgstr "E-mail"
 msgid "Ingediende aanvragen"
 msgstr "My submitted applications;"
 
-#: main/templates/auth/user_detail.html:36 reviews/api/views.py:46
-#: reviews/api/views.py:273 reviews/api/views.py:334
+#: main/templates/auth/user_detail.html:36 reviews/api/views.py:47
+#: reviews/api/views.py:276 reviews/api/views.py:337
 #: reviews/templates/reviews/committee_members_workload.html:24
 msgid "Referentienummer"
 msgstr "Reference number"
@@ -295,7 +295,7 @@ msgstr "Phase"
 #: proposals/api/views.py:146
 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:102
 #: proposals/templates/proposals/vue_templates/proposal_list.html:161
-#: reviews/api/views.py:50 reviews/api/views.py:277 reviews/api/views.py:338
+#: reviews/api/views.py:51 reviews/api/views.py:280 reviews/api/views.py:341
 #: reviews/templates/reviews/committee_members_workload.html:25
 #: reviews/templates/reviews/vue_templates/decision_list.html:153
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95
@@ -316,7 +316,7 @@ msgstr "Desired end date"
 msgid "Mijn besluit"
 msgstr "My decision"
 
-#: main/templates/auth/user_detail.html:43 reviews/api/views.py:328
+#: main/templates/auth/user_detail.html:43 reviews/api/views.py:331
 #: reviews/models.py:34
 #: reviews/templates/reviews/vue_templates/decision_list.html:133
 #: reviews/templates/reviews/vue_templates/review_list.html:137
@@ -1090,7 +1090,7 @@ msgstr "Last edited"
 msgid "Datum ingediend bij eindverantwoordelijke"
 msgstr "Date sent to supervisor"
 
-#: proposals/forms.py:58 proposals/models.py:242
+#: proposals/forms.py:58
 msgid ""
 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
 "<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
@@ -1462,9 +1462,19 @@ msgstr ""
 "gw@uu.nl\">privacy officer</a>. Agreements may then have to be made about "
 "the processing of personal data."
 
+#: proposals/models.py:242
+msgid ""
+"Zijn er nog andere onderzoekers bij deze aanvraag betrokken die "
+"<strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten "
+"van de Faculteit Geestwetenschappen van de UU? Zoja, vermeld diens naam en "
+"affiliatie."
+msgstr ""
+"Are there any other researchers involved <strong>outside</strong> the above-"
+"mentioned institutes? If so, please mention their name and affiliation."
+
 #: proposals/models.py:252
-msgid "Andere betrokkenen"
-msgstr "Other people involved"
+msgid "Naam en affiliatie van andere betrokkenen"
+msgstr "Name and affiliation of other involved people"
 
 #: proposals/models.py:259
 msgid ""
@@ -1734,7 +1744,7 @@ msgstr ""
 msgid "Amendement"
 msgstr "Amendment"
 
-#: proposals/models.py:677 reviews/api/views.py:40 reviews/api/views.py:324
+#: proposals/models.py:677 reviews/api/views.py:41 reviews/api/views.py:327
 #: reviews/templates/reviews/committee_members_workload.html:35
 #: reviews/templates/reviews/committee_members_workload.html:74
 #: reviews/templates/reviews/review_detail_sidebar.html:106
@@ -3291,21 +3301,21 @@ msgstr "Contact <a href=\"{link}\">{secretary}</a> to make sure."
 msgid "Je onderzoek zal moeten worden beoordeeld door de METC."
 msgstr "Your application will require assessment by an METC."
 
-#: reviews/api/views.py:32 reviews/api/views.py:316
+#: reviews/api/views.py:33 reviews/api/views.py:319
 #: reviews/templates/reviews/vue_templates/decision_list.html:111
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:61
 #: reviews/templates/reviews/vue_templates/review_list.html:116
 msgid "Stadium"
 msgstr "Stage"
 
-#: reviews/api/views.py:36 reviews/api/views.py:320 reviews/models.py:31
+#: reviews/api/views.py:37 reviews/api/views.py:323 reviews/models.py:31
 #: reviews/templates/reviews/vue_templates/decision_list.html:178
 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121
 #: reviews/templates/reviews/vue_templates/review_list.html:183
 msgid "Route"
 msgstr "Route"
 
-#: reviews/api/views.py:54 reviews/api/views.py:281 reviews/api/views.py:342
+#: reviews/api/views.py:55 reviews/api/views.py:284 reviews/api/views.py:345
 msgid "Start datum"
 msgstr "Start date review"
 
@@ -3357,7 +3367,7 @@ msgstr "Start date period:"
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
-#: reviews/menus.py:18 reviews/views.py:72
+#: reviews/menus.py:18 reviews/views.py:73
 msgid "Mijn openstaande besluiten"
 msgstr "My pending decisions"
 
@@ -3373,19 +3383,19 @@ msgstr "All pending decisions committee members"
 msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
-#: reviews/menus.py:36 reviews/views.py:229
+#: reviews/menus.py:36 reviews/views.py:230
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
-#: reviews/menus.py:41 reviews/views.py:241
+#: reviews/menus.py:41 reviews/views.py:242
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:46 reviews/views.py:253
+#: reviews/menus.py:46 reviews/views.py:254
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
-#: reviews/menus.py:51 reviews/views.py:275
+#: reviews/menus.py:51 reviews/views.py:280
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
@@ -4167,19 +4177,19 @@ msgstr ""
 "The application contains psychophysiological measurements on children under "
 "{} year(s) old."
 
-#: reviews/views.py:62
+#: reviews/views.py:63
 msgid "Mijn besluiten"
 msgstr "My results"
 
-#: reviews/views.py:84
+#: reviews/views.py:85
 msgid "Openstaande besluiten commissieleden"
 msgstr "Pending decisions committee members"
 
-#: reviews/views.py:202
+#: reviews/views.py:203
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
-#: reviews/views.py:570
+#: reviews/views.py:580
 msgid ""
 "Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer "
 "toevoegen/aanpassen"
@@ -5207,3 +5217,6 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:56
 msgid "Taak verwijderd"
 msgstr "Task deleted"
+
+#~ msgid "Andere betrokkenen"
+#~ msgstr "Other people involved"
diff --git a/proposals/migrations/0053_auto_20240201_1557.py b/proposals/migrations/0053_auto_20240201_1557.py
new file mode 100644
index 000000000..e7f4636c1
--- /dev/null
+++ b/proposals/migrations/0053_auto_20240201_1557.py
@@ -0,0 +1,27 @@
+# Generated by Django 3.2.23 on 2024-02-01 14:57
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("proposals", "0052_alter_proposal_studies_similar"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="proposal",
+            name="other_stakeholders",
+            field=models.BooleanField(
+                default=False,
+                verbose_name="Zijn er nog andere onderzoekers bij deze aanvraag betrokken die <strong>niet</strong> geaffilieerd zijn aan een van de onderzoeksinstituten van de Faculteit Geestwetenschappen van de UU? Zoja, vermeld diens naam en affiliatie.",
+            ),
+        ),
+        migrations.AlterField(
+            model_name="proposal",
+            name="stakeholders",
+            field=models.TextField(
+                blank=True, verbose_name="Naam en affiliatie van andere betrokkenen"
+            ),
+        ),
+    ]
diff --git a/proposals/models.py b/proposals/models.py
index 014acead1..c5de4c55b 100644
--- a/proposals/models.py
+++ b/proposals/models.py
@@ -242,14 +242,14 @@ class PracticeReasons(models.IntegerChoices):
                 "Zijn er nog andere onderzoekers bij deze aanvraag betrokken "
                 "die <strong>niet</strong> geaffilieerd zijn aan een van de "
                 "onderzoeksinstituten van de Faculteit Geestwetenschappen van de "
-                "UU? "
+                "UU? Zoja, vermeld diens naam en affiliatie."
             )
         ),  # Note: form labels with HTML are hard-coded in form Meta classes
         default=False,
     )
 
     stakeholders = models.TextField(
-        _("Andere betrokkenen"),
+        _("Naam en affiliatie van andere betrokkenen"),
         blank=True,
     )
 

From d9928ef8ce4434eaa57b5a6bec0c012f6525f45f Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 1 Feb 2024 16:39:53 +0100
Subject: [PATCH 132/148] bugfix for fetc_filter.py

---
 main/templatetags/fetc_filters.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/main/templatetags/fetc_filters.py b/main/templatetags/fetc_filters.py
index 45ae00e6a..99a4cd197 100644
--- a/main/templatetags/fetc_filters.py
+++ b/main/templatetags/fetc_filters.py
@@ -24,7 +24,7 @@ def in_linguistics_chamber(current_user):
     Check whether the current user is in the 'ETCL' or 'Secretaris' group
     """
     return is_in_groups(
-        current_user, [settings.LINGUISTICS_CHAMBER, settings.GROUP_SECRETARY]
+        current_user, [settings.GROUP_LINGUISTICS_CHAMBER, settings.GROUP_SECRETARY]
     )
 
 

From c81e46890c49a845c8a7f67f6ae1640ad13b2c8a Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 1 Feb 2024 16:44:17 +0100
Subject: [PATCH 133/148] fixes #592

---
 locale/en/LC_MESSAGES/django.po               | 69 ++++++++++---------
 .../templates/proposals/proposal_start.html   |  5 +-
 .../proposals/proposal_start_practice.html    |  5 +-
 3 files changed, 40 insertions(+), 39 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index c2bf8733f..423d8517e 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-01 15:58+0100\n"
+"POT-Creation-Date: 2024-02-01 16:42+0100\n"
 "PO-Revision-Date: 2024-01-17 10:48+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -2421,18 +2421,14 @@ msgstr "Register a new application"
 #: proposals/templates/proposals/proposal_start.html:25
 #: proposals/templates/proposals/proposal_start_practice.html:25
 msgid ""
-"Het reglement van de <a href=\"https://fetc-gw.wp.hum.uu.nl/reglement-"
-"algemene-kamer/\">Algemene Kamer (AK)</a> of dat van de <a href=\"https://"
-"fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/\">Linguïstiek Kamer (LK)</"
-"a>."
+"Het reglement van de <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-"
+"fetc-h/\">FEtC-H</a>."
 msgstr ""
-"The regulations of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-"
-"general-chamber-2/\" target=\"blank\">General Chamber</a> or those of the <a "
-"href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-linguistics-chamber/\" "
-"target=\"blank\">Linguistics Chamber</a>."
+"The regulations of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/\"  "
+"target=\"_blank\">FEtC-H </a>."
 
-#: proposals/templates/proposals/proposal_start.html:34
-#: proposals/templates/proposals/proposal_start_practice.html:34
+#: proposals/templates/proposals/proposal_start.html:31
+#: proposals/templates/proposals/proposal_start_practice.html:31
 msgid ""
 "Gebruik de juiste (meest recente) <a href=\"https://intranet.uu.nl/"
 "documenten-ethische-toetsingscommissie-gw\">voorbeelddocumenten</a> voor de "
@@ -2442,8 +2438,8 @@ msgstr ""
 "en/documents-ethics-assessment-committee-humanities\" "
 "target=\"_blank\">model documents</a> for <em>informed consent</em>."
 
-#: proposals/templates/proposals/proposal_start.html:39
-#: proposals/templates/proposals/proposal_start_practice.html:39
+#: proposals/templates/proposals/proposal_start.html:36
+#: proposals/templates/proposals/proposal_start_practice.html:36
 #: proposals/templates/proposals/study_consent.html:88
 msgid ""
 "Studenten moeten hun begeleider vragen om deze formulieren; dezelfde "
@@ -2455,8 +2451,8 @@ msgstr ""
 "fetc-gw.wp.hum.uu.nl/voorbeelddocumenten/\">this page</a>, though on non-"
 "official documents."
 
-#: proposals/templates/proposals/proposal_start.html:46
-#: proposals/templates/proposals/proposal_start_practice.html:46
+#: proposals/templates/proposals/proposal_start.html:43
+#: proposals/templates/proposals/proposal_start_practice.html:43
 #: proposals/templates/proposals/study_start.html:65
 msgid ""
 "Een voorstel is opgebouwd uit (van groot naar klein) (i) trajecten, (ii) "
@@ -2465,16 +2461,16 @@ msgstr ""
 "An application consists of (i) trajectories, (ii) sessions, and (iii) tasks, "
 "in descending order of subdivision. "
 
-#: proposals/templates/proposals/proposal_start.html:52
-#: proposals/templates/proposals/proposal_start_practice.html:52
+#: proposals/templates/proposals/proposal_start.html:49
+#: proposals/templates/proposals/proposal_start_practice.html:49
 #: proposals/templates/proposals/study_start.html:71
 #: proposals/utils/pdf_diff_logic.py:337
 #: reviews/templates/reviews/committee_members_workload.html:23
 msgid "Traject"
 msgstr "Trajectory"
 
-#: proposals/templates/proposals/proposal_start.html:53
-#: proposals/templates/proposals/proposal_start_practice.html:53
+#: proposals/templates/proposals/proposal_start.html:50
+#: proposals/templates/proposals/proposal_start_practice.html:50
 #: proposals/templates/proposals/study_start.html:72
 msgid ""
 "Als je met verschillende deelnemersgroepen werkt die een verschillend "
@@ -2485,8 +2481,8 @@ msgstr ""
 "not follow the same instructions during your research, they traverse "
 "different trajectories, and require separate informed consent documents. "
 
-#: proposals/templates/proposals/proposal_start.html:57
-#: proposals/templates/proposals/proposal_start_practice.html:57
+#: proposals/templates/proposals/proposal_start.html:54
+#: proposals/templates/proposals/proposal_start_practice.html:54
 #: proposals/templates/proposals/study_start.html:76
 msgid ""
 "<u>Bijvoorbeeld</u>: ouders van leerlingen 15 jaar en jonger, docenten, een "
@@ -2495,27 +2491,27 @@ msgstr ""
 "<u>For example</u>: parents of children up to 15 years of age, teachers, or "
 "an experimental and control group that receive significantly different tasks."
 
-#: proposals/templates/proposals/proposal_start.html:63
-#: proposals/templates/proposals/proposal_start_practice.html:63
+#: proposals/templates/proposals/proposal_start.html:60
+#: proposals/templates/proposals/proposal_start_practice.html:60
 #: proposals/templates/proposals/study_start.html:82
 msgid "Sessie"
 msgstr "Session"
 
-#: proposals/templates/proposals/proposal_start.html:64
-#: proposals/templates/proposals/proposal_start_practice.html:64
+#: proposals/templates/proposals/proposal_start.html:61
+#: proposals/templates/proposals/proposal_start_practice.html:61
 #: proposals/templates/proposals/study_start.html:83
 msgid "Alle taken/onderdelen die iemand op één dag uitvoert."
 msgstr ""
 "All tasks or procedures that a participant completes in a day combined. "
 
-#: proposals/templates/proposals/proposal_start.html:69
-#: proposals/templates/proposals/proposal_start_practice.html:69
+#: proposals/templates/proposals/proposal_start.html:66
+#: proposals/templates/proposals/proposal_start_practice.html:66
 #: proposals/templates/proposals/study_start.html:88
 msgid "Taak"
 msgstr "Task"
 
-#: proposals/templates/proposals/proposal_start.html:70
-#: proposals/templates/proposals/proposal_start_practice.html:70
+#: proposals/templates/proposals/proposal_start.html:67
+#: proposals/templates/proposals/proposal_start_practice.html:67
 #: proposals/templates/proposals/study_start.html:89
 msgid ""
 "Een taak of onderdeel van je onderzoek. <p> <u>Bijvoorbeeld</u>: het "
@@ -2524,7 +2520,7 @@ msgstr ""
 " A task or procedure within your study. <p> <u>For example</u>: completing "
 "an interview, questionnaire, or language test.</p>"
 
-#: proposals/templates/proposals/proposal_start.html:79
+#: proposals/templates/proposals/proposal_start.html:76
 #: proposals/templates/proposals/proposal_start_pre_approved.html:37
 #: proposals/templates/proposals/proposal_start_pre_assessment.html:43
 msgid "Volgende stap >>"
@@ -2535,7 +2531,7 @@ msgstr "Next step >>"
 msgid "Een nieuwe aanvraag aanmelden (oefenportaal)"
 msgstr "Register a new application (practice portal)"
 
-#: proposals/templates/proposals/proposal_start_practice.html:78
+#: proposals/templates/proposals/proposal_start_practice.html:75
 msgid "Houd er rekening mee dat een oefenaanvraag niet ingediend kan worden."
 msgstr ""
 "Please be advised that a practice application cannot be submitted to the "
@@ -5218,5 +5214,16 @@ msgstr "Task edited"
 msgid "Taak verwijderd"
 msgstr "Task deleted"
 
+#~ msgid ""
+#~ "Het reglement van de <a href=\"https://fetc-gw.wp.hum.uu.nl/reglement-"
+#~ "algemene-kamer/\">Algemene Kamer (AK)</a> of dat van de <a href=\"https://"
+#~ "fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/\">Linguïstiek Kamer "
+#~ "(LK)</a>."
+#~ msgstr ""
+#~ "The regulations of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/"
+#~ "regulations-general-chamber-2/\" target=\"blank\">General Chamber</a> or "
+#~ "those of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-"
+#~ "linguistics-chamber/\" target=\"blank\">Linguistics Chamber</a>."
+
 #~ msgid "Andere betrokkenen"
 #~ msgstr "Other people involved"
diff --git a/proposals/templates/proposals/proposal_start.html b/proposals/templates/proposals/proposal_start.html
index 3661002e5..13b2d9173 100644
--- a/proposals/templates/proposals/proposal_start.html
+++ b/proposals/templates/proposals/proposal_start.html
@@ -23,10 +23,7 @@ <h2>{% trans "Een nieuwe aanvraag aanmelden" %}</h2>
                         </li>
                         <li>
                             {% blocktrans trimmed %}
-                                Het reglement van de
-                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-algemene-kamer/">Algemene Kamer (AK)</a>
-                                of dat van de
-                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/">Linguïstiek Kamer (LK)</a>.
+                                Het reglement van de <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">FEtC-H</a>.
                             {% endblocktrans %}
                         </li>
                     </ul>
diff --git a/proposals/templates/proposals/proposal_start_practice.html b/proposals/templates/proposals/proposal_start_practice.html
index a1ccefd10..ed706ce88 100644
--- a/proposals/templates/proposals/proposal_start_practice.html
+++ b/proposals/templates/proposals/proposal_start_practice.html
@@ -23,10 +23,7 @@ <h2>{% trans "Een nieuwe aanvraag aanmelden (oefenportaal)" %}</h2>
                         </li>
                         <li>
                             {% blocktrans trimmed %}
-                                Het reglement van de
-                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-algemene-kamer/">Algemene Kamer (AK)</a>
-                                of dat van de
-                                <a href="https://fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/">Linguïstiek Kamer (LK)</a>.
+                            Het reglement van de <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">FEtC-H</a>.
                             {% endblocktrans %}
                         </li>
                     </ul>

From 770f6666b863f82ee933ab9d480fbb46a12a0651 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 1 Feb 2024 17:06:16 +0100
Subject: [PATCH 134/148] formatting

---
 fetc/saml_settings.example.py                              | 1 +
 fetc/settings.py                                           | 1 +
 fetc/urls.py                                               | 1 +
 proposals/templates/proposals/proposal_start_practice.html | 2 +-
 proposals/utils/validate_proposal.py                       | 1 +
 reviews/menus.py                                           | 1 +
 6 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/fetc/saml_settings.example.py b/fetc/saml_settings.example.py
index e714b03b6..5ee23de12 100644
--- a/fetc/saml_settings.example.py
+++ b/fetc/saml_settings.example.py
@@ -16,6 +16,7 @@
 consult the CDH Federated Authentication docs:
 https://centrefordigitalhumanities.github.io/Federated-Authentication-Docs/
 """
+
 import os
 
 # Import all default SAML settings from the library, we override some later
diff --git a/fetc/settings.py b/fetc/settings.py
index e8403fc27..6b753f47e 100644
--- a/fetc/settings.py
+++ b/fetc/settings.py
@@ -9,6 +9,7 @@
 For the full list of settings and their values, see
 https://docs.djangoproject.com/en/1.8/ref/settings/
 """
+
 import os
 
 from django.core.exceptions import ImproperlyConfigured
diff --git a/fetc/urls.py b/fetc/urls.py
index 6f37f877f..3e2ef8418 100644
--- a/fetc/urls.py
+++ b/fetc/urls.py
@@ -4,6 +4,7 @@
 The `urlpatterns` list routes URLs to views. For more information please see:
     https://docs.djangoproject.com/en/1.8/topics/http/urls/
 """
+
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
diff --git a/proposals/templates/proposals/proposal_start_practice.html b/proposals/templates/proposals/proposal_start_practice.html
index ed706ce88..53b59ccb7 100644
--- a/proposals/templates/proposals/proposal_start_practice.html
+++ b/proposals/templates/proposals/proposal_start_practice.html
@@ -23,7 +23,7 @@ <h2>{% trans "Een nieuwe aanvraag aanmelden (oefenportaal)" %}</h2>
                         </li>
                         <li>
                             {% blocktrans trimmed %}
-                            Het reglement van de <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">FEtC-H</a>.
+                                Het reglement van de <a href="https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/">FEtC-H</a>.
                             {% endblocktrans %}
                         </li>
                     </ul>
diff --git a/proposals/utils/validate_proposal.py b/proposals/utils/validate_proposal.py
index 59ea7a032..4611a15ea 100644
--- a/proposals/utils/validate_proposal.py
+++ b/proposals/utils/validate_proposal.py
@@ -4,6 +4,7 @@
 
 Used for the submit page, to check if a user has completed the proposal.
 """
+
 from collections import OrderedDict
 
 from braces.forms import UserKwargModelFormMixin
diff --git a/reviews/menus.py b/reviews/menus.py
index 03e5f0a00..f02ea99f6 100644
--- a/reviews/menus.py
+++ b/reviews/menus.py
@@ -11,6 +11,7 @@
     is_po_chair_or_secretary,
 )
 
+
 def create_committee_menu(commitee: str) -> List[MenuItem]:
 
     return [

From fc7c1202927e943cc440e132b6d7ad609d9f30fe Mon Sep 17 00:00:00 2001
From: Michael Villeneuve <m.l.villeneuve@uu.nl>
Date: Mon, 19 Feb 2024 15:13:30 +0100
Subject: [PATCH 135/148] Give privileged groups archive access regardless of
 Humanities affiliation (#609)

* feat: New utility function to test archive access

* feat: FacultyRequiredMixin now uses UserPassesTestMixin

* feat: New access mixin for archive access

* feat: menus.py now uses new archive access test

* style: run Black on everything

* fix: Don't unnecessarily inherit from HumanitiesRequiredMixin

* fix: Use provided constants to refer to group names
---
 main/utils.py                     | 25 +++++++++++++++++++++++++
 main/views.py                     | 27 ++++++++++++++++-----------
 proposals/menus.py                |  8 ++++----
 proposals/views/proposal_views.py |  4 ++--
 4 files changed, 47 insertions(+), 17 deletions(-)

diff --git a/main/utils.py b/main/utils.py
index ba6135180..d03c1bda9 100644
--- a/main/utils.py
+++ b/main/utils.py
@@ -11,6 +11,7 @@
 from docx2txt import docx2txt
 
 from main.models import Faculty
+from fetc import constants
 
 YES_NO = [(True, _("ja")), (False, _("nee"))]
 
@@ -137,3 +138,27 @@ def is_member_of_faculty(user, faculty):
 
 def is_member_of_humanities(user):
     return is_member_of_faculty(user, Faculty.InternalNames.HUMANITIES)
+
+
+def can_view_archive(user):
+    if not user.is_authenticated:
+        return False
+    if user.is_superuser:
+        return True
+    privileged_groups = [
+        constants.GROUP_CHAIR,
+        constants.GROUP_GENERAL_CHAMBER,
+        constants.GROUP_LINGUISTICS_CHAMBER,
+        constants.GROUP_SECRETARY,
+        constants.GROUP_PRIMARY_SECRETARY,
+    ]
+    user_groups = user.groups.values_list(
+        "name",
+        flat=True,
+    )
+    for group in user_groups:
+        if group in privileged_groups:
+            return True
+    # If our tests are inconclusive,
+    # check for Humanities affiliation
+    return is_member_of_humanities(user)
diff --git a/main/views.py b/main/views.py
index 20fe39a7e..488060f9b 100644
--- a/main/views.py
+++ b/main/views.py
@@ -4,7 +4,7 @@
 import ldap
 import os
 
-from braces.views import LoginRequiredMixin, GroupRequiredMixin
+from braces.views import LoginRequiredMixin, GroupRequiredMixin, UserPassesTestMixin
 from django.apps import apps
 from django.conf import settings
 from django.contrib import messages
@@ -31,7 +31,7 @@
 
 from interventions.models import Intervention
 from main.models import Faculty, SystemMessage
-from main.utils import is_member_of_humanities
+from main.utils import is_member_of_humanities, can_view_archive
 from observations.models import Observation
 from proposals.models import Proposal
 from reviews.models import Review
@@ -290,7 +290,7 @@ def form_invalid(self, form):
             return super(AllowErrorsOnBackbuttonMixin, self).form_invalid(form)
 
 
-class FacultyRequiredMixin:
+class FacultyRequiredMixin(UserPassesTestMixin):
     """A clone of GroupRequiredMixin, but checking faculties instead"""
 
     faculty_required = None
@@ -315,22 +315,27 @@ def check_membership(self, faculty):
         )
         return set(faculty).intersection(set(user_faculties))
 
-    def dispatch(self, request, *args, **kwargs):
-        self.request = request
+    def test_func(self, user):
         in_faculty = False
-        if request.user.is_authenticated:
+        if user.is_authenticated:
             in_faculty = self.check_membership(self.get_faculty_required())
-
-        if not in_faculty:
-            return self.handle_no_permission(request)
-
-        return super().dispatch(request, *args, **kwargs)
+        return in_faculty
 
 
 class HumanitiesRequiredMixin(FacultyRequiredMixin):
     faculty_required = Faculty.InternalNames.HUMANITIES
 
 
+class HumanitiesOrPrivilegeRequiredMixin(UserPassesTestMixin):
+    """
+    Checks for Humanities faculty affiliation, but also lets in users belonging
+    to a privileged set of groups.
+    """
+
+    def test_func(self, user):
+        return can_view_archive(user)
+
+
 class UserAllowedMixin(SingleObjectMixin):
     def get_object(self, queryset=None):
         """
diff --git a/proposals/menus.py b/proposals/menus.py
index f62a0aeb9..537923484 100644
--- a/proposals/menus.py
+++ b/proposals/menus.py
@@ -2,7 +2,7 @@
 from django.utils.translation import gettext_lazy as _
 from menu import Menu, MenuItem
 
-from main.utils import is_member_of_humanities, is_secretary
+from main.utils import is_secretary, can_view_archive
 
 new_proposal_menu = (
     MenuItem(
@@ -91,12 +91,12 @@
     MenuItem(
         _("Bekijk alle goedgekeurde aanvragen van de Algemene Kamer"),
         reverse("proposals:archive", args=["AK"]),
-        check=lambda x: is_member_of_humanities(x.user),
+        check=lambda x: can_view_archive(x.user),
     ),
     MenuItem(
         _("Bekijk alle goedgekeurde aanvragen van de Linguïstiek Kamer"),
         reverse("proposals:archive", args=["LK"]),
-        check=lambda x: is_member_of_humanities(x.user),
+        check=lambda x: can_view_archive(x.user),
     ),
     MenuItem(
         _("Site-export"),
@@ -113,6 +113,6 @@
         "#",
         slug="archive",  # needed for sub-menu!
         children=archive_menu,
-        check=lambda x: x.user.is_authenticated and is_member_of_humanities(x.user),
+        check=lambda x: can_view_archive(x.user),
     ),
 )
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 503a39fd8..93fc54440 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -20,7 +20,7 @@
     AllowErrorsOnBackbuttonMixin,
     CreateView,
     DeleteView,
-    HumanitiesRequiredMixin,
+    HumanitiesOrPrivilegeRequiredMixin,
     UpdateView,
     UserAllowedMixin,
 )
@@ -171,7 +171,7 @@ def get_context_data(self, **kwargs):
 
 
 class ProposalUsersOnlyArchiveView(
-    HumanitiesRequiredMixin, CommitteeMixin, BaseProposalsView
+    HumanitiesOrPrivilegeRequiredMixin, CommitteeMixin, BaseProposalsView
 ):
     template_name = "proposals/proposal_private_archive.html"
 

From a0ab0668a02157156bd0e1e3d884f019298dd32a Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Tue, 20 Feb 2024 17:02:52 +0100
Subject: [PATCH 136/148] fix: redirect supervisor to the right update page

---
 reviews/templates/reviews/decision_form.html |  1 -
 reviews/views.py                             | 20 ++++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/reviews/templates/reviews/decision_form.html b/reviews/templates/reviews/decision_form.html
index d565f4307..0f0d8b9ff 100644
--- a/reviews/templates/reviews/decision_form.html
+++ b/reviews/templates/reviews/decision_form.html
@@ -16,7 +16,6 @@
             <h2>{% trans "Aanvraag beoordelen" %}</h2>
             {% with proposal=decision.review.proposal %}
                 {% url 'proposals:pdf' proposal.id as pdf_url %}
-                {% url 'proposals:update' proposal.id as update_url %}
                 {% if user != proposal.supervisor %}
                     <p>
                         {% blocktrans trimmed with title=proposal.title refnum=proposal.reference_number chamber=proposal.reviewing_committee %}
diff --git a/reviews/views.py b/reviews/views.py
index 5ec8e407f..7e903eb8c 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -547,6 +547,26 @@ class DecisionUpdateView(
     model = Decision
     form_class = DecisionForm
 
+    def get_context_data(self, **kwargs):
+        context = super().get_context_data(**kwargs)
+
+        # Supervisors get the chance to update the proposal, but we have
+        # multiple update views for different types of proposals.
+        if self.object.review.proposal.is_pre_approved:
+            context["update_url"] = reverse(
+                "proposals:update_pre_approved", args=[self.object.review.proposal.pk]
+            )
+        elif self.object.review.proposal.is_pre_assessment:
+            context["update_url"] = reverse(
+                "proposals:update_pre", args=[self.object.review.proposal.pk]
+            )
+        else:
+            context["update_url"] = reverse(
+                "proposals:update", args=[self.object.review.proposal.pk]
+            )
+
+        return context
+
     def get_success_url(self):
         obj = self.get_object()
         if obj.review.is_committee_review:

From 34e61cafb34aa2ed0f6e487b4eb50a2275a2643a Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Wed, 28 Feb 2024 18:16:58 +0100
Subject: [PATCH 137/148] fix: fix broken tests due to invalid fixture names

---
 proposals/tests/misc_tests.py                | 2 +-
 proposals/tests/proposal_submission_tests.py | 4 ++--
 reviews/tests.py                             | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/proposals/tests/misc_tests.py b/proposals/tests/misc_tests.py
index 4498f9dcd..0d8c57677 100644
--- a/proposals/tests/misc_tests.py
+++ b/proposals/tests/misc_tests.py
@@ -26,7 +26,7 @@ class MiscProposalTestCase(TestCase):
         "compensations",
         "recruitments",
         "settings",
-        "registrations",
+        "00_registrations",
         "groups",
         "institutions",
     ]
diff --git a/proposals/tests/proposal_submission_tests.py b/proposals/tests/proposal_submission_tests.py
index 999c33f14..7ea5d426a 100644
--- a/proposals/tests/proposal_submission_tests.py
+++ b/proposals/tests/proposal_submission_tests.py
@@ -28,8 +28,8 @@ class BaseProposalTestCase(TestCase):
         "recruitments",
         "specialdetails",
         "traits",
-        "registrationkinds",
-        "registrations",
+        "00_registrations",
+        "01_registrationkinds",
         "testing/test_users",
         "testing/test_proposals",
     ]
diff --git a/reviews/tests.py b/reviews/tests.py
index e4b685cfc..6942333ed 100644
--- a/reviews/tests.py
+++ b/reviews/tests.py
@@ -30,8 +30,8 @@ class BaseReviewTestCase(TestCase):
     fixtures = [
         "relations",
         "compensations",
-        "registrations",
-        "registrationkinds",
+        "00_registrations",
+        "01_registrationkinds",
         "agegroups",
         "groups",
         "institutions",

From 35373161debd3f686ae62ccde3bf8e5187f15d39 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Wed, 28 Feb 2024 18:21:35 +0100
Subject: [PATCH 138/148] refactor: remove unknown-font-weight warnings

Turns out our PDF generator has a pretty strange CSS parser that does not allow `font-weight: 400` (as 400 is the default).
---
 proposals/templates/proposals/proposal_pdf.html | 2 --
 1 file changed, 2 deletions(-)

diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 3239d54d2..423850555 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -11,7 +11,6 @@
         @font-face {
             font-family: "Open Sans";
             src: url('proposals/static/proposals/pdf_font/OpenSans-Regular.ttf');
-            font-weight: 400;
         }
 
         @font-face {
@@ -23,7 +22,6 @@
         @font-face {
             font-family: "Open Sans";
             src: url('proposals/static/proposals/pdf_font/OpenSans-Italic.ttf');
-            font-weight: 400;
             font-style: italic;
         }
 

From 344e96003e9267d87098543290d5efe851fe6713 Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Wed, 28 Feb 2024 18:27:42 +0100
Subject: [PATCH 139/148] fix: disable PDF warnings durings tests

---
 proposals/tests/proposal_submission_tests.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/proposals/tests/proposal_submission_tests.py b/proposals/tests/proposal_submission_tests.py
index 7ea5d426a..40a215baa 100644
--- a/proposals/tests/proposal_submission_tests.py
+++ b/proposals/tests/proposal_submission_tests.py
@@ -1,7 +1,8 @@
+import logging
+
 from django.contrib.auth.models import User, Group, AnonymousUser
 from django.conf import settings
 from django.test import TestCase
-from django.core.management import call_command
 
 from main.tests import BaseViewTestCase
 from proposals.models import Proposal, Relation
@@ -38,6 +39,11 @@ def setUp(self):
         self.setup_users()
         self.setup_proposal()
 
+        # Disable logging warnings and all levels below
+        # Our (pdf) code logs warnings that are not relevant to the tests
+        # ERROR and CRITICAL are still logged
+        logging.disable(logging.WARN)
+
     def setup_users(self):
         self.secretary = User.objects.create_user(
             "secretary",

From 70f988a44fddf096f44ad40b3f1732b6e85f5e4f Mon Sep 17 00:00:00 2001
From: "Mees, T.D. (Ty)" <t.d.mees@uu.nl>
Date: Thu, 1 Feb 2024 16:44:24 +0100
Subject: [PATCH 140/148] fix: prevent submission on back actions

---
 proposals/views/proposal_views.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 93fc54440..23afcada4 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -481,7 +481,8 @@ def form_valid(self, form):
         # Checks for practice proposals and starting the right
         # kind of review happen over there.
         proposal = form.instance
-        start_review(proposal)
+        if 'save_back' not in self.request.POST and 'js-redirect-submit' not in self.request.POST:
+            start_review(proposal)
         return success_response
 
     def get_next_url(self):

From 5c40fcc2e3722bf1aacaafd996465b749fd33512 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Mar 2024 14:55:21 +0100
Subject: [PATCH 141/148] Merge acception

---
 .../templates/proposals/proposal_pdf.html     |  1 +
 proposals/views/proposal_views.py             | 10 +++
 requirements.txt                              | 86 ++++++++-----------
 reviews/views.py                              |  2 +-
 studies/views/study_views.py                  | 10 +++
 5 files changed, 56 insertions(+), 53 deletions(-)

diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index 423850555..bc827c3a7 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -76,6 +76,7 @@
             margin-top: 2rem;
             font-size: 150%;
         }
+        
     </style>
 {% endblock %}
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index 23afcada4..7d3452927 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -401,6 +401,16 @@ class ProposalUpdateDataManagement(GroupRequiredMixin, generic.UpdateView):
     form_class = ProposalUpdateDataManagementForm
     group_required = settings.GROUP_SECRETARY
 
+    def form_valid(self, form):
+        ret = super().form_valid(form)
+        # Always regenerate the PDF after updating the DMP
+        # This is necessary, as the canonical PDF protection might already
+        # have kicked in if the secretary changes the documents later than
+        # we initially expected.
+        self.object.generate_pdf(force_overwrite=True)
+
+        return ret
+
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
         return reverse("reviews:detail", args=[self.object.latest_review().pk])
diff --git a/requirements.txt b/requirements.txt
index a3d537aa8..1a6272a9f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,8 +1,8 @@
 #
-# This file is autogenerated by pip-compile with Python 3.9
+# This file is autogenerated by pip-compile with Python 3.10
 # by the following command:
 #
-#    pip-compile --resolver=backtracking
+#    pip-compile requirements.in
 #
 -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt
     # via -r requirements.in
@@ -21,15 +21,15 @@ asn1crypto==1.5.1
     #   pyhanko-certvalidator
 babel==2.14.0
     # via sphinx
-black==23.12.1
+black==24.2.0
     # via -r requirements.in
 blessed==1.20.0
     # via curtsies
 bpython==0.24
     # via -r requirements.in
-cdh-django-core @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0
+cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0
     # via -r requirements.in
-certifi==2023.11.17
+certifi==2024.2.2
     # via requests
 cffi==1.16.0
     # via cryptography
@@ -46,13 +46,13 @@ closure==20191111
     # via uil-django-core
 colorama==0.4.6
     # via djlint
-cryptography==41.0.7
+cryptography==42.0.5
     # via
     #   pyhanko
     #   pyhanko-certvalidator
     #   pyopenssl
     #   pysaml2
-cssbeautifier==1.14.11
+cssbeautifier==1.15.1
     # via djlint
 cssselect2==0.7.0
     # via svglib
@@ -68,7 +68,7 @@ defusedxml==0.7.1
     #   pysaml2
 deprecated==1.2.14
     # via cdh-django-core
-django==3.2.23
+django==3.2.25
     # via
     #   -r requirements.in
     #   cdh-django-core
@@ -87,7 +87,7 @@ django-auth-ldap==4.6.0
     # via -r requirements.in
 django-braces==1.15.0
     # via -r requirements.in
-django-debug-toolbar==4.2.0
+django-debug-toolbar==4.3.0
     # via -r requirements.in
 django-extensions==3.2.3
     # via -r requirements.in
@@ -113,16 +113,12 @@ docutils==0.20.1
     # via
     #   sphinx
     #   sphinx-rtd-theme
-editorconfig==0.12.3
+editorconfig==0.12.4
     # via
     #   cssbeautifier
     #   jsbeautifier
-elementpath==4.1.5
+elementpath==4.4.0
     # via xmlschema
-freetype-py==2.3.0
-    # via
-    #   reportlab
-    #   rlpycairo
 greenlet==3.0.3
     # via bpython
 html-tag-names==0.1.2
@@ -137,21 +133,19 @@ idna==3.6
     # via requests
 imagesize==1.4.1
     # via sphinx
-importlib-metadata==7.0.1
-    # via sphinx
 jinja2==3.1.3
     # via sphinx
-jsbeautifier==1.14.11
+jsbeautifier==1.15.1
     # via
     #   cssbeautifier
     #   djlint
-json5==0.9.14
+json5==0.9.22
     # via djlint
 lesscpy==0.15.1
     # via uil-django-core
 lxml==5.1.0
     # via svglib
-markupsafe==2.1.3
+markupsafe==2.1.5
     # via jinja2
 mypy-extensions==1.0.0
     # via black
@@ -159,7 +153,7 @@ mysqlclient==1.4.6
     # via -r requirements.in
 oscrypto==1.3.0
     # via pyhanko-certvalidator
-packaging==23.2
+packaging==24.0
     # via
     #   black
     #   sphinx
@@ -176,7 +170,7 @@ pillow==10.2.0
     #   -r requirements.in
     #   reportlab
     #   xhtml2pdf
-platformdirs==4.1.0
+platformdirs==4.2.0
     # via black
 ply==3.11
     # via lesscpy
@@ -190,8 +184,6 @@ pyasn1==0.5.1
     #   python-ldap
 pyasn1-modules==0.3.0
     # via python-ldap
-pycairo==1.25.1
-    # via rlpycairo
 pycparser==2.21
     # via cffi
 pygments==2.17.2
@@ -199,7 +191,7 @@ pygments==2.17.2
     #   -r requirements.in
     #   bpython
     #   sphinx
-pyhanko==0.21.0
+pyhanko==0.23.0
     # via xhtml2pdf
 pyhanko-certvalidator==0.26.3
     # via
@@ -207,25 +199,25 @@ pyhanko-certvalidator==0.26.3
     #   xhtml2pdf
 pyjwt==2.8.0
     # via uil-django-core
-pyopenssl==23.3.0
+pyopenssl==24.1.0
     # via pysaml2
-pypdf==3.17.4
+pypdf==4.1.0
     # via xhtml2pdf
 pypng==0.20220715.0
     # via qrcode
-pysaml2==7.4.2
+pysaml2==7.5.0
     # via djangosaml2
 pyscss==1.4.0
     # via uil-django-core
 python-bidi==0.4.2
     # via xhtml2pdf
-python-dateutil==2.8.2
+python-dateutil==2.9.0.post0
     # via pysaml2
 python-ldap==3.4.4
     # via django-auth-ldap
 python-magic==0.4.27
     # via -r requirements.in
-pytz==2023.3.post1
+pytz==2024.1
     # via
     #   django
     #   djangorestframework
@@ -240,7 +232,7 @@ qrcode==7.4.2
     # via pyhanko
 regex==2023.12.25
     # via djlint
-reportlab[pycairo]==4.0.9
+reportlab==4.0.9
     # via
     #   svglib
     #   xhtml2pdf
@@ -253,8 +245,6 @@ requests==2.31.0
     #   pysaml2
     #   sphinx
     #   uil-django-core
-rlpycairo==0.3.0
-    # via reportlab
 six==1.16.0
     # via
     #   blessed
@@ -271,32 +261,27 @@ sphinx==7.2.6
     #   -r requirements.in
     #   sphinx-rtd-theme
     #   sphinxcontrib-apidoc
-    #   sphinxcontrib-applehelp
-    #   sphinxcontrib-devhelp
     #   sphinxcontrib-django
-    #   sphinxcontrib-htmlhelp
     #   sphinxcontrib-jquery
-    #   sphinxcontrib-qthelp
-    #   sphinxcontrib-serializinghtml
 sphinx-rtd-theme==2.0.0
     # via -r requirements.in
-sphinxcontrib-apidoc==0.4.0
+sphinxcontrib-apidoc==0.5.0
     # via -r requirements.in
-sphinxcontrib-applehelp==1.0.7
+sphinxcontrib-applehelp==1.0.8
     # via sphinx
-sphinxcontrib-devhelp==1.0.5
+sphinxcontrib-devhelp==1.0.6
     # via sphinx
 sphinxcontrib-django==2.5
     # via -r requirements.in
-sphinxcontrib-htmlhelp==2.0.4
+sphinxcontrib-htmlhelp==2.0.5
     # via sphinx
 sphinxcontrib-jquery==4.1
     # via sphinx-rtd-theme
 sphinxcontrib-jsmath==1.0.1
     # via sphinx
-sphinxcontrib-qthelp==1.0.6
+sphinxcontrib-qthelp==1.0.7
     # via sphinx
-sphinxcontrib-serializinghtml==1.1.9
+sphinxcontrib-serializinghtml==1.1.10
     # via sphinx
 sqlparse==0.4.4
     # via
@@ -312,14 +297,13 @@ tomli==2.0.1
     # via
     #   black
     #   djlint
-tqdm==4.66.1
+tqdm==4.66.2
     # via djlint
-typing-extensions==4.9.0
+typing-extensions==4.10.0
     # via
     #   asgiref
     #   black
     #   django-modeltranslation
-    #   pypdf
     #   qrcode
 tzlocal==5.2
     # via pyhanko
@@ -327,7 +311,7 @@ ua-parser==0.18.0
     # via user-agents
 uritools==4.0.2
     # via pyhanko-certvalidator
-urllib3==2.1.0
+urllib3==2.2.1
     # via requests
 user-agents==2.2.0
     # via django-user-agents
@@ -342,9 +326,7 @@ webencodings==0.5.1
     #   tinycss2
 wrapt==1.16.0
     # via deprecated
-xhtml2pdf==0.2.13
+xhtml2pdf==0.2.15
     # via -r requirements.in
-xmlschema==3.0.1
+xmlschema==2.5.1
     # via pysaml2
-zipp==3.17.0
-    # via importlib-metadata
diff --git a/reviews/views.py b/reviews/views.py
index 7e903eb8c..bbe716f2e 100644
--- a/reviews/views.py
+++ b/reviews/views.py
@@ -187,7 +187,7 @@ def get_review_counts_last_year(self):
                 "decision",
                 filter=base_filter & Q(decision__review__proposal__is_revision=True),
             ),
-        )
+        ).exclude(total=0)
 
 
 class SupervisorDecisionOpenView(BaseDecisionListView):
diff --git a/studies/views/study_views.py b/studies/views/study_views.py
index 079580752..38e100737 100644
--- a/studies/views/study_views.py
+++ b/studies/views/study_views.py
@@ -169,6 +169,16 @@ class StudyUpdateAttachments(braces.GroupRequiredMixin, generic.UpdateView):
     form_class = StudyUpdateAttachmentsForm
     group_required = settings.GROUP_SECRETARY
 
+    def form_valid(self, form):
+        ret = super().form_valid(form)
+        # Always regenerate the PDF after updating any study documents
+        # This is necessary, as the canonical PDF protection might already
+        # have kicked in if the secretary changes the documents later than
+        # we initially expected.
+        self.object.proposal.generate_pdf(force_overwrite=True)
+
+        return ret
+
     def get_success_url(self):
         """Continue to the URL specified in the 'next' POST parameter"""
         return self.request.POST.get("next", "/")

From 5232285c4c5393d1791c8a6c7ed547a937fb33e0 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 12 Mar 2024 15:32:01 +0100
Subject: [PATCH 142/148] formatting after merge conflict solving

---
 proposals/templates/proposals/proposal_pdf.html | 1 -
 proposals/views/proposal_views.py               | 5 ++++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html
index bc827c3a7..423850555 100644
--- a/proposals/templates/proposals/proposal_pdf.html
+++ b/proposals/templates/proposals/proposal_pdf.html
@@ -76,7 +76,6 @@
             margin-top: 2rem;
             font-size: 150%;
         }
-        
     </style>
 {% endblock %}
 
diff --git a/proposals/views/proposal_views.py b/proposals/views/proposal_views.py
index abc5b4cf5..141e94095 100644
--- a/proposals/views/proposal_views.py
+++ b/proposals/views/proposal_views.py
@@ -501,7 +501,10 @@ def form_valid(self, form):
         # Checks for practice proposals and starting the right
         # kind of review happen over there.
         proposal = form.instance
-        if 'save_back' not in self.request.POST and 'js-redirect-submit' not in self.request.POST:
+        if (
+            "save_back" not in self.request.POST
+            and "js-redirect-submit" not in self.request.POST
+        ):
             start_review(proposal)
         return success_response
 

From ba3fdaacff71e2bf50f8012e95823e14ace0bb29 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Mar 2024 10:05:41 +0100
Subject: [PATCH 143/148] fix: correct 'start of proposal' redirect for
 pre_approved

---
 main/templates/base/form_buttons.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/main/templates/base/form_buttons.html b/main/templates/base/form_buttons.html
index a3dd2e285..14b23b6ef 100644
--- a/main/templates/base/form_buttons.html
+++ b/main/templates/base/form_buttons.html
@@ -11,6 +11,9 @@
                 {% if proposal.is_pre_assessment %}
                     <a class="button js-submit-redirect"
                        href="{% url 'proposals:update_pre' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
+                {% elif proposal.is_pre_approved %}
+                       <a class="button js-submit-redirect"
+                          href="{% url 'proposals:update_pre_approved' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
                 {% elif proposal.is_practice %}
                     <a class="button js-submit-redirect"
                        href="{% url 'proposals:update_practice' proposal.pk %}">

From a98e3c12bc62cf500e779068d0e3665a814c43d6 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Mar 2024 11:59:24 +0100
Subject: [PATCH 144/148] fix: improve buttons on proposal_confirmation.html

---
 locale/en/LC_MESSAGES/django.po               | 132 +++++++++---------
 .../proposals/proposal_confirmation.html      |   4 +-
 2 files changed, 70 insertions(+), 66 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index 423d8517e..e9dc08b76 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-02-01 16:42+0100\n"
+"POT-Creation-Date: 2024-03-14 11:57+0100\n"
 "PO-Revision-Date: 2024-01-17 10:48+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -63,11 +63,11 @@ msgstr "FAQ"
 msgid "Frequently Asked Questions"
 msgstr "Frequently Asked Questions"
 
-#: fetc/settings.py:128
+#: fetc/settings.py:129
 msgid "Nederlands"
 msgstr "Dutch"
 
-#: fetc/settings.py:129
+#: fetc/settings.py:130
 msgid "Engels"
 msgstr "English"
 
@@ -204,11 +204,11 @@ msgstr "Log in"
 msgid "Log uit"
 msgstr "Log out"
 
-#: main/models.py:8 main/utils.py:15 proposals/utils/pdf_diff_logic.py:244
+#: main/models.py:8 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244
 msgid "ja"
 msgstr "yes"
 
-#: main/models.py:9 main/utils.py:15 proposals/utils/pdf_diff_logic.py:244
+#: main/models.py:9 main/utils.py:16 proposals/utils/pdf_diff_logic.py:244
 msgid "nee"
 msgstr "no"
 
@@ -261,7 +261,7 @@ msgid "Gebruiksersnaam"
 msgstr "Username"
 
 #: main/templates/auth/user_detail.html:21
-#: proposals/templates/proposals/proposal_pdf.html:117
+#: proposals/templates/proposals/proposal_pdf.html:115
 msgid "E-mail"
 msgstr "E-mail"
 
@@ -375,7 +375,6 @@ msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
 #: main/templates/auth/user_detail.html:97
-#: proposals/templates/proposals/proposal_confirmation.html:38
 #: reviews/templates/reviews/vue_templates/decision_list.html:90
 #: reviews/templates/reviews/vue_templates/review_list.html:83
 msgid "Bevestigingsbrief verstuurd"
@@ -386,20 +385,21 @@ msgid "<< Opslaan en vorige stap"
 msgstr "<< Save and go back to previous step"
 
 #: main/templates/base/form_buttons.html:13
-#: main/templates/base/form_buttons.html:17
-#: main/templates/base/form_buttons.html:21
+#: main/templates/base/form_buttons.html:16
+#: main/templates/base/form_buttons.html:20
+#: main/templates/base/form_buttons.html:24
 msgid "Terug naar begin aanvraag"
 msgstr "Return to start of application"
 
-#: main/templates/base/form_buttons.html:26
+#: main/templates/base/form_buttons.html:29
 msgid "Terug naar begin traject"
 msgstr "Back to the beginning of the trajectory"
 
-#: main/templates/base/form_buttons.html:30
+#: main/templates/base/form_buttons.html:33
 msgid "Terug naar begin sessie"
 msgstr "Back to the beginning of the session"
 
-#: main/templates/base/form_buttons.html:34
+#: main/templates/base/form_buttons.html:37
 msgid "Opslaan en volgende stap >>"
 msgstr "Save and go to next step >>"
 
@@ -1051,12 +1051,12 @@ msgstr ""
 "%(title)s(reference number <em>%(ref_number)s</em>), trajectory %(order)s."
 
 #: observations/templates/observations/observation_update_attachments.html:43
-#: proposals/templates/proposals/proposal_confirmation.html:39
+#: proposals/templates/proposals/proposal_confirmation.html:36
 #: proposals/templates/proposals/proposal_diff.html:55
 #: proposals/templates/proposals/proposal_update_attachments.html:30
 #: proposals/templates/proposals/proposal_update_date_start.html:33
 #: reviews/templates/reviews/change_chamber_form.html:23
-#: reviews/templates/reviews/decision_form.html:93
+#: reviews/templates/reviews/decision_form.html:92
 #: reviews/templates/reviews/review_assign_form.html:46
 #: reviews/templates/reviews/review_close_form.html:40
 #: reviews/templates/reviews/review_discontinue_form.html:70
@@ -1922,6 +1922,10 @@ msgstr ""
 "Please state when the confirmation letter for <em>%(title)s</em> has been "
 "sent here. "
 
+#: proposals/templates/proposals/proposal_confirmation.html:39
+msgid "Verstuur bevestigingsbrief"
+msgstr "Send confirmation"
+
 #: proposals/templates/proposals/proposal_copy.html:8
 #: proposals/templates/proposals/proposal_copy.html:22
 msgid "Revisie starten"
@@ -2200,10 +2204,10 @@ msgstr ""
 #: proposals/templates/proposals/proposal_form_pre_approved.html:7
 #: proposals/templates/proposals/proposal_form_pre_approved.html:83
 #: proposals/utils/pdf_diff_logic.py:428 proposals/utils/proposal_utils.py:47
-#: proposals/utils/proposal_utils.py:68 proposals/utils/validate_proposal.py:40
-#: proposals/utils/validate_proposal.py:50
-#: proposals/utils/validate_proposal.py:57
-#: proposals/utils/validate_proposal.py:64
+#: proposals/utils/proposal_utils.py:68 proposals/utils/validate_proposal.py:41
+#: proposals/utils/validate_proposal.py:51
+#: proposals/utils/validate_proposal.py:58
+#: proposals/utils/validate_proposal.py:65
 msgid "Algemene informatie over de aanvraag"
 msgstr "General information about the application"
 
@@ -2352,7 +2356,7 @@ msgstr ""
 "Click <img src=\"%(img_add)s\" title=\"add\"> to submit an application to "
 "the archive."
 
-#: proposals/templates/proposals/proposal_pdf.html:86
+#: proposals/templates/proposals/proposal_pdf.html:84
 #, python-format
 msgid ""
 "FETC-GW - <em>%(title)s</em> (referentienummer %(reviewing_committee)s-"
@@ -2361,25 +2365,25 @@ msgstr ""
 "FEtC-H - <em>%(title)s</em> (reference number %(reviewing_committee)s-"
 "%(reference_number)s, submitted by %(submitter)s)"
 
-#: proposals/templates/proposals/proposal_pdf.html:92
+#: proposals/templates/proposals/proposal_pdf.html:90
 #, python-format
 msgid "%(type)s van referentienummer %(reference_number)s"
 msgstr "%(type)s of reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:106
+#: proposals/templates/proposals/proposal_pdf.html:104
 #, python-format
 msgid "Referentienummer %(reference_number)s"
 msgstr "Reference number %(reference_number)s"
 
-#: proposals/templates/proposals/proposal_pdf.html:111
+#: proposals/templates/proposals/proposal_pdf.html:109
 msgid "Huidige staat van de aanvraag"
 msgstr "Current state of the application"
 
-#: proposals/templates/proposals/proposal_pdf.html:113
+#: proposals/templates/proposals/proposal_pdf.html:111
 msgid "Indiener"
 msgstr "Applicant"
 
-#: proposals/templates/proposals/proposal_pdf.html:115
+#: proposals/templates/proposals/proposal_pdf.html:113
 #: tasks/templates/tasks/task_list.html:7
 msgid "Naam"
 msgstr "Name"
@@ -2424,8 +2428,8 @@ msgid ""
 "Het reglement van de <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-"
 "fetc-h/\">FEtC-H</a>."
 msgstr ""
-"The regulations of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/\"  "
-"target=\"_blank\">FEtC-H </a>."
+"The regulations of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-"
+"fetc-h/\"  target=\"_blank\">FEtC-H </a>."
 
 #: proposals/templates/proposals/proposal_start.html:31
 #: proposals/templates/proposals/proposal_start_practice.html:31
@@ -2909,7 +2913,7 @@ msgstr "Additional forms"
 #: proposals/templates/proposals/study_start.html:7
 #: proposals/templates/proposals/study_start.html:63
 #: proposals/utils/pdf_diff_logic.py:530
-#: proposals/utils/validate_proposal.py:94
+#: proposals/utils/validate_proposal.py:95
 msgid "Eén of meerdere trajecten?"
 msgstr "One or more trajectories?"
 
@@ -2943,7 +2947,7 @@ msgid "Revisie/amendement"
 msgstr "Revision/amendment"
 
 #: proposals/templates/proposals/translated_consent_forms.html:24
-#: proposals/utils/validate_proposal.py:223
+#: proposals/utils/validate_proposal.py:224
 msgid "Vertaling informed consent formulieren"
 msgstr "Translation of informed consent forms"
 
@@ -3138,8 +3142,8 @@ msgstr "Overview and self-assessment of the entire study"
 msgid "Extra formulieren "
 msgstr "Additional forms "
 
-#: proposals/utils/proposal_utils.py:51 proposals/utils/validate_proposal.py:76
-#: proposals/utils/validate_proposal.py:83
+#: proposals/utils/proposal_utils.py:51 proposals/utils/validate_proposal.py:77
+#: proposals/utils/validate_proposal.py:84
 msgid "Ethische toetsing nodig door een METC?"
 msgstr "Ethical assessment by a METC necessary?"
 
@@ -3179,41 +3183,41 @@ msgstr "FEtC-H: A revised application uses lab facilities"
 msgid "FETC-GW: nieuwe aanvraag gebruikt labfaciliteiten"
 msgstr "FEtC-H: New application uses lab facilities"
 
-#: proposals/utils/validate_proposal.py:105
+#: proposals/utils/validate_proposal.py:106
 msgid "De deelnemers (traject {})"
 msgstr "Participants (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:113
+#: proposals/utils/validate_proposal.py:114
 msgid "De onderzoekstype(n) (traject {})"
 msgstr "Type(s) of research (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:123
-#: proposals/utils/validate_proposal.py:132
+#: proposals/utils/validate_proposal.py:124
+#: proposals/utils/validate_proposal.py:133
 msgid "Het interventieonderzoek (traject {})"
 msgstr "Intervention study (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:144
-#: proposals/utils/validate_proposal.py:153
+#: proposals/utils/validate_proposal.py:145
+#: proposals/utils/validate_proposal.py:154
 msgid "Het observatieonderzoek (traject {})"
 msgstr "Observational study (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:164
+#: proposals/utils/validate_proposal.py:165
 msgid "Het takenonderzoek (traject {})"
 msgstr "Task-based research: trajectory {}"
 
-#: proposals/utils/validate_proposal.py:179
+#: proposals/utils/validate_proposal.py:180
 msgid "Het takenonderzoek: sessie {} (traject {})"
 msgstr "Task-based research: session {} trajectory {}"
 
-#: proposals/utils/validate_proposal.py:196
+#: proposals/utils/validate_proposal.py:197
 msgid "Het takenonderzoek: sessie {} taak {} (traject {})"
 msgstr "Task-based research: session {} task {} (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:213
+#: proposals/utils/validate_proposal.py:214
 msgid "Overzicht van takenonderzoek: sessie {} (traject {})"
 msgstr "Overview of task-based research: session {} (trajectory {})"
 
-#: proposals/utils/validate_proposal.py:230
+#: proposals/utils/validate_proposal.py:231
 msgid "AVG en Data Management"
 msgstr "AVG and Data Management"
 
@@ -3262,11 +3266,11 @@ msgstr ""
 msgid "Aanvraag verwijderd"
 msgstr "Application deleted"
 
-#: proposals/views/proposal_views.py:432
+#: proposals/views/proposal_views.py:452
 msgid "Wijzigingen opgeslagen"
 msgstr "Changes saved"
 
-#: proposals/views/proposal_views.py:532
+#: proposals/views/proposal_views.py:556
 msgid "Aanvraag gekopieerd"
 msgstr "Application copied"
 
@@ -3327,11 +3331,11 @@ msgstr "long route (4-weeks)"
 msgid "Direct terug naar aanvrager (Nog niet in behandeling)"
 msgstr "Return directly to applicant (not yet under review)"
 
-#: reviews/forms.py:34 reviews/menus.py:66 reviews/mixins.py:173
+#: reviews/forms.py:34 reviews/menus.py:67 reviews/mixins.py:173
 msgid "Algemene Kamer"
 msgstr "General Chamber"
 
-#: reviews/forms.py:35 reviews/menus.py:76 reviews/mixins.py:176
+#: reviews/forms.py:35 reviews/menus.py:77 reviews/mixins.py:176
 msgid "Linguïstiek Kamer"
 msgstr "Linguistics Chamber"
 
@@ -3363,39 +3367,39 @@ msgstr "Start date period:"
 msgid "Eind datum periode:"
 msgstr "End date period:"
 
-#: reviews/menus.py:18 reviews/views.py:73
+#: reviews/menus.py:19 reviews/views.py:73
 msgid "Mijn openstaande besluiten"
 msgstr "My pending decisions"
 
-#: reviews/menus.py:22
+#: reviews/menus.py:23
 msgid "Al mijn besluiten"
 msgstr "All my decisions"
 
-#: reviews/menus.py:26
+#: reviews/menus.py:27
 msgid "Alle openstaande besluiten commissieleden"
 msgstr "All pending decisions committee members"
 
-#: reviews/menus.py:31
+#: reviews/menus.py:32
 msgid "Alle openstaande besluiten eindverantwoordelijken"
 msgstr "All pending decisions supervisors"
 
-#: reviews/menus.py:36 reviews/views.py:230
+#: reviews/menus.py:37 reviews/views.py:230
 msgid "Nog af te handelen aanvragen"
 msgstr "Applications waiting for conclusion"
 
-#: reviews/menus.py:41 reviews/views.py:242
+#: reviews/menus.py:42 reviews/views.py:242
 msgid "Aanvragen in revisie"
 msgstr "Applications in revision"
 
-#: reviews/menus.py:46 reviews/views.py:254
+#: reviews/menus.py:47 reviews/views.py:254
 msgid "Alle lopende aanvragen"
 msgstr "All running applications"
 
-#: reviews/menus.py:51 reviews/views.py:280
+#: reviews/menus.py:52 reviews/views.py:280
 msgid "Alle ingezonden aanvragen"
 msgstr "All submitted applications"
 
-#: reviews/menus.py:56
+#: reviews/menus.py:57
 msgid "Overzicht werkverdeling commissieleden"
 msgstr "Overview workload committee members"
 
@@ -3630,7 +3634,7 @@ msgstr "Long route"
 msgid "Aanvraag beoordelen"
 msgstr "Assess the application"
 
-#: reviews/templates/reviews/decision_form.html:22
+#: reviews/templates/reviews/decision_form.html:21
 #, python-format
 msgid ""
 "Je kunt nu een go of no-go geven voor de aanvraag <em>%(title)s</em>, "
@@ -3641,12 +3645,12 @@ msgstr ""
 "%(refnum)s in %(chamber)s.    You can see the details of this application <a "
 "href=\"%(pdf_url)s\" target=\"_blank\">here</a> (downloads as PDF)."
 
-#: reviews/templates/reviews/decision_form.html:30
+#: reviews/templates/reviews/decision_form.html:29
 #, python-format
 msgid "Je kunt nu de aanvraag <em>%(title)s</em> bekijken. <br />"
 msgstr "You can now (re)view this application here: <em>%(title)s</em>. <br />"
 
-#: reviews/templates/reviews/decision_form.html:36
+#: reviews/templates/reviews/decision_form.html:35
 msgid ""
 "Als de aanvraag (incl. geïnformeerde toestemmingsformulieren) in orde is, "
 "klik dan op ‘goedgekeurd’ en ‘Beslissing opslaan’ hieronder; dan wordt de "
@@ -3656,7 +3660,7 @@ msgstr ""
 "'endorsed' and 'Save decision' below; the application will then be submitted "
 "to the FEtC-H. "
 
-#: reviews/templates/reviews/decision_form.html:43
+#: reviews/templates/reviews/decision_form.html:42
 msgid ""
 "Als de aanvraag nog niet in orde is, dan zijn er twee mogelijkheden om de "
 "aanvraag aan te passen:"
@@ -3664,7 +3668,7 @@ msgstr ""
 "If the application is not yet in order, there are two methods to amend the "
 "study: "
 
-#: reviews/templates/reviews/decision_form.html:50
+#: reviews/templates/reviews/decision_form.html:49
 #, python-format
 msgid ""
 "door de supervisor (jijzelf) <br /> Als supervisor kan je deze aanvraag <a "
@@ -3677,7 +3681,7 @@ msgstr ""
 "which, you will be redirected back to this page and you can approve the "
 "application; this means that the application is submitted to the FEtC-H. "
 
-#: reviews/templates/reviews/decision_form.html:59
+#: reviews/templates/reviews/decision_form.html:58
 msgid ""
 "door de indiener (je student of promovendus) <br /> Indien je wilt dat de "
 "indiener de aanvraag zelf aanpast voordat je de studie kunt goedkeuren en "
@@ -3692,7 +3696,7 @@ msgstr ""
 "any comments, and click 'Save decision'. Once you have done this, the "
 "submitter can make changes again. <br /> "
 
-#: reviews/templates/reviews/decision_form.html:71
+#: reviews/templates/reviews/decision_form.html:70
 msgid ""
 "Als de indiener de gevraagde wijzigingen heeft doorgevoerd en opnieuw heeft "
 "verstuurd, zal je de aangepaste aanvraag opnieuw moeten beoordelen."
@@ -3700,7 +3704,7 @@ msgstr ""
 "Once the submitter has made the requested changes and resubmitted the "
 "application, you will have to re-evaluate the application. "
 
-#: reviews/templates/reviews/decision_form.html:81
+#: reviews/templates/reviews/decision_form.html:80
 #, python-format
 msgid ""
 "Dit is een revisie van of amendement op een vorige aanvraag. De verschillen "
@@ -3710,7 +3714,7 @@ msgstr ""
 "differences compared to the previous application <a "
 "href=\"%(diff_url)s\">here</a>."
 
-#: reviews/templates/reviews/decision_form.html:96
+#: reviews/templates/reviews/decision_form.html:95
 msgid "Beslissing opslaan"
 msgstr "Save decision"
 
@@ -4185,7 +4189,7 @@ msgstr "Pending decisions committee members"
 msgid "Openstaande besluiten eindverantwoordelijken"
 msgstr "Pending decisions supervisors"
 
-#: reviews/views.py:580
+#: reviews/views.py:600
 msgid ""
 "Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer "
 "toevoegen/aanpassen"
diff --git a/proposals/templates/proposals/proposal_confirmation.html b/proposals/templates/proposals/proposal_confirmation.html
index 915614cd8..337169d5e 100644
--- a/proposals/templates/proposals/proposal_confirmation.html
+++ b/proposals/templates/proposals/proposal_confirmation.html
@@ -33,10 +33,10 @@ <h2>{% trans "Bevestigingsbrief versturen" %}</h2>
                 <table>
                     {{ form.as_table }}
                 </table>
+                <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
                 <input class="button"
                        type="submit"
-                       value="{% trans 'Bevestigingsbrief verstuurd' %}" />
-                <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
+                       value="{% trans 'Verstuur bevestigingsbrief' %}" />
             </form>
         </div>
     </div>

From e992c48bf044df9486a6a48deadbb419689547d4 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Thu, 14 Mar 2024 14:28:32 +0100
Subject: [PATCH 145/148] fix: diff bugfix

---
 proposals/utils/pdf_diff_logic.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py
index ff2489d23..032ba5076 100644
--- a/proposals/utils/pdf_diff_logic.py
+++ b/proposals/utils/pdf_diff_logic.py
@@ -1103,7 +1103,7 @@ def create_context_diff(context, old_proposal, new_proposal):
             DiffSection(WMOSection(old_proposal.wmo), WMOSection(new_proposal.wmo))
         )
 
-        if new_proposal.is_pre_assessment:
+        if not new_proposal.is_pre_assessment:
             if (
                 new_proposal.wmo.status != new_proposal.wmo.WMOStatuses.NO_WMO
                 or old_proposal.wmo.status != old_proposal.wmo.WMOStatuses.NO_WMO

From e410f736d49a60e87bd49cabde09fc274fa9cda7 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 18 Mar 2024 11:08:05 +0100
Subject: [PATCH 146/148] fix: buttons on task and session delete

---
 tasks/templates/tasks/session_confirm_delete.html | 4 ++--
 tasks/templates/tasks/task_confirm_delete.html    | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tasks/templates/tasks/session_confirm_delete.html b/tasks/templates/tasks/session_confirm_delete.html
index e906e1ecc..73b4a59d2 100644
--- a/tasks/templates/tasks/session_confirm_delete.html
+++ b/tasks/templates/tasks/session_confirm_delete.html
@@ -15,10 +15,10 @@ <h2>{% trans "Sessie verwijderen" %}</h2>
                 <p>
                     Weet u zeker dat u deze sessie <strong>{{ session.order }}</strong> in de aanvraag <em>{{ session.study.proposal.title }}</em> wilt verwijderen?
                 </p>
-                <input class="pure-button pure-button-primary"
+                <input class="button btn-danger"
                        type="submit"
                        value="{% trans 'Verwijderen' %}" />
-                <a class="pure-button pure-button-secondary"
+                <a class="button"
                    href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>
diff --git a/tasks/templates/tasks/task_confirm_delete.html b/tasks/templates/tasks/task_confirm_delete.html
index c39a183e1..799631119 100644
--- a/tasks/templates/tasks/task_confirm_delete.html
+++ b/tasks/templates/tasks/task_confirm_delete.html
@@ -15,10 +15,10 @@ <h2>{% trans "Taak verwijderen" %}</h2>
                 <p>
                     Weet u zeker dat u de taak <strong>{{ task.name }}</strong> uit sessie <strong>{{ task.session.order }}</strong> in de aanvraag <em>{{ task.session.study.proposal.title }}</em> wilt verwijderen?
                 </p>
-                <input class="pure-button pure-button-primary"
+                <input class="button btn-danger"
                        type="submit"
                        value="{% trans 'Verwijderen' %}" />
-                <a class="pure-button pure-button-secondary"
+                <a class="button"
                    href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>

From c7b8a1e2084d20b8f396676bcde4205de5bab7b3 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Mon, 18 Mar 2024 13:26:23 +0100
Subject: [PATCH 147/148] fix: formatting

---
 main/templates/base/form_buttons.html             | 4 ++--
 tasks/templates/tasks/session_confirm_delete.html | 3 +--
 tasks/templates/tasks/task_confirm_delete.html    | 3 +--
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/main/templates/base/form_buttons.html b/main/templates/base/form_buttons.html
index 14b23b6ef..e7cd1ed23 100644
--- a/main/templates/base/form_buttons.html
+++ b/main/templates/base/form_buttons.html
@@ -12,8 +12,8 @@
                     <a class="button js-submit-redirect"
                        href="{% url 'proposals:update_pre' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
                 {% elif proposal.is_pre_approved %}
-                       <a class="button js-submit-redirect"
-                          href="{% url 'proposals:update_pre_approved' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
+                    <a class="button js-submit-redirect"
+                       href="{% url 'proposals:update_pre_approved' proposal.pk %}">{% trans "Terug naar begin aanvraag" %}</a>
                 {% elif proposal.is_practice %}
                     <a class="button js-submit-redirect"
                        href="{% url 'proposals:update_practice' proposal.pk %}">
diff --git a/tasks/templates/tasks/session_confirm_delete.html b/tasks/templates/tasks/session_confirm_delete.html
index 73b4a59d2..f5cbacfbd 100644
--- a/tasks/templates/tasks/session_confirm_delete.html
+++ b/tasks/templates/tasks/session_confirm_delete.html
@@ -18,8 +18,7 @@ <h2>{% trans "Sessie verwijderen" %}</h2>
                 <input class="button btn-danger"
                        type="submit"
                        value="{% trans 'Verwijderen' %}" />
-                <a class="button"
-                   href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
+                <a class="button" href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>
     </div>
diff --git a/tasks/templates/tasks/task_confirm_delete.html b/tasks/templates/tasks/task_confirm_delete.html
index 799631119..70eb88b56 100644
--- a/tasks/templates/tasks/task_confirm_delete.html
+++ b/tasks/templates/tasks/task_confirm_delete.html
@@ -18,8 +18,7 @@ <h2>{% trans "Taak verwijderen" %}</h2>
                 <input class="button btn-danger"
                        type="submit"
                        value="{% trans 'Verwijderen' %}" />
-                <a class="button"
-                   href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
+                <a class="button" href="javascript:history.go(-1)">{% trans "Annuleren" %}</a>
             </form>
         </div>
     </div>

From 1d9ddf165bf9188f04e30a1bbcd9952e496e0483 Mon Sep 17 00:00:00 2001
From: Edo Storm <emtstorm@hotmail.com>
Date: Tue, 19 Mar 2024 16:13:30 +0100
Subject: [PATCH 148/148] Revert 'confirmation sent' text on button back to
 past tense

---
 locale/en/LC_MESSAGES/django.po               | 25 +++----------------
 .../proposals/proposal_confirmation.html      |  2 +-
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po
index e9dc08b76..6f60d5ff3 100644
--- a/locale/en/LC_MESSAGES/django.po
+++ b/locale/en/LC_MESSAGES/django.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-03-14 11:57+0100\n"
+"POT-Creation-Date: 2024-03-19 16:09+0100\n"
 "PO-Revision-Date: 2024-01-17 10:48+0100\n"
 "Last-Translator: Anna Asbury <anna.asbury@annaasbury.com>\n"
 "Language-Team: \n"
@@ -375,6 +375,7 @@ msgid "Bevestigingsbrief versturen"
 msgstr "Send confirmation letter"
 
 #: main/templates/auth/user_detail.html:97
+#: proposals/templates/proposals/proposal_confirmation.html:39
 #: reviews/templates/reviews/vue_templates/decision_list.html:90
 #: reviews/templates/reviews/vue_templates/review_list.html:83
 msgid "Bevestigingsbrief verstuurd"
@@ -1908,8 +1909,8 @@ msgstr "Delete"
 
 #: proposals/templates/proposals/proposal_confirm_delete.html:21
 #: proposals/templates/proposals/proposal_copy.html:93
-#: tasks/templates/tasks/session_confirm_delete.html:22
-#: tasks/templates/tasks/task_confirm_delete.html:22
+#: tasks/templates/tasks/session_confirm_delete.html:21
+#: tasks/templates/tasks/task_confirm_delete.html:21
 msgid "Annuleren"
 msgstr "Cancel"
 
@@ -1922,10 +1923,6 @@ msgstr ""
 "Please state when the confirmation letter for <em>%(title)s</em> has been "
 "sent here. "
 
-#: proposals/templates/proposals/proposal_confirmation.html:39
-msgid "Verstuur bevestigingsbrief"
-msgstr "Send confirmation"
-
 #: proposals/templates/proposals/proposal_copy.html:8
 #: proposals/templates/proposals/proposal_copy.html:22
 msgid "Revisie starten"
@@ -5217,17 +5214,3 @@ msgstr "Task edited"
 #: tasks/views/task_views.py:56
 msgid "Taak verwijderd"
 msgstr "Task deleted"
-
-#~ msgid ""
-#~ "Het reglement van de <a href=\"https://fetc-gw.wp.hum.uu.nl/reglement-"
-#~ "algemene-kamer/\">Algemene Kamer (AK)</a> of dat van de <a href=\"https://"
-#~ "fetc-gw.wp.hum.uu.nl/reglement-linguistiek-kamer/\">Linguïstiek Kamer "
-#~ "(LK)</a>."
-#~ msgstr ""
-#~ "The regulations of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/"
-#~ "regulations-general-chamber-2/\" target=\"blank\">General Chamber</a> or "
-#~ "those of the <a href=\"https://fetc-gw.wp.hum.uu.nl/en/regulations-"
-#~ "linguistics-chamber/\" target=\"blank\">Linguistics Chamber</a>."
-
-#~ msgid "Andere betrokkenen"
-#~ msgstr "Other people involved"
diff --git a/proposals/templates/proposals/proposal_confirmation.html b/proposals/templates/proposals/proposal_confirmation.html
index 337169d5e..7637fd475 100644
--- a/proposals/templates/proposals/proposal_confirmation.html
+++ b/proposals/templates/proposals/proposal_confirmation.html
@@ -36,7 +36,7 @@ <h2>{% trans "Bevestigingsbrief versturen" %}</h2>
                 <a class="button" href="javascript:history.go(-1);">{% trans "Terug naar de vorige pagina" %}</a>
                 <input class="button"
                        type="submit"
-                       value="{% trans 'Verstuur bevestigingsbrief' %}" />
+                       value="{% trans 'Bevestigingsbrief verstuurd' %}" />
             </form>
         </div>
     </div>