diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 4642b40ec..8dfc74b2d 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 6d1e1613b..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 , 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 \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" @@ -547,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" @@ -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" @@ -1390,8 +1345,7 @@ 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." +msgstr "You cannot submit yourself as the promotor/supervisor." #: proposals/forms.py:213 msgid "Je hebt jezelf niet als onderzoekers geselecteerd." @@ -1834,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" @@ -2102,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" @@ -2559,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" @@ -2689,11 +2352,14 @@ msgstr "" "gw@uu.nl." #: 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." @@ -2701,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 @@ -2893,7 +2515,7 @@ msgstr "" "Click 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 - %(title)s (referentienummer %(reference_number)s, " @@ -2902,47 +2524,31 @@ msgstr "" "FEtC-H - %(title)s (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" @@ -2965,6 +2571,49 @@ msgstr "" " Reference number reference number\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 @@ -2979,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 "" @@ -3004,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 "" @@ -3109,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" @@ -3414,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" @@ -3532,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." @@ -3553,6 +3254,14 @@ msgstr "" "You can now describe the nature of each trajectory 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" @@ -3656,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?" @@ -3689,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" @@ -3742,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." @@ -3783,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" @@ -3949,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" @@ -5954,9 +5703,104 @@ msgstr "Task edited" msgid "Taak verwijderd" msgstr "Task deleted" -#~ msgid "Je dient een eindverantwoordelijke op te geven." +#~ 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 "" -#~ "You are required to specify the researcher with final responsibility." +#~ "This revision does not involve intervention research, whereas the " +#~ "original application does include this." -#~ msgid "Eindverantwoordelijke onderzoeker" -#~ msgstr "Researcher with final responsibility" +#~ 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 hier om opnieuw in te loggen met je " +#~ "Solis-ID." +#~ msgstr "" +#~ "Click here 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.

NB: 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. Note: 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/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/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 @@