diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 53741844f..705dc97c8 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -5845,6 +5845,3 @@ msgstr "Edit start date" #~ 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'." 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/forms.py b/proposals/forms.py index b912d8637..bb860fb6f 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -57,7 +57,7 @@ class Meta: }), 'funding': forms.CheckboxSelectMultiple(), 'applicants': SelectMultipleUser(), - 'supervisor': SelectUser(), + 'supervisor': forms.Select(), } error_messages = { 'title': { @@ -66,7 +66,6 @@ class Meta: } _soft_validation_fields = ['relation', - 'supervisor', 'other_applicants', 'other_stakeholders', 'stakeholders', @@ -133,6 +132,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: @@ -167,6 +167,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 @@ -184,20 +185,28 @@ 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 \ - not cleaned_data.get('supervisor'): + 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 promotor/begeleider 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') 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/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

Belangrijk: 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.

NB: 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. +

Belangrijk: 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/static/proposals/pdf_font/OpenSans-Bold.ttf b/proposals/static/proposals/pdf_font/OpenSans-Bold.ttf new file mode 100644 index 000000000..4a5bc3958 Binary files /dev/null and b/proposals/static/proposals/pdf_font/OpenSans-Bold.ttf differ 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 000000000..eba75d742 Binary files /dev/null and b/proposals/static/proposals/pdf_font/OpenSans-BoldItalic.ttf differ 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 000000000..b0884744c Binary files /dev/null and b/proposals/static/proposals/pdf_font/OpenSans-Italic.ttf differ 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 000000000..29e9e605d Binary files /dev/null and b/proposals/static/proposals/pdf_font/OpenSans-Regular.ttf differ 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 %} -

{% trans "Het interventieonderzoek" %}

- - {% if study.has_intervention and not p_study.has_intervention %} -
- {% trans "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat niet bevat." %} -
- {% elif not study.has_intervention and p_study.has_intervention %} -
- {% trans "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag dat wel bevat." %} -
- {% 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 %} -
- {% 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." %} -
- {% 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 %} - - - - - - - - - - - - - {% if intervention.setting.all|needs_details or p_intervention.setting.all|needs_details %} - - - - - - {% 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" %} - - - - - - {% if not intervention.supervision or not p_intervention.supervision %} - - - - - - {% endif %} - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - {% if intervention.has_controls or p_intervention.has_controls %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "interventions" "intervention" "setting" %}{{ p_intervention.setting.all|unordered_list }}{{ intervention.setting.all|unordered_list }}
{% get_verbose_field_name "interventions" "intervention" "setting_details" %}{{ p_intervention.setting_details }}{{ intervention.setting_details }}
{% get_verbose_field_name "interventions" "intervention" "supervision" %} - {% if p_intervention %} - {{ p_intervention.supervision|yesno:_("ja,nee,") }} - {% endif %} - - {% if intervention %} - {{ intervention.supervision|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %} - {% if p_intervention %} - {{ p_intervention.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} - - {% if intervention %} - {{ intervention.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "period" %}{{ p_intervention.period }}{{ intervention.period }}
{% get_verbose_field_name "interventions" "intervention" "amount_per_week" %}{{ p_intervention.amount_per_week }}{{ intervention.amount_per_week }}
{% get_verbose_field_name "interventions" "intervention" "duration" %}{{ p_intervention.duration }}{{ intervention.duration }}
{% get_verbose_field_name "interventions" "intervention" "measurement" %}{{ p_intervention.measurement }}{{ intervention.measurement }}
{% get_verbose_field_name "interventions" "intervention" "experimenter" %}{{ p_intervention.experimenter }}{{ intervention.experimenter }}
{% get_verbose_field_name "interventions" "intervention" "description" %}{{ p_intervention.description }}{{ intervention.description }}
{% get_verbose_field_name "interventions" "intervention" "has_controls" %} - {% if p_intervention %} - {{ p_intervention.has_controls|yesno:_("ja,nee") }} - {% endif %} - - {% if intervention %} - {{ intervention.has_controls|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "controls_description" %}{{ p_intervention.controls_description }}{{ intervention.controls_description }}
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 %} - - - - - - - - - - - - - {% if intervention.setting.all|needs_details or p_intervention.setting.all|needs_details %} - - - - - - {% 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" %} - - - - - - {% if not intervention.supervision or not p_intervention.supervision %} - - - - - - {% endif %} - {% endif %} - - - - - - - - - - - {% if p_intervention.multiple_sessions or intervention.multiple_sessions %} - - - - - - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - {% if intervention.has_controls or p_intervention.has_controls %} - - - - - - {% endif %} - {% if intervention.extra_task or p_intervention.extra_task %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "interventions" "intervention" "setting" %}{{ p_intervention.setting.all|unordered_list }}{{ intervention.setting.all|unordered_list }}
{% get_verbose_field_name "interventions" "intervention" "setting_details" %}{{ p_intervention.setting_details }}{{ intervention.setting_details }}
{% get_verbose_field_name "interventions" "intervention" "supervision" %} - {% if p_intervention %} - {{ p_intervention.supervision|yesno:_("ja,nee,") }} - {% endif %} - - {% if intervention %} - {{ intervention.supervision|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %} - {% if p_intervention %} - {{ p_intervention.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} - - {% if intervention %} - {{ intervention.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "period" %}{{ p_intervention.period }}{{ intervention.period }}
{% get_verbose_field_name "interventions" "intervention" "multiple_sessions" %} - {% if p_intervention %} - {{ p_intervention.multiple_sessions|yesno:_("ja,nee,") }} - {% endif %} - - {% if intervention %} - {{ intervention.multiple_sessions|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "session_frequency" %}{{ p_intervention.session_frequency }}{{ intervention.session_frequency }}
{% get_verbose_field_name "interventions" "intervention" "duration" %}{{ p_intervention.duration }}{{ intervention.duration }}
{% get_verbose_field_name "interventions" "intervention" "measurement" %}{{ p_intervention.measurement }}{{ intervention.measurement }}
{% get_verbose_field_name "interventions" "intervention" "experimenter" %}{{ p_intervention.experimenter }}{{ intervention.experimenter }}
{% get_verbose_field_name "interventions" "intervention" "description" %}{{ p_intervention.description }}{{ intervention.description }}
{% get_verbose_field_name "interventions" "intervention" "has_controls" %} - {% if p_intervention %} - {{ p_intervention.has_controls|yesno:_("ja,nee") }} - {% endif %} - - {% if intervention %} - {{ intervention.has_controls|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "controls_description" %}{{ p_intervention.controls_description }}{{ intervention.controls_description }}
{% get_verbose_field_name "interventions" "intervention" "extra_task" %}{{ p_intervention.extra_task }}{{ intervention.extra_task }}
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 %} -

{% trans "Het observatieonderzoek" %}

- - {% if study.has_observation and not p_study.has_observation %} -
- {% trans "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat niet bevat." %} -
- {% elif not study.has_observation and p_study.has_observation %} -
- {% trans "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag dat wel bevat." %} -
- {% 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 %} -
- {% 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." %} -
- {% 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 %} - - - - - - - - - - - - - - {% if observation.setting.all|needs_details or p_observation.setting.all|needs_details %} - - - - - - {% 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" %} - - - - - - {% if not observation.supervision or not p_observation.supervision %} - - - - - - {% endif %} - {% endif %} - - - - - - - - - - - - - - - - - - - - - - - - - - {% if observation.is_nonpublic_space or p_observation.is_nonpublic_space %} - - - - - - {% endif %} - - - - - - {% if observation.needs_approval or p_observation.is_nonpublic_space %} - - - - - - - - - - - {% endif %} - - - - - - {% if observation.registrations.all|needs_details or p_observation.registrations.all|needs_details %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "observations" "observation" "setting" %}{{ p_observation.setting.all|unordered_list }}{{ observation.setting.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "setting_details" %}{{ p_observation.setting_details }}{{ observation.setting_details }}
{% get_verbose_field_name "observations" "observation" "supervision" %} - {% if p_observation %} - {{ p_observation.supervision|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.supervision|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "leader_has_coc" %} - {% if p_observation %} - {{ p_observation.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} - - {% if observation %} - {{ observation.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "days" %}{{ p_observation.days }}{{ observation.days }}
{% get_verbose_field_name "observations" "observation" "mean_hours" %}{{ p_observation.mean_hours }}{{ observation.mean_hours }}
{% get_verbose_field_name "observations" "observation" "is_anonymous" %} - {% if p_observation %} - {{ p_observation.is_anonymous|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.is_anonymous|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "is_in_target_group" %} - {% if p_observation %} - {{ p_observation.is_in_target_group|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.is_in_target_group|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %} - {% if p_observation %} - {{ p_observation.is_nonpublic_space|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.is_nonpublic_space|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %} - {% if p_observation %} - {{ p_observation.has_advanced_consent|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.has_advanced_consent|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "needs_approval" %} - {% if p_observation %} - {{ p_observation.needs_approval|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.needs_approval|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "approval_institution" %}{{ p_observation.approval_institution }}{{ observation.approval_institution }}
{% get_verbose_field_name "observations" "observation" "approval_document" %}{% trans "Download" %}{% trans "Download" %}
{% get_verbose_field_name "observations" "observation" "registrations" %}{{ p_observation.registrations.all|unordered_list }}{{ observation.registrations.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "registrations_details" %}{{ p_observation.registrations_details }}{{ observation.registrations_details }}
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 %} - - - - - - - - - - - - - - {% if observation.setting.all|needs_details or p_observation.setting.all|needs_details %} - - - - - - {% 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" %} - - - - - - {% if not observation.supervision or not p_observation.supervision %} - - - - - - {% endif %} - {% endif %} - - - - - - - - - - - - - - - - - - - - - {% if observation.is_anonymous or p_observation.is_anonymous %} - - - - - - {% endif %} - - - - - - {% if observation.is_in_target_group or p_observation.is_in_target_group %} - - - - - - {% endif %} - - - - - - {% if observation.is_nonpublic_space or p_observation.is_nonpublic_space %} - - - - - - - - - - - {% endif %} - - - - - - {% if observation.needs_approval or p_observation.is_nonpublic_space %} - - - - - - {% endif %} - - - - - - {% if observation.registrations.all|needs_details or p_observation.registrations.all|needs_details %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "observations" "observation" "setting" %}{{ p_observation.setting.all|unordered_list }}{{ observation.setting.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "setting_details" %}{{ p_observation.setting_details }}{{ observation.setting_details }}
{% get_verbose_field_name "observations" "observation" "supervision" %} - {% if p_observation %} - {{ p_observation.supervision|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.supervision|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "leader_has_coc" %} - {% if p_observation %} - {{ p_observation.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} - - {% if observation %} - {{ observation.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "details_who" %}{{ p_observation.details_who }}{{ observation.details_who }}
{% get_verbose_field_name "observations" "observation" "details_why" %}{{ p_observation.details_why }}{{ observation.details_why }}
{% get_verbose_field_name "observations" "observation" "details_frequency" %}{{ p_observation.details_frequency }}{{ observation.details_frequency }}
{% get_verbose_field_name "observations" "observation" "is_anonymous" %} - {% if p_observation %} - {{ p_observation.is_anonymous|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.is_anonymous|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "is_anonymous_details" %}{{ p_observation.is_anonymous_details }}{{ observation.is_anonymous_details }}
{% get_verbose_field_name "observations" "observation" "is_in_target_group" %} - {% if p_observation %} - {{ p_observation.is_in_target_group|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.is_in_target_group|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "is_in_target_group_details" %}{{ p_observation.is_in_target_group_details }}{{ observation.is_in_target_group_details }}
{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %} - {% if p_observation %} - {{ p_observation.is_nonpublic_space|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.is_nonpublic_space|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "is_nonpublic_space_details" %}{{ p_observation.is_nonpublic_space_details }}{{ observation.is_nonpublic_space_details }}
{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %} - {% if p_observation %} - {{ p_observation.has_advanced_consent|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.has_advanced_consent|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "needs_approval" %} - {% if p_observation %} - {{ p_observation.needs_approval|yesno:_("ja,nee") }} - {% endif %} - - {% if observation %} - {{ observation.needs_approval|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "observations" "observation" "approval_institution" %}{{ p_observation.approval_institution }}{{ observation.approval_institution }}
{% get_verbose_field_name "observations" "observation" "registrations" %}{{ p_observation.registrations.all|unordered_list }}{{ observation.registrations.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "registrations_details" %}{{ p_observation.registrations_details }}{{ observation.registrations_details }}
diff --git a/proposals/templates/proposals/diff/sessions.html b/proposals/templates/proposals/diff/sessions.html deleted file mode 100644 index 84b1ec92c..000000000 --- a/proposals/templates/proposals/diff/sessions.html +++ /dev/null @@ -1,185 +0,0 @@ -{% load i18n %} -{% load proposal_filters %} -{% load get_field_name %} -{% load diff_tags %} - -{% if study.has_sessions or p_study.has_sessions %} -

{% trans "Het takenonderzoek en interviews" %}

- - {% if study.has_sessions and not p_study.has_sessions %} -
- {% trans "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet bevat." %} -
- {% elif not study.has_sessions and p_study.has_sessions %} -
- {% trans "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat wel bevat." %} -
- {% endif %} - - {% include "studies/study_title.html" %} - - - - - - - - - - - -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "studies" "study" "sessions_number" %}{{ p_study.sessions_number }}{{ study.sessions_number }}
- - {% get_zipped_sessions_lists zipped_sessions study p_study %} - - {% for session, p_session in zipped_sessions %} -
- {% include "tasks/session_title.html" %} -
- - - - - - - - - - - - {% if session.setting.all|needs_details or p_session.setting.all|needs_details %} - - - - - - {% 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" %} - - - - - - {% if not session.supervision or not p_session.supervision %} - - - - - - {% endif %} - {% endif %} - - - - - -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "tasks" "session" "setting" %}{{ p_session.setting.all|unordered_list }}{{ session.setting.all|unordered_list }}
{% get_verbose_field_name "tasks" "session" "setting_details" %}{{ p_session.setting_details }}{{ session.setting_details }}
{% get_verbose_field_name "tasks" "session" "supervision" %} - {% if p_session %} - {{ p_session.supervision|yesno:_("ja,nee,") }} - {% endif %} - - {% if session %} - {{ session.supervision|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "tasks" "session" "leader_has_coc" %} - {% if p_session %} - {{ p_session.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} - - {% if session %} - {{ session.leader_has_coc|yesno:_("ja,nee,") }} - {% endif %} -
{% get_verbose_field_name "tasks" "session" "tasks_number" %}{{ p_session.tasks_number }}{{ session.tasks_number }}
- - {% get_zipped_tasks_lists zipped_tasks session p_session %} - - {% for task, p_task in zipped_tasks %} -
- {% include "tasks/task_title.html" %} -
- - - - - - - - - - - - - - - - - - - - - - - - - - - {% if task.registrations.all|needs_details or p_task.registrations.all|needs_details %} - - - - - - {% endif %} - {% if task.registrations.all|needs_details:"needs_kind" or p_task.registrations.all|needs_details:"needs_kind" %} - - - - - - {% if task.registration_kinds.all|needs_details or p_task.registration_kinds.all|needs_details %} - - - - - - {% endif %} - {% endif %} - - - - - - {% if task.feedback or p_task.feedback %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "tasks" "task" "name" %}{{ p_task.name }}{{ task.name }}
{% get_verbose_field_name "tasks" "task" "description" %}{{ p_task.description }}{{ task.description }}
{% get_verbose_field_name "tasks" "task" "duration" %}{{ p_task.duration }}{{ task.duration }}
{% get_verbose_field_name "tasks" "task" "registrations" %}{{ p_task.registrations.all|unordered_list }}{{ task.registrations.all|unordered_list }}
{% get_verbose_field_name "tasks" "task" "registrations_details" %}{{ p_task.registrations_details }}{{ task.registrations_details }}
{% get_verbose_field_name "tasks" "task" "registration_kinds" %}{{ p_task.registration_kinds.all|unordered_list }}{{ task.registration_kinds.all|unordered_list }}
{% get_verbose_field_name "tasks" "task" "registration_kinds_details" %}{{ p_task.registration_kinds_details }}{{ task.registration_kinds_details }}
{% get_verbose_field_name "tasks" "task" "feedback" %} - {% if p_task %} - {{ p_task.feedback|yesno:_("ja,nee") }} - {% endif %} - - {% if task %} - {{ task.feedback|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "tasks" "task" "feedback_details" %}{{ p_task.feedback_details }}{{ task.feedback_details }}
- {% endfor %} - -

{% trans "Overzicht van het takenonderzoek" %}

- - - - - - - - - - - -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "tasks" "session" "tasks_duration" session.net_duration %}{{ p_session.tasks_duration }}{{ session.tasks_duration }}
- {% 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 %} -

{% trans "De deelnemers" %}

- {% include "studies/study_title.html" %} - - {% if study and not p_study %} -
- {% trans "Dit traject is nieuw in de revisie." %} -
- {% elif not study and p_study %} -
- {% trans "Dit traject is weggehaald uit de revisie" %} -
- {% endif %} - - - - - - - - - - - - - {% if study|has_adults or p_study|has_adults %} - - - - - - {% if study.legally_incapable or p_study.legally_incapable %} - - - - - - {% endif %} - {% endif %} - - - - - - - {% if study.has_special_details %} - - - - - - {% if study.special_details.all|medical_traits %} - - - - - - {% if study.traits.all|needs_details %} - - - - - - {% endif %} - {% endif %} - {% endif %} - - {% if study|necessity_required or p_study|necessity_required %} - - - - - - - - - - - {% endif %} - - - - - - {% if study.recruitment.all|needs_details or p_study.recruitment.all|needs_details %} - - - - - - {% endif %} - - - - - - {% if study.compensation.needs_details or p_study.compensation.needs_details %} - - - - - - {% endif %} - - - - - - {% if study.hierarchy or p_study.hierarchy %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "studies" "study" "age_groups" %}{{ p_study.age_groups.all|unordered_list }}{{ study.age_groups.all|unordered_list }}
{% get_verbose_field_name "studies" "study" "legally_incapable" %} - {# 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 %} - - {% if study %} - {{ study.legally_incapable|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "studies" "study" "legally_incapable_details" %}{{ p_study.legally_incapable_details }}{{ study.legally_incapable_details }}
{% get_verbose_field_name "studies" "study" "has_special_details" %}{{ p_study.has_special_details|yesno:_("ja,nee") }}{{ study.has_special_details|yesno:_("ja,nee") }}
{% get_verbose_field_name "studies" "study" "special_details" %}{{ p_study.special_details.all|unordered_list }}{{ study.special_details.all|unordered_list }}
{% get_verbose_field_name "studies" "study" "traits" %}{{ p_study.traits.all|unordered_list }}{{ study.traits.all|unordered_list }}
{% get_verbose_field_name "studies" "study" "traits_details" %}{{ p_study.traits_details }}{{ study.traits_details }}
{% get_verbose_field_name "studies" "study" "necessity" %}{{ p_study.get_necessity_display }}{{ study.get_necessity_display }}
{% get_verbose_field_name "studies" "study" "necessity_reason" %}{{ p_study.necessity_reason }}{{ study.necessity_reason }}
{% get_verbose_field_name "studies" "study" "recruitment" %}{{ p_study.recruitment.all|unordered_list }}{{ study.recruitment.all|unordered_list }}
{% get_verbose_field_name "studies" "study" "recruitment_details" %}{{ p_study.recruitment_details }}{{ study.recruitment_details }}
{% get_verbose_field_name "studies" "study" "compensation" %}{{ p_study.compensation }}{{ study.compensation }}
{% get_verbose_field_name "studies" "study" "compensation_details" %}{{ p_study.compensation_details }}{{ study.compensation_details }}
{% get_verbose_field_name "studies" "study" "hierarchy" %}{{ p_study.hierarchy }}{{ study.hierarchy }}
{% get_verbose_field_name "studies" "study" "hierarchy_details" %}{{ p_study.hierarchy_details }}{{ study.hierarchy_details }}
- - {% include 'proposals/diff/intervention.html' %} - - {% include 'proposals/diff/observation.html' %} - - {% include 'proposals/diff/sessions.html' %} - -

{% trans "Overzicht en eigen beoordeling van het gehele onderzoek" %}

-
- {% include "studies/study_title.html" %} -
- - - - - - - {% if study.has_sessions or p_study.has_sessions %} - - - - - - {% if study.deception == 'Y' or study.deception == '?' or p_study.deception == 'Y' or p_study.deception == '?' %} - - - - - - {% endif %} - {% endif %} - - - - - - {% if study.negativity == 'Y' or study.negativity == '?' or p_study.negativity == 'Y' or p_study.negativity == '?' %} - - - - - - {% endif %} - - - - - - {% if study.stressful == 'Y' or study.stressful == '?' or p_study.stressful == 'Y' or p_study.stressful == '?' %} - - - - - - {% endif %} - - - - - - {% if study.risk == 'Y' or study.risk == '?' or p_study.risk == 'Y' or p_study.risk == '?' %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "studies" "study" "deception" %}{{ p_study.get_deception_display }}{{ study.get_deception_display }}
{% get_verbose_field_name "studies" "study" "deception_details" %}{{ p_study.deception_details }}{{ study.deception_details }}
{% get_verbose_field_name "studies" "study" "negativity" %}{{ p_study.get_negativity_display }}{{ study.get_negativity_display }}
{% get_verbose_field_name "studies" "study" "negativity_details" %}{{ p_study.negativity_details }}{{ study.negativity_details }}
{% get_verbose_field_name "studies" "study" "stressful" %}{{ p_study.get_stressful_display }}{{ study.get_stressful_display }}
{% get_verbose_field_name "studies" "study" "stressful_details" %}{{ p_study.stressful_details }}{{ study.stressful_details }}
{% get_verbose_field_name "studies" "study" "risk" %}{{ p_study.get_risk_display }}{{ study.get_risk_display }}
{% get_verbose_field_name "studies" "study" "risk_details" %}{{ p_study.risk_details }}{{ study.risk_details }}
- -

{% trans "Informed consent formulieren voor het onderzoek" %}

- {% include "studies/study_title.html" %} - - {% get_study_documents documents study %} - {% get_study_documents p_documents p_study %} - - - - - - - - - - - - - {% if proposal.translated_forms or p_proposal.translated_forms %} - - - - - - {% endif %} - - - {% if p_documents.informed_consent %} - - {% else %} - - {% endif %} - - {% if documents.informed_consent %} - - {% else %} - - {% endif %} - - - - {% if p_documents.briefing %} - - {% else %} - - {% endif %} - - {% if documents.briefing %} - - {% else %} - - {% endif %} - - - - - - - {% if study.passive_consent or p_study.passive_consent %} - - - - - - {% endif %} -
{% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}
{% get_verbose_field_name "proposals" "proposal" "translated_forms" %}{{ p_proposal.translated_forms|yesno:_("ja,nee") }}{{ proposal.translated_forms|yesno:_("ja,nee") }}
{% get_verbose_field_name "proposals" "proposal" "translated_forms_languages" %}{{ p_proposal.translated_forms_languages }}{{ proposal.translated_forms_languages }}
{% get_verbose_field_name "studies" "documents" "informed_consent" %}{% trans "Download" %}{% trans "Download" %}
{% get_verbose_field_name "studies" "documents" "briefing" %}{% trans "Download" %}{% trans "Download" %}
{% get_verbose_field_name "studies" "study" "passive_consent" %} - {% if p_study %} - {{ p_study.passive_consent|yesno:_("ja,nee") }} - {% endif %} - - {% if study %} - {{ study.passive_consent|yesno:_("ja,nee") }} - {% endif %} -
{% get_verbose_field_name "studies" "study" "passive_consent_details" %}{{ p_study.passive_consent_details }}{{ study.passive_consent_details }}
-{% endfor %} \ 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 %} - - - - - - {% if intervention.setting.all|needs_details %} - - - - {% endif %} - {% if study.has_children and intervention.setting.all|needs_details:"needs_supervision" %} - - - - {% if not intervention.supervision %} - - - - {% endif %} - {% endif %} - - - - - - - - - - - - - - - - - - - - - - {% if intervention.has_controls %} - - - - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "setting" %}{{ intervention.setting.all|unordered_list }}
{% get_verbose_field_name "interventions" "intervention" "setting_details" %}{{ intervention.setting_details }}
{% get_verbose_field_name "interventions" "intervention" "supervision" %}{{ intervention.supervision|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}{{ intervention.leader_has_coc|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "period" %}{{ intervention.period }}
{% get_verbose_field_name "interventions" "intervention" "amount_per_week" %}{{ intervention.amount_per_week }}
{% get_verbose_field_name "interventions" "intervention" "duration" %}{{ intervention.duration }}
{% get_verbose_field_name "interventions" "intervention" "measurement" %}{{ intervention.measurement }}
{% get_verbose_field_name "interventions" "intervention" "experimenter" %}{{ intervention.experimenter }}
{% get_verbose_field_name "interventions" "intervention" "description" %}{{ intervention.description }}
{% get_verbose_field_name "interventions" "intervention" "has_controls" %}{{ intervention.has_controls|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "controls_description" %}{{ intervention.controls_description }}
\ 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 %} - - - - - - {% if intervention.setting.all|needs_details %} - - - - {% endif %} - {% if study.has_children and intervention.setting.all|needs_details:"needs_supervision" %} - - - - {% if not intervention.supervision %} - - - - {% endif %} - {% endif %} - - - - - - - {% if intervention.multiple_sessions %} - - - - {% endif %} - - - - - - - - - - - - - - - - {% if intervention.has_controls %} - - - - {% endif %} - {% if not intervention.settings_contains_schools %} - - - - {% endif %} -
{% get_verbose_field_name "interventions" "intervention" "setting" %}{{ intervention.setting.all|unordered_list }}
{% get_verbose_field_name "interventions" "intervention" "setting_details" %}{{ intervention.setting_details }}
{% get_verbose_field_name "interventions" "intervention" "supervision" %}{{ intervention.supervision|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "leader_has_coc" %}{{ intervention.leader_has_coc|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "period" %}{{ intervention.period }}
{% get_verbose_field_name "interventions" "intervention" "multiple_sessions" %}{{ intervention.multiple_sessions|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "session_frequency" %}{{ intervention.session_frequency }}
{% get_verbose_field_name "interventions" "intervention" "duration" %}{{ intervention.duration }}
{% get_verbose_field_name "interventions" "intervention" "measurement" %}{{ intervention.measurement }}
{% get_verbose_field_name "interventions" "intervention" "experimenter" %}{{ intervention.experimenter }}
{% get_verbose_field_name "interventions" "intervention" "description" %}{{ intervention.description }}
{% get_verbose_field_name "interventions" "intervention" "has_controls" %}{{ intervention.has_controls|yesno:_("ja,nee") }}
{% get_verbose_field_name "interventions" "intervention" "controls_description" %}{{ intervention.controls_description }}
{% get_verbose_field_name "interventions" "intervention" "extra_task" %}{{ intervention.extra_task|yesno:_("ja,nee") }}
\ 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 %} - - - - - - {% if observation.setting.all|needs_details %} - - - - {% endif %} - {% if study.has_children and observation.setting.all|needs_details:"needs_supervision" %} - - - - {% if not observation.supervision %} - - - - {% endif %} - {% endif %} - - - - - - - - - - - - - - - - {% if observation.is_nonpublic_space %} - - - - {% endif %} - - - - {% if observation.needs_approval %} - - - - {% if not proposal.is_practice %} - - - - {% endif %} - {% endif %} - - - - {% if observation.registrations.all|needs_details %} - - - - {% endif %} -
{% get_verbose_field_name "observations" "observation" "setting" %}{{ observation.setting.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "setting_details" %}{{ observation.setting_details }}
{% get_verbose_field_name "observations" "observation" "supervision" %}{{ observation.supervision|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}{{ observation.leader_has_coc|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "days" %}{{ observation.days }}
{% get_verbose_field_name "observations" "observation" "mean_hours" %}{{ observation.mean_hours }}
{% get_verbose_field_name "observations" "observation" "is_anonymous" %}{{ observation.is_anonymous|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}{{ observation.is_in_target_group|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}{{ observation.is_nonpublic_space|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}{{ observation.has_advanced_consent|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "needs_approval" %}{{ observation.needs_approval|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "approval_institution" %}{{ observation.approval_institution }}
{% get_verbose_field_name "observations" "observation" "approval_document" %}{% trans "Download" %}
{% get_verbose_field_name "observations" "observation" "registrations" %}{{ observation.registrations.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "registrations_details" %}{{ observation.registrations_details }}
\ 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 %} - - - - - - {% if observation.setting.all|needs_details %} - - - - {% endif %} - {% if study.has_children and observation.setting.all|needs_details:"needs_supervision" %} - - - - {% if not observation.supervision %} - - - - {% endif %} - {% endif %} - - - - - - - - - - - - - {% if observation.is_anonymous %} - - - - {% endif %} - - - - {% if observation.is_in_target_group %} - - - - {% endif %} - - - - {% if observation.is_nonpublic_space %} - - - - - - - {% if not observation.has_advanced_consent %} - - - - {% endif %} - {% endif %} - {% if observation.setting.all|needs_details:"is_school" %} - - - - {% endif %} - {% if observation.needs_approval %} - - - - {% endif %} - - - - {% if observation.registrations.all|needs_details %} - - - - {% endif %} -
{% get_verbose_field_name "observations" "observation" "setting" %}{{ observation.setting.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "setting_details" %}{{ observation.setting_details }}
{% get_verbose_field_name "observations" "observation" "supervision" %}{{ observation.supervision|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "leader_has_coc" %}{{ observation.leader_has_coc|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "details_who"|safe %}{{ observation.details_who }}
{% get_verbose_field_name "observations" "observation" "details_why"|safe %}{{ observation.details_why }}
{% get_verbose_field_name "observations" "observation" "details_frequency"|safe %}{{ observation.details_frequency }}
{% get_verbose_field_name "observations" "observation" "is_anonymous" %}{{ observation.is_anonymous|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "is_anonymous_details" %}{{ observation.is_anonymous_details }}
{% get_verbose_field_name "observations" "observation" "is_in_target_group" %}{{ observation.is_in_target_group|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "is_in_target_group_details" %}{{ observation.is_in_target_group_details }}
{% get_verbose_field_name "observations" "observation" "is_nonpublic_space" %}{{ observation.is_nonpublic_space|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "is_nonpublic_space_details" %}{{ observation.is_nonpublic_space_details }}
{% get_verbose_field_name "observations" "observation" "has_advanced_consent" %}{{ observation.has_advanced_consent|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "has_advanced_consent_details" %}{{ observation.has_advanced_consent_details }}
{% get_verbose_field_name "observations" "observation" "needs_approval" %}{{ observation.needs_approval|yesno:_("ja,nee") }}
{% get_verbose_field_name "observations" "observation" "approval_institution" %}{{ observation.approval_institution }}
{% get_verbose_field_name "observations" "observation" "registrations" %}{{ observation.registrations.all|unordered_list }}
{% get_verbose_field_name "observations" "observation" "registrations_details" %}{{ observation.registrations_details }}
\ No newline at end of file diff --git a/proposals/templates/proposals/proposal_diff.html b/proposals/templates/proposals/proposal_diff.html index 3b4f22f93..d5cd970a1 100644 --- a/proposals/templates/proposals/proposal_diff.html +++ b/proposals/templates/proposals/proposal_diff.html @@ -16,7 +16,7 @@