diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 7f7aaf9ee..eba2b348e 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 705dc97c8..1b7501cec 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-07 10:34+0100\n" +"POT-Creation-Date: 2023-11-15 12:06+0100\n" "PO-Revision-Date: 2023-11-07 10:36+0100\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -40,7 +40,7 @@ msgstr "https://fetc-gw.wp.hum.uu.nl/en/regulations-fetc-h/" #: main/templates/main/index.html:209 #: proposals/templates/proposals/study_consent.html:8 #: proposals/templates/proposals/translated_consent_forms.html:7 -#: proposals/utils/pdf_diff_logic.py:859 +#: proposals/utils/pdf_diff_logic.py:869 msgid "Informed consent formulieren" msgstr "Informed consent forms" @@ -111,6 +111,7 @@ msgstr "You can leave feedback on the FEtC-H portal here." #: proposals/templates/proposals/proposal_confirmation.html:36 #: proposals/templates/proposals/proposal_diff.html:58 #: proposals/templates/proposals/proposal_update_attachments.html:26 +#: proposals/templates/proposals/proposal_update_date_start.html:29 #: reviews/templates/reviews/change_chamber_form.html:19 #: reviews/templates/reviews/decision_form.html:90 #: reviews/templates/reviews/review_assign_form.html:46 @@ -239,8 +240,7 @@ msgstr "How many times a week will the intervention session take place?" #: interventions/templates/interventions/intervention_form.html:7 #: interventions/templates/interventions/intervention_form.html:49 -#: proposals/templates/proposals/proposal_pdf_empty.html:186 -#: proposals/utils/pdf_diff_logic.py:586 +#: proposals/utils/pdf_diff_logic.py:596 msgid "Het interventieonderzoek" msgstr "Intervention study" @@ -282,7 +282,7 @@ msgstr "Intervention saved" #: main/forms/conditional_form.py:11 main/forms/conditional_form.py:20 #: main/forms/conditional_form.py:29 main/forms/conditional_form.py:38 #: main/forms/conditional_form.py:48 main/forms/mixins.py:83 -#: proposals/forms.py:569 proposals/forms.py:633 proposals/forms.py:648 +#: proposals/forms.py:570 proposals/forms.py:653 proposals/forms.py:668 #: studies/forms.py:104 tasks/forms.py:87 msgid "Dit veld is verplicht." msgstr "This field is required." @@ -358,8 +358,7 @@ msgid "Gebruiksersnaam" msgstr "Username" #: main/templates/auth/user_detail.html:30 -#: proposals/templates/proposals/proposal_pdf.html:119 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:66 +#: proposals/templates/proposals/proposal_pdf.html:120 msgid "E-mail" msgstr "E-mail" @@ -397,7 +396,7 @@ msgstr "Phase" #: reviews/templates/reviews/committee_members_workload.html:26 #: reviews/templates/reviews/vue_templates/decision_list.html:153 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95 -#: reviews/templates/reviews/vue_templates/review_list.html:151 +#: reviews/templates/reviews/vue_templates/review_list.html:157 msgid "Datum ingediend" msgstr "Date submitted" @@ -405,7 +404,7 @@ msgstr "Date submitted" #: reviews/templates/reviews/committee_members_workload.html:27 #: reviews/templates/reviews/vue_templates/decision_list.html:163 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:105 -#: reviews/templates/reviews/vue_templates/review_list.html:161 +#: reviews/templates/reviews/vue_templates/review_list.html:167 msgid "Gewenste einddatum" msgstr "Desired end date" @@ -417,7 +416,7 @@ msgstr "My decision" #: main/templates/auth/user_detail.html:58 reviews/api/views.py:332 #: reviews/models.py:57 #: reviews/templates/reviews/vue_templates/decision_list.html:133 -#: reviews/templates/reviews/vue_templates/review_list.html:131 +#: reviews/templates/reviews/vue_templates/review_list.html:137 msgid "Afhandeling" msgstr "Conclusion" @@ -426,7 +425,7 @@ msgstr "Conclusion" msgid "Acties" msgstr "Actions" -#: main/templates/auth/user_detail.html:75 reviews/models.py:135 +#: main/templates/auth/user_detail.html:75 reviews/models.py:139 msgid ", met revisie" msgstr ", with revision" @@ -468,7 +467,7 @@ msgstr "Website export text" #: proposals/templates/proposals/proposal_confirmation.html:25 #: reviews/templates/reviews/vue_templates/decision_list.html:95 #: reviews/templates/reviews/vue_templates/review_list.html:88 -#: reviews/utils/review_actions.py:244 +#: reviews/utils/review_actions.py:245 msgid "Bevestigingsbrief versturen" msgstr "Send confirmation letter" @@ -537,27 +536,27 @@ msgid "Maak een amendement van een al goedgekeurde aanvraag" msgstr "Create an amendment to an already approved application" #: main/templates/base/menu.html:32 proposals/menus.py:56 -#: proposals/views/proposal_views.py:77 +#: proposals/views/proposal_views.py:78 msgid "Mijn conceptaanvragen" msgstr "My draft applications" #: main/templates/base/menu.html:35 proposals/menus.py:60 -#: proposals/views/proposal_views.py:127 +#: proposals/views/proposal_views.py:128 msgid "Mijn oefenaanvragen" msgstr "My practice applications" #: main/templates/base/menu.html:38 proposals/menus.py:64 -#: proposals/views/proposal_views.py:89 +#: proposals/views/proposal_views.py:90 msgid "Mijn ingediende aanvragen" msgstr "My submitted applications" #: main/templates/base/menu.html:41 proposals/menus.py:68 -#: proposals/views/proposal_views.py:101 +#: proposals/views/proposal_views.py:102 msgid "Mijn afgehandelde aanvragen" msgstr "My processed applications" #: main/templates/base/menu.html:44 proposals/menus.py:72 -#: proposals/views/proposal_views.py:113 +#: proposals/views/proposal_views.py:114 msgid "Mijn aanvragen als eindverantwoordelijke" msgstr "My supervised applications" @@ -566,7 +565,7 @@ msgid "Al mijn aanvragen" msgstr "All my applications" #: main/templates/base/menu.html:52 proposals/menus.py:110 -#: proposals/views/proposal_views.py:154 +#: proposals/views/proposal_views.py:155 msgid "Archief" msgstr "Archive" @@ -1154,7 +1153,7 @@ msgid "" msgstr "As might happen on forums where the researcher also has an account." #: observations/models.py:65 observations/models.py:75 -#: observations/models.py:88 proposals/models.py:747 studies/models.py:172 +#: observations/models.py:88 proposals/models.py:738 studies/models.py:172 #: studies/models.py:228 studies/models.py:358 msgid "Licht toe" msgstr "Explain" @@ -1238,8 +1237,7 @@ msgstr "How many hours of observation will take place on average per day?" #: observations/templates/observations/observation_form.html:7 #: observations/templates/observations/observation_form.html:44 -#: proposals/templates/proposals/proposal_pdf_empty.html:229 -#: proposals/utils/pdf_diff_logic.py:642 +#: proposals/utils/pdf_diff_logic.py:652 msgid "Het observatieonderzoek" msgstr "Observational study" @@ -1265,6 +1263,7 @@ msgstr "Recording behaviour" #: proposals/templates/proposals/proposal_update_attachments.html:7 #: proposals/templates/proposals/proposal_update_attachments.html:14 #: proposals/templates/proposals/proposal_update_attachments.html:25 +#: proposals/templates/proposals/proposal_update_date_start.html:7 #: studies/templates/studies/study_update_attachments.html:7 #: studies/templates/studies/study_update_attachments.html:14 #: studies/templates/studies/study_update_attachments.html:25 @@ -1307,7 +1306,7 @@ msgstr "Last edited" msgid "Datum ingediend bij eindverantwoordelijke" msgstr "Date sent to supervisor" -#: proposals/forms.py:42 proposals/models.py:221 +#: proposals/forms.py:43 proposals/models.py:221 msgid "" "Zijn er nog andere onderzoekers bij deze aanvraag betrokken die " "niet geaffilieerd zijn aan een van de onderzoeksinstituten " @@ -1316,19 +1315,19 @@ msgstr "" "Are there any other researchers involved outside the above-" "mentioned institutes? " -#: proposals/forms.py:63 proposals/forms.py:279 proposals/validators.py:25 +#: proposals/forms.py:64 proposals/forms.py:280 proposals/validators.py:25 msgid "Er bestaat al een aanvraag met deze titel." msgstr "There is an existing application with this title." -#: proposals/forms.py:133 +#: proposals/forms.py:134 msgid "Selecteer..." msgstr "Select..." -#: proposals/forms.py:140 +#: proposals/forms.py:141 msgid "Docent" msgstr "Professor" -#: proposals/forms.py:141 +#: proposals/forms.py:142 msgid "" "Vul hier de docent van de cursus in waarbinnen je deze portal moet " "doorlopen. De docent kan na afloop de aanvraag inkijken in de portal. De " @@ -1339,23 +1338,23 @@ msgstr "" "This application will not be published in the semipublic archive of the FEtC-" "H." -#: proposals/forms.py:192 +#: proposals/forms.py:193 msgid "Je dient een promotor/begeleider op te geven." msgstr "You are required to specify a promotor/supervisor." -#: proposals/forms.py:199 +#: proposals/forms.py:200 msgid "Je kunt niet jezelf als promotor/begeleider opgeven." msgstr "You cannot submit yourself as the promotor/supervisor." -#: proposals/forms.py:213 +#: proposals/forms.py:214 msgid "Je hebt jezelf niet als onderzoekers geselecteerd." msgstr "You have not selected yourself." -#: proposals/forms.py:218 +#: proposals/forms.py:219 msgid "Je hebt geen andere onderzoekers geselecteerd." msgstr "You have not selected any other researchers." -#: proposals/forms.py:228 +#: proposals/forms.py:229 msgid "" "Dit veld is verplicht, maar je kunt later terugkomen om " "hem verder in te vullen." @@ -1363,7 +1362,7 @@ msgstr "" "This field is required, but you may choose to come back to this page later " "to fill it in." -#: proposals/forms.py:238 +#: proposals/forms.py:239 msgid "" "Indien je geen toestemming hebt van een andere ethische commissie, dien je " "het normale formulier in te vullen. Ga terug naar de startpagina, en " @@ -1376,23 +1375,23 @@ msgstr "" "page, and select \"Submit a new application that is completely new in this " "portal\" or \"from a copy of an old application.\"" -#: proposals/forms.py:265 +#: proposals/forms.py:266 msgid "Ik maak een oefenaanvraag aan" msgstr "I am creating a practice application" -#: proposals/forms.py:285 proposals/models.py:538 +#: proposals/forms.py:286 proposals/models.py:539 msgid "Te kopiëren aanvraag" msgstr "Application to be copied" -#: proposals/forms.py:287 proposals/models.py:540 +#: proposals/forms.py:288 proposals/models.py:541 msgid "Dit veld toont enkel aanvragen waar je zelf een medeuitvoerende bent." msgstr "This field shows only applications in which you are involved." -#: proposals/forms.py:327 proposals/forms.py:362 +#: proposals/forms.py:328 proposals/forms.py:363 msgid "Je kan de titel van je aanvraag nu, indien nodig, wijzigen." msgstr "You can, if necessary, change the title of your application here." -#: proposals/forms.py:329 proposals/forms.py:364 +#: proposals/forms.py:330 proposals/forms.py:365 msgid "" "De titel die je hier opgeeft is zichtbaar voor de FETC-GW-leden en, wanneer " "de aanvraag is goedgekeurd, ook voor alle medewerkers die in het archief van " @@ -1402,11 +1401,11 @@ msgstr "" "application is approved, also to employees viewing the archive of this " "portal." -#: proposals/forms.py:336 +#: proposals/forms.py:337 msgid "Te reviseren aanvraag" msgstr "Application to be revised" -#: proposals/forms.py:337 +#: proposals/forms.py:338 msgid "" "Dit veld toont enkel ingediende, (nog) niet goedgekeurde aanvragen waar jij " "een medeuitvoerende bent." @@ -1414,69 +1413,70 @@ msgstr "" "This field only shows submitted applications that have not been approved " "(yet) in which you are involved." -#: proposals/forms.py:371 +#: proposals/forms.py:372 msgid "Te amenderen aanvraag" msgstr "Application to be amended" -#: proposals/forms.py:372 +#: proposals/forms.py:373 msgid "" "Dit veld toont enkel goedgekeurde aanvragen waar je zelf een medeuitvoerende " "bent." msgstr "This field shows only approved applications in which you are involved." -#: proposals/forms.py:427 proposals/forms.py:557 proposals/forms.py:681 +#: proposals/forms.py:428 proposals/forms.py:558 proposals/forms.py:587 +#: proposals/forms.py:701 msgid "Dit veld is verplicht om verder te gaan." msgstr "This field is required to continue." -#: proposals/forms.py:435 +#: proposals/forms.py:436 msgid "Je dient een instelling op te geven." msgstr "You are required to specify an institution." -#: proposals/forms.py:493 +#: proposals/forms.py:494 msgid "In dit geval is een beslissing van een METC vereist" msgstr "In this case, a decision by a METC is required" -#: proposals/forms.py:501 +#: proposals/forms.py:502 msgid "Naam traject 1" msgstr "Title of trajectory 1" -#: proposals/forms.py:503 +#: proposals/forms.py:504 msgid "Naam traject 2" msgstr "Title of trajectory 2" -#: proposals/forms.py:505 +#: proposals/forms.py:506 msgid "Naam traject 3" msgstr "Title of trajectory 3" -#: proposals/forms.py:507 +#: proposals/forms.py:508 msgid "Naam traject 4" msgstr "Title of trajectory 4" -#: proposals/forms.py:509 +#: proposals/forms.py:510 msgid "Naam traject 5" msgstr "Title of trajectory 5" -#: proposals/forms.py:511 +#: proposals/forms.py:512 msgid "Naam traject 6" msgstr "Title of trajectory 6" -#: proposals/forms.py:513 +#: proposals/forms.py:514 msgid "Naam traject 7" msgstr "Title of trajectory 7" -#: proposals/forms.py:515 +#: proposals/forms.py:516 msgid "Naam traject 8" msgstr "Title of trajectory 8" -#: proposals/forms.py:517 +#: proposals/forms.py:518 msgid "Naam traject 9" msgstr "Title of trajectory 9" -#: proposals/forms.py:519 +#: proposals/forms.py:520 msgid "Naam traject 10" msgstr "Title of trajectory 10" -#: proposals/forms.py:563 +#: proposals/forms.py:564 msgid "" "Als niet dezelfde trajecten worden doorlopen, moeten er minstens twee " "verschillende trajecten zijn." @@ -1484,15 +1484,19 @@ msgstr "" "If different trajectories are used, at least two different trajectories " "should be filled in." -#: proposals/forms.py:640 +#: proposals/forms.py:598 +msgid "Nieuwe beoogde startdatum" +msgstr "New intended start date" + +#: proposals/forms.py:660 msgid "Toestemmingsverklaring voor traject {} nog niet toegevoegd." msgstr "Declaration of consent for trajectory {} not yet added." -#: proposals/forms.py:644 +#: proposals/forms.py:664 msgid "Informatiebrief voor traject {} nog niet toegevoegd." msgstr "Information letter for trajectory {} not yet added." -#: proposals/forms.py:656 +#: proposals/forms.py:676 msgid "" "De embargo-periode kan maximaal 2 jaar zijn. Kies een datum binnen 2 jaar " "van vandaag." @@ -1500,7 +1504,7 @@ msgstr "" "The embargo-period can last a maximum of 2 years. Pick a date within 2 years " "from today." -#: proposals/forms.py:687 +#: proposals/forms.py:707 msgid "Vul in in welke talen de formulieren worden vertaald." msgstr "Please fill in the languages" @@ -1772,13 +1776,13 @@ msgstr "How many different trajectories are there?" #: proposals/models.py:403 msgid "" -"Ik heb kennis genomen van het bovenstaande en begrijp mijn " -"verantwoordelijkheden ten opzichte van de AVG." +"Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de " +"privacy officer." msgstr "" -"I have read the information above and have considered my responsibilities " -"with regard to the AVG." +"I discussed my application and documents for participants with the " +"privacy officer." -#: proposals/models.py:410 +#: proposals/models.py:411 msgid "" "Als je een Data Management Plan hebt voor deze aanvraag, kan je kiezen om " "deze hier bij te voegen. Het aanleveren van een DMP vergemakkelijkt het " @@ -1788,24 +1792,24 @@ msgstr "" "include it here. Supplying a DMP can expedite ethical assessment of " "proposals." -#: proposals/models.py:422 proposals/utils/pdf_diff_logic.py:980 -#: reviews/models.py:184 +#: proposals/models.py:423 proposals/utils/pdf_diff_logic.py:990 +#: reviews/models.py:188 msgid "Ruimte voor eventuele opmerkingen" msgstr "Space for possible comments" -#: proposals/models.py:434 +#: proposals/models.py:435 msgid "Datum bevestigingsbrief verstuurd" msgstr "Date confirmation sent" -#: proposals/models.py:439 reviews/forms.py:110 +#: proposals/models.py:440 reviews/forms.py:110 msgid "Is er een revisie geweest na het indienen van deze aanvraag?" msgstr "Has this proposal been amended after it was submitted?" -#: proposals/models.py:444 +#: proposals/models.py:445 msgid "Leg uit" msgstr "Explain why" -#: proposals/models.py:450 +#: proposals/models.py:451 msgid "" "Wat zijn de belangrijkste ethische kwesties in dit onderzoek en beschrijf " "kort hoe ga je daarmee omgaat. Gebruik maximaal 1000 woorden." @@ -1814,23 +1818,23 @@ msgstr "" "please describe briefly how you will address them. Use a maximum of a 1000 " "words." -#: proposals/models.py:464 +#: proposals/models.py:465 msgid "In welke hoedanigheid ben je betrokken bij dit onderzoek?" msgstr "In what capacity are you involved in this application?" -#: proposals/models.py:472 +#: proposals/models.py:473 msgid "Wat is je studierichting?" msgstr "What is your course of study?" -#: proposals/models.py:479 +#: proposals/models.py:480 msgid "In welke context doe je dit onderzoek?" msgstr "In what capacity are you involved in this application?" -#: proposals/models.py:486 +#: proposals/models.py:487 msgid "Namelijk:" msgstr "Please specify:" -#: proposals/models.py:493 +#: proposals/models.py:494 msgid "" "Studenten (die mensgebonden onderzoek uitvoeren binnen hun studieprogramma) " "hoeven in principe geen aanvraag in te dienen bij de FETC-GW. Bespreek met " @@ -1844,7 +1848,7 @@ msgstr "" "do not not, you can terminate your proposal now. If you do, please explain " "what the reason is:" -#: proposals/models.py:510 +#: proposals/models.py:511 msgid "" "Uitvoerenden, inclusief uzelf. Let op! De andere onderzoekers moeten " "ten minste één keer zijn ingelogd op dit portaal om ze te kunnen selecteren." @@ -1853,13 +1857,13 @@ msgstr "" "researchers need to have logged into this portal at least once, in order to " "be selectable here." -#: proposals/models.py:517 +#: proposals/models.py:518 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 #: proposals/templates/proposals/vue_templates/proposal_list.html:166 msgid "Promotor/Begeleider" msgstr "Promotor/Supervisor" -#: proposals/models.py:520 +#: proposals/models.py:521 msgid "" "Je aanvraag moet, als je alles hebt ingevuld, via de portal \n" " naar je promotor of begeleider gestuurd worden. Deze " @@ -1889,53 +1893,53 @@ msgstr "" "you wait for them to do this, but remember to come back and fill in this " "field before submitting." -#: proposals/models.py:547 +#: proposals/models.py:548 msgid "" "Is deze aanvraag een revisie van of amendement op een ingediende aanvraag?" msgstr "" "Is this application a revision or an amendment of a previously submitted " "application?" -#: proposals/models.py:619 +#: proposals/models.py:620 msgid "Amendement" msgstr "Amendment" -#: proposals/models.py:619 reviews/api/views.py:39 reviews/api/views.py:328 +#: proposals/models.py:620 reviews/api/views.py:39 reviews/api/views.py:328 #: reviews/templates/reviews/committee_members_workload.html:36 #: reviews/templates/reviews/committee_members_workload.html:82 #: reviews/templates/reviews/review_detail_sidebar.html:106 msgid "Revisie" msgstr "Revision" -#: proposals/models.py:625 +#: proposals/models.py:626 msgid "Normaal" msgstr "Normal" -#: proposals/models.py:630 +#: proposals/models.py:631 msgid "Voortoetsing" msgstr "Preliminary assessment" -#: proposals/models.py:632 +#: proposals/models.py:633 msgid "Oefening" msgstr "Practice" -#: proposals/models.py:634 +#: proposals/models.py:635 msgid "Extern getoetst" msgstr "External approval" -#: proposals/models.py:732 +#: proposals/models.py:723 msgid "Geen beoordeling door METC noodzakelijk" msgstr "Assessment by METC not required" -#: proposals/models.py:733 +#: proposals/models.py:724 msgid "In afwachting beslissing METC" msgstr "Pending decision by METC" -#: proposals/models.py:734 +#: proposals/models.py:725 msgid "Beslissing METC geüpload" msgstr "METC decision uploaded" -#: proposals/models.py:738 +#: proposals/models.py:729 msgid "" "Vindt de dataverzameling plaats binnen het UMC Utrecht of andere instelling " "waar toetsing door een METC verplicht is gesteld?" @@ -1943,11 +1947,11 @@ msgstr "" "Will the data collection take place at the UMC Utrecht or another " "institution for which an assessment by a METC is required?" -#: proposals/models.py:752 +#: proposals/models.py:743 msgid "Welke instelling?" msgstr "Which institution?" -#: proposals/models.py:758 +#: proposals/models.py:749 msgid "" "Is de onderzoeksvraag medisch-wetenschappelijk van aard (zoals gedefinieerd " "door de WMO)?" @@ -1955,7 +1959,7 @@ msgstr "" "Is the nature of the research question medical (as defined by the Medical " "Research Involving Human Subjects Act (WMO))?" -#: proposals/models.py:760 +#: proposals/models.py:751 msgid "" "De definitie van medisch-wetenschappelijk onderzoek is: Medisch-" "wetenschappelijk onderzoek is onderzoek dat als doel heeft het beantwoorden " @@ -1976,7 +1980,7 @@ msgstr "" "Committee on Research Involving Human Subjects, Definition of medical " "research, 2005, ccmo.nl)" -#: proposals/models.py:776 +#: proposals/models.py:767 msgid "" "Je onderzoek moet beoordeeld worden door een METC, maar dient nog wel bij de " "FETC-GW te worden geregistreerd. Is dit onderzoek al aangemeld bij een METC?" @@ -1985,15 +1989,15 @@ msgstr "" "registered with the FEtC-H. Has an application for this project already been " "submitted to an METC?" -#: proposals/models.py:783 +#: proposals/models.py:774 msgid "Is de METC al tot een beslissing gekomen?" msgstr "Has the METC already come to a decision?" -#: proposals/models.py:788 +#: proposals/models.py:779 msgid "Upload hier de beslissing van het METC (in .pdf of .doc(x)-formaat)" msgstr "Please upload the decision of METC (in .pdf or .doc(x)-format) here" -#: proposals/models.py:826 +#: proposals/models.py:817 #, python-brace-format msgid "WMO {title}, status {status}" msgstr "WMO {title}, status {status}" @@ -2222,7 +2226,7 @@ msgstr "" "follow with regard to data." #: proposals/templates/proposals/proposal_data_management.html:24 -#: proposals/utils/pdf_diff_logic.py:954 +#: proposals/utils/pdf_diff_logic.py:964 #: reviews/templatetags/documents_list.py:245 msgid "Data Management Plan" msgstr "Data Management Plan" @@ -2371,9 +2375,6 @@ msgstr "" #: proposals/templates/proposals/proposal_form.html:76 #: proposals/templates/proposals/proposal_form_pre_approved.html:7 #: proposals/templates/proposals/proposal_form_pre_approved.html:81 -#: proposals/templates/proposals/proposal_pdf_empty.html:60 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:69 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:59 #: proposals/utils/pdf_diff_logic.py:419 proposals/utils/proposal_utils.py:40 #: proposals/utils/proposal_utils.py:55 proposals/utils/validate_proposal.py:33 #: proposals/utils/validate_proposal.py:43 @@ -2524,196 +2525,29 @@ msgstr "" "FEtC-H - %(title)s (reference number %(reference_number)s, " "submitted by %(submitter)s)" -#: proposals/templates/proposals/proposal_pdf.html:93 +#: proposals/templates/proposals/proposal_pdf.html:94 #, python-format msgid "%(type)s van referentienummer %(reference_number)s" msgstr "%(type)s of reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:109 +#: proposals/templates/proposals/proposal_pdf.html:110 #, python-format msgid "Referentienummer %(reference_number)s" msgstr "Reference number %(reference_number)s" -#: proposals/templates/proposals/proposal_pdf.html:113 +#: proposals/templates/proposals/proposal_pdf.html:114 msgid "Huidige staat van de aanvraag" msgstr "Current state of the application" -#: proposals/templates/proposals/proposal_pdf.html:116 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:60 +#: proposals/templates/proposals/proposal_pdf.html:117 msgid "Indiener" msgstr "Applicant" -#: proposals/templates/proposals/proposal_pdf.html:118 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:63 +#: proposals/templates/proposals/proposal_pdf.html:119 #: tasks/templates/tasks/task_list.html:7 msgid "Naam" msgstr "Name" -#: proposals/templates/proposals/proposal_pdf_empty.html:42 -msgid "" -"\n" -" FETC-GW - naam aanvraag (referentienummer referentienummer)\n" -" " -msgstr "" -"\n" -" FEtC-H - application name (reference number reference " -"number)\n" -" " - -#: proposals/templates/proposals/proposal_pdf_empty.html:56 -msgid "" -"\n" -" Referentienummer referentienummer\n" -" " -msgstr "" -"\n" -" 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 -#: proposals/templates/proposals/study_start.html:81 -msgid "Sessie" -msgstr "Session" - -#: proposals/templates/proposals/proposal_pdf_empty.html:304 -#: proposals/templates/proposals/proposal_start.html:69 -#: proposals/templates/proposals/proposal_start_practice.html:70 -#: proposals/templates/proposals/study_start.html:88 -msgid "Taak" -msgstr "Task" - -#: proposals/templates/proposals/proposal_pdf_empty.html:335 -#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7 -#: tasks/templates/tasks/task_end.html:18 -msgid "Overzicht van het takenonderzoek" -msgstr "Overview of task-based research" - -#: proposals/templates/proposals/proposal_pdf_empty.html:343 -#: proposals/utils/pdf_diff_logic.py:821 -#: studies/templates/studies/study_end.html:7 -#: studies/templates/studies/study_end.html:28 -msgid "Overzicht en eigen beoordeling van het gehele onderzoek" -msgstr "Overview and self-assessment of the entire study" - -#: proposals/templates/proposals/proposal_pdf_empty.html:372 -msgid "Informed consent formulieren voor het onderzoek" -msgstr "Informed consent forms for the study" - -#: proposals/templates/proposals/proposal_pdf_empty.html:389 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:150 -#: proposals/templates/proposals/proposal_submit.html:181 -#: proposals/utils/pdf_diff_logic.py:962 -msgid "Aanmelding versturen" -msgstr "Submit application" - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:42 -#, python-format -msgid "" -"\n" -" FETC-GW - Aanvraag elders al goedgekeurde aanvraag %(title)s " -"(referentienummer %(reference_number)s, ingediend door %(submitter)s)\n" -" " -msgstr "" -"\n" -" FEtC-H - Application for preapproved assessment %(title)s " -"(reference number %(reference_number)s, submitted by %(submitter)s)\n" -" " - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:56 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:55 -#, python-format -msgid "" -"\n" -" Referentienummer %(reference_number)s\n" -" " -msgstr "" -"\n" -" Reference number %(reference_number)s\n" -" " - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:92 -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:109 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:75 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:91 -#: tasks/templates/tasks/task_list.html:21 -msgid "ja,nee" -msgstr "yes,no" - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:119 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:99 -msgid "onbekend" -msgstr "unknown" - -#: proposals/templates/proposals/proposal_pdf_pre_approved.html:143 -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:105 -#: proposals/utils/pdf_diff_logic.py:281 -msgid "Download" -msgstr "Download" - -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:41 -#, python-format -msgid "" -"\n" -" FETC-GW - Aanvraag voor voortoetsing %(title)s " -"(referentienummer %(reference_number)s, ingediend door %(submitter)s)\n" -" " -msgstr "" -"\n" -" FEtC-H - Application for preliminary assessment %(title)s " -"(reference number %(reference_number)s, submitted by %(submitter)s)\n" -" " - -#: proposals/templates/proposals/proposal_pdf_pre_assessment.html:130 -#: proposals/templates/proposals/proposal_submit.html:175 -msgid "Aanvraag voor voortoetsing versturen" -msgstr "Submit application for preliminary assessment" - #: proposals/templates/proposals/proposal_public_archive.html:8 #: proposals/templates/proposals/proposal_public_archive.html:14 msgid "Goedgekeurde aanvragen" @@ -2828,6 +2662,12 @@ msgstr "" "For example: parents of children up to 15 years of age, teachers, or " "an experimental and control group that receive significantly different tasks." +#: proposals/templates/proposals/proposal_start.html:62 +#: proposals/templates/proposals/proposal_start_practice.html:63 +#: proposals/templates/proposals/study_start.html:81 +msgid "Sessie" +msgstr "Session" + #: proposals/templates/proposals/proposal_start.html:63 #: proposals/templates/proposals/proposal_start_practice.html:64 #: proposals/templates/proposals/study_start.html:82 @@ -2835,6 +2675,12 @@ msgid "Alle taken/onderdelen die iemand op één dag uitvoert." msgstr "" "All tasks or procedures that a participant completes in a day combined. " +#: proposals/templates/proposals/proposal_start.html:69 +#: proposals/templates/proposals/proposal_start_practice.html:70 +#: proposals/templates/proposals/study_start.html:88 +msgid "Taak" +msgstr "Task" + #: proposals/templates/proposals/proposal_start.html:70 #: proposals/templates/proposals/proposal_start_practice.html:71 #: proposals/templates/proposals/study_start.html:89 @@ -3103,6 +2949,10 @@ msgstr "" "The intended start date can be edited on this " "page." +#: proposals/templates/proposals/proposal_submit.html:175 +msgid "Aanvraag voor voortoetsing versturen" +msgstr "Submit application for preliminary assessment" + #: proposals/templates/proposals/proposal_submit.html:177 msgid "Terug naar beoordeling >>" msgstr "Back to review >>" @@ -3111,6 +2961,11 @@ msgstr "Back to review >>" msgid "Concept-aanmelding versturen" msgstr "Submit draft application" +#: proposals/templates/proposals/proposal_submit.html:181 +#: proposals/utils/pdf_diff_logic.py:972 +msgid "Aanmelding versturen" +msgstr "Submit application" + #: proposals/templates/proposals/proposal_submitted.html:8 #: proposals/templates/proposals/proposal_submitted.html:22 msgid "Aanvraag voor voortoetsing verstuurd" @@ -3160,6 +3015,26 @@ msgstr "" "On this page you can edit the forms related to the proposal " "%(title)s(reference number %(ref_number)s)" +#: proposals/templates/proposals/proposal_update_date_start.html:14 +#: proposals/templates/proposals/proposal_update_date_start.html:28 +msgid "Startdatum aanpassen" +msgstr "Edit start date" + +#: proposals/templates/proposals/proposal_update_date_start.html:17 +#, python-format +msgid "" +"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " +"(referentienummer %(ref_number)s). Let op! Als de review al " +"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " +"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op " +"met" +msgstr "" +"On this page, the start date of proposal %(title)s (reference number " +"%(ref_number)s) can be edited. Note! If the review has " +"already been concluded, the new start date will not be displayed in the PDF. " +"If you would like the PDF to be generated with the new start date, please " +"reach out to " + #: proposals/templates/proposals/study_consent.html:27 msgid "Toestemmingsverklaring van de schoolleider/hoofd van het departement" msgstr "Informed consent school director/ head of the institution" @@ -3233,6 +3108,13 @@ msgstr "Add additional forms" msgid "Extra formulieren" msgstr "Additional forms" +#: proposals/templates/proposals/study_start.html:7 +#: proposals/templates/proposals/study_start.html:64 +#: proposals/utils/pdf_diff_logic.py:521 +#: proposals/utils/validate_proposal.py:87 +msgid "Eén of meerdere trajecten?" +msgstr "One or more trajectories?" + #: proposals/templates/proposals/study_start.html:13 msgid "" "Geef elk traject hieronder een behulpzame naam van maximaal 15 karakters." @@ -3323,7 +3205,7 @@ msgstr "Route:" #: proposals/templates/proposals/vue_templates/proposal_list.html:187 #: reviews/templates/reviews/vue_templates/decision_list.html:185 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:128 -#: reviews/templates/reviews/vue_templates/review_list.html:184 +#: reviews/templates/reviews/vue_templates/review_list.html:190 msgid "Indieners" msgstr "Applicants" @@ -3344,10 +3226,16 @@ msgstr "Hide" #: proposals/templates/proposals/vue_templates/proposal_list.html:139 #: reviews/templates/reviews/vue_templates/decision_list.html:141 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:83 -#: reviews/templates/reviews/vue_templates/review_list.html:139 +#: reviews/templates/reviews/vue_templates/review_list.html:145 msgid "Revisie/amendement van" msgstr "Revision/amendment of" +#: proposals/templates/proposals/wmo_application.html:7 +#: proposals/templates/proposals/wmo_application.html:27 +#: proposals/utils/pdf_diff_logic.py:513 +msgid "Aanmelding bij de METC" +msgstr "Registration with the METC" + #: proposals/templates/proposals/wmo_application.html:33 msgid "" "Zolang je aanvraag nog niet is beoordeeld door de METC, kan je niet verder " @@ -3365,6 +3253,14 @@ msgstr "WMO check" msgid "Opnieuw beginnen" msgstr "Start again" +#: proposals/templates/proposals/wmo_form.html:7 +#: proposals/templates/proposals/wmo_form.html:30 +#: proposals/utils/pdf_diff_logic.py:488 +msgid "" +"Ethische toetsing nodig door een Medische Ethische Toetsingscommissie (METC)?" +msgstr "" +"Ethical assessment by a Medical Ethical Testing Committee (METC) required?" + #: proposals/utils/pdf_diff_logic.py:93 msgid "" "Dit onderdeel is nieuw in de revisie en bestond niet in de originele " @@ -3380,14 +3276,23 @@ msgstr "" "This section was present in the original application, but was removed for " "the revision." -#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:126 +#: proposals/utils/pdf_diff_logic.py:238 reviews/models.py:130 msgid "Onbekend" msgstr "Unknown" +#: proposals/utils/pdf_diff_logic.py:281 +msgid "Download" +msgstr "Download" + #: proposals/utils/pdf_diff_logic.py:284 msgid "Niet aangeleverd" msgstr "Not provided" +#: proposals/utils/pdf_diff_logic.py:308 tasks/templates/tasks/task_end.html:7 +#: tasks/templates/tasks/task_end.html:18 +msgid "Overzicht van het takenonderzoek" +msgstr "Overview of task-based research" + #: proposals/utils/pdf_diff_logic.py:321 proposals/utils/pdf_diff_logic.py:348 #: proposals/utils/pdf_diff_logic.py:357 proposals/utils/pdf_diff_logic.py:381 msgid "Traject " @@ -3405,7 +3310,29 @@ msgstr "Session " msgid ", taak " msgstr ", task " -#: proposals/utils/pdf_diff_logic.py:930 +#: proposals/utils/pdf_diff_logic.py:539 +#: studies/templates/studies/study_form.html:7 +#: studies/templates/studies/study_form.html:82 +msgid "De deelnemers" +msgstr "Participants" + +#: proposals/utils/pdf_diff_logic.py:743 +#: studies/templates/studies/session_start.html:7 +#: studies/templates/studies/session_start.html:17 +#: tasks/templates/tasks/task_form.html:7 +#: tasks/templates/tasks/task_form.html:30 +#: tasks/templates/tasks/task_start.html:7 +#: tasks/templates/tasks/task_start.html:28 +msgid "Het takenonderzoek en interviews" +msgstr "Task-based research and interviews" + +#: proposals/utils/pdf_diff_logic.py:831 +#: studies/templates/studies/study_end.html:7 +#: studies/templates/studies/study_end.html:28 +msgid "Overzicht en eigen beoordeling van het gehele onderzoek" +msgstr "Overview and self-assessment of the entire study" + +#: proposals/utils/pdf_diff_logic.py:940 msgid "Extra formulieren " msgstr "Additional forms " @@ -3488,47 +3415,44 @@ msgstr "Overview of task-based research: session {} (trajectory {})" msgid "AVG en Data Management" msgstr "AVG and Data Management" -#: proposals/validators.py:33 -msgid "" -"Je dient kennis genomen te hebben van de AVG om jouw aanvraag in te dienen" -msgstr "" -"You must confirm your understanding of the AVG before you can submit your " -"application." +#: proposals/validators.py:35 +msgid "Je dient deze vraag in te vullen om jouw aanvraag in te dienen" +msgstr "You must answer this question before you can submit your application" -#: proposals/views/proposal_views.py:44 +#: proposals/views/proposal_views.py:45 msgid "Publiek archief" msgstr "Public archive" -#: proposals/views/proposal_views.py:45 +#: proposals/views/proposal_views.py:46 msgid "Dit overzicht toont alle goedgekeurde aanvragen." msgstr "This overview shows all approved applications." -#: proposals/views/proposal_views.py:64 +#: proposals/views/proposal_views.py:65 msgid "Mijn aanvraag" msgstr "My application" -#: proposals/views/proposal_views.py:65 +#: proposals/views/proposal_views.py:66 msgid "Dit overzicht toont al je aanvragen." msgstr "This overview shows all your applications." -#: proposals/views/proposal_views.py:78 +#: proposals/views/proposal_views.py:79 msgid "Dit overzicht toont al je nog niet ingediende aanvragen." msgstr "This overview shows all the applications you have not yet submitted." -#: proposals/views/proposal_views.py:90 +#: proposals/views/proposal_views.py:91 msgid "Dit overzicht toont al je ingediende aanvragen." msgstr "This overview shows all the applications you have submitted." -#: proposals/views/proposal_views.py:102 +#: proposals/views/proposal_views.py:103 msgid "Dit overzicht toont al je beoordeelde aanvragen." msgstr "This overview shows all your applications that have been assessed." -#: proposals/views/proposal_views.py:115 +#: proposals/views/proposal_views.py:116 msgid "" "Dit overzicht toont alle aanvragen waarvan je eindverantwoordelijke bent." msgstr "This overview shows all your supervised applications." -#: proposals/views/proposal_views.py:128 +#: proposals/views/proposal_views.py:129 msgid "" "Dit overzicht toont alle oefenaanvragen waar je als student, onderzoeker of " "eindverantwoordelijke bij betrokken bent." @@ -3536,15 +3460,15 @@ msgstr "" "This overview shows all practice applications in which you are involved as a " "student, researcher or accountable researcher." -#: proposals/views/proposal_views.py:247 +#: proposals/views/proposal_views.py:248 msgid "Aanvraag verwijderd" msgstr "Application deleted" -#: proposals/views/proposal_views.py:385 +#: proposals/views/proposal_views.py:398 msgid "Wijzigingen opgeslagen" msgstr "Changes saved" -#: proposals/views/proposal_views.py:486 +#: proposals/views/proposal_views.py:499 msgid "Aanvraag gekopieerd" msgstr "Application copied" @@ -3585,7 +3509,7 @@ msgstr "Stage" #: reviews/api/views.py:35 reviews/api/views.py:324 reviews/models.py:45 #: reviews/templates/reviews/vue_templates/decision_list.html:178 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121 -#: reviews/templates/reviews/vue_templates/review_list.html:177 +#: reviews/templates/reviews/vue_templates/review_list.html:183 msgid "Route" msgstr "Route" @@ -3593,11 +3517,11 @@ msgstr "Route" msgid "Start datum" msgstr "Start date review" -#: reviews/forms.py:14 reviews/models.py:142 +#: reviews/forms.py:14 reviews/models.py:146 msgid "korte (2-weken) route" msgstr "short (2-week) route" -#: reviews/forms.py:15 reviews/models.py:141 +#: reviews/forms.py:15 reviews/models.py:145 msgid "lange (4-weken) route" msgstr "long (4-week) route" @@ -3697,24 +3621,24 @@ msgstr "Post hoc negative advice by FETC-H" msgid "Niet verder in behandeling genomen" msgstr "Not to be assessed further" -#: reviews/models.py:51 reviews/models.py:178 +#: reviews/models.py:51 reviews/models.py:182 #: reviews/templates/reviews/review_table.html:9 msgid "Beslissing" msgstr "Decision" -#: reviews/models.py:143 +#: reviews/models.py:147 msgid "nog geen route" msgstr "no route assigned" -#: reviews/models.py:172 +#: reviews/models.py:176 msgid "goedgekeurd" msgstr "endorsed" -#: reviews/models.py:173 +#: reviews/models.py:177 msgid "niet goedgekeurd" msgstr "not endorsed" -#: reviews/models.py:174 +#: reviews/models.py:178 msgid "revisie noodzakelijk" msgstr "revision necessary" @@ -4314,7 +4238,7 @@ msgid "Verplaats naar andere kamer" msgstr "Move study to different reviewing chamber" #: reviews/templates/reviews/vue_templates/review_list.html:95 -#: reviews/utils/review_actions.py:281 +#: reviews/utils/review_actions.py:282 msgid "Verberg aanvraag uit het archief" msgstr "Remove this application from the archive" @@ -4322,6 +4246,10 @@ msgstr "Remove this application from the archive" msgid "Plaats aanvraag in archief" msgstr "Add this application to the archive" +#: reviews/templates/reviews/vue_templates/review_list.html:122 +msgid "Reviewronde beëindigd: " +msgstr "Reviewing round ended: " + #: reviews/templatetags/documents_list.py:145 msgid "Hoofdtraject" msgstr "Main trajectory" @@ -4378,85 +4306,89 @@ msgstr "Information letter for the parents" msgid "Toestemmingsdocument observatie" msgstr "Consent document for observation" -#: reviews/utils/review_actions.py:129 +#: reviews/utils/review_actions.py:130 msgid "Geef jouw beslissing en/of commentaar door" msgstr "Provide feedback on this proposal" -#: reviews/utils/review_actions.py:155 +#: reviews/utils/review_actions.py:156 msgid "Deze aanvraag afsluiten" msgstr "Conclude this application" -#: reviews/utils/review_actions.py:185 +#: reviews/utils/review_actions.py:186 msgid "Beëindig definitief de afhandeling van deze aanvraag" msgstr "Discontinue assessment of this application" -#: reviews/utils/review_actions.py:215 +#: reviews/utils/review_actions.py:216 msgid "Verander aangestelde commissieleden" msgstr "Change appointment of committee members" -#: reviews/utils/review_actions.py:245 +#: reviews/utils/review_actions.py:246 msgid "Datum van bevestigingsbrief aanpassen" msgstr "Change date of confirmation letter" -#: reviews/utils/review_actions.py:283 +#: reviews/utils/review_actions.py:284 msgid "Plaats aanvraag in het archief." msgstr "Add this application to the archive" -#: reviews/utils/review_utils.py:54 +#: reviews/utils/review_actions.py:304 +msgid "Startdatum wijzigen" +msgstr "Edit start date" + +#: reviews/utils/review_utils.py:55 msgid "FETC-GW {}: bevestiging indienen concept-aanmelding" msgstr "FEtC-H {}: confirmation of draft application submission" -#: reviews/utils/review_utils.py:74 +#: reviews/utils/review_utils.py:75 msgid "FETC-GW {}: beoordelen als eindverantwoordelijke" msgstr "FEtC-H {}: assess as researcher with final responsibility" -#: reviews/utils/review_utils.py:124 +#: reviews/utils/review_utils.py:125 msgid "FETC-GW {}: aanmelding ontvangen" msgstr "FEtC-H {}: application received" -#: reviews/utils/review_utils.py:218 +#: reviews/utils/review_utils.py:219 msgid "FETC-GW {}: nieuwe aanvraag voor voortoetsing" msgstr "FEtC-H {}: new application for preliminary assessment" -#: reviews/utils/review_utils.py:232 +#: reviews/utils/review_utils.py:233 msgid "FETC-GW {}: bevestiging indienen aanvraag voor voortoetsing" msgstr "" "FEtC-H {}: confirmation of submission of application for preliminary " "assessment" -#: reviews/utils/review_utils.py:281 +#: reviews/utils/review_utils.py:282 msgid "FETC-GW {}: nieuwe aanvraag ingediend" msgstr "FEtC-H {}: new application submitted" -#: reviews/utils/review_utils.py:296 +#: reviews/utils/review_utils.py:297 msgid "FETC-GW {}: nieuwe beoordeling toegevoegd" msgstr "FEtC-H {}: new decision added" -#: reviews/utils/review_utils.py:312 +#: reviews/utils/review_utils.py:313 msgid "FETC-GW {}: eindverantwoordelijke heeft je aanvraag beoordeeld" msgstr "FEtC-H {}: a supervisor has reviewed your application" -#: reviews/utils/review_utils.py:338 +#: reviews/utils/review_utils.py:339 msgid "De aanvraag bevat het gebruik van wilsonbekwame volwassenen." msgstr "" "The application contains the participation of adults incapable of informed " "consent." -#: reviews/utils/review_utils.py:341 +#: reviews/utils/review_utils.py:342 msgid "De aanvraag bevat het gebruik van misleiding." msgstr "The application contains the use of misrepresentation." -#: reviews/utils/review_utils.py:344 +#: reviews/utils/review_utils.py:345 msgid "" "Er bestaat een hiërarchische relatie tussen de onderzoeker(s) en deelnemer(s)" msgstr "" "A hierarchal relationship between researcher(s) and participant(s) exists." -#: reviews/utils/review_utils.py:347 +#: reviews/utils/review_utils.py:348 msgid "Het onderzoek verzamelt bijzondere persoonsgegevens." msgstr "This study collects special or sensitive personal details." -#: reviews/utils/review_utils.py:350 +#: reviews/utils/review_utils.py:351 msgid "" "Het onderzoek selecteert deelnemers op bijzondere kenmerken die wellicht " "verhoogde kwetsbaarheid met zich meebrengen." @@ -4464,7 +4396,7 @@ msgstr "" "The study selects participants based on particular characteristics which " "might entail increased vulnerability." -#: reviews/utils/review_utils.py:356 +#: reviews/utils/review_utils.py:357 msgid "" "De onderzoeker geeft aan dat (of twijfelt erover of) het onderzoek op " "onderdelen of als geheel zodanig belastend is dat deze ondanks de verkregen " @@ -4474,7 +4406,7 @@ msgstr "" "study, in part or in its entirety, is so burdensome that despite acquiring " "informed consent it might raise questions." -#: reviews/utils/review_utils.py:360 +#: reviews/utils/review_utils.py:361 msgid "" "De onderzoeker geeft aan dat (of twijfelt erover of) de risico's op " "psychische of fysieke schade bij deelname aan het onderzoek meer dan " @@ -4484,7 +4416,7 @@ msgstr "" "psychological or physical harm in participating in the study are more than " "minimal." -#: reviews/utils/review_utils.py:367 +#: reviews/utils/review_utils.py:368 #, python-brace-format msgid "" "De totale duur van de taken in sessie {s}, exclusief pauzes en andere niet-" @@ -4495,14 +4427,14 @@ msgstr "" "non-task elements ({d} minutes) is greater than the task duration limit " "({max_d} minutes) for the age group {ag}." -#: reviews/utils/review_utils.py:384 +#: reviews/utils/review_utils.py:385 #, python-brace-format msgid "Het onderzoek observeert deelnemers in de volgende setting: {s}" msgstr "" "The application contains sessions with participants in the following " "setting: {s}" -#: reviews/utils/review_utils.py:388 +#: reviews/utils/review_utils.py:389 msgid "" "Het onderzoek observeert deelnemers in een niet-publieke ruimte en werkt met " "informed consent achteraf." @@ -4510,7 +4442,7 @@ msgstr "" "The study observes participants in a non-public space and works with " "retrospective informed consent." -#: reviews/utils/review_utils.py:390 +#: reviews/utils/review_utils.py:391 msgid "" "De onderzoeker begeeft zich \"under cover\" in een beheerde niet-publieke " "ruimte (bijv. een digitale gespreksgroep), en neemt actief aan de discussie " @@ -4520,11 +4452,11 @@ msgstr "" "(e.g. a digital discussion group), and takes part actively in the discussion " "and/or collects data which can be traced back to individuals." -#: reviews/utils/review_utils.py:395 +#: reviews/utils/review_utils.py:396 msgid "De aanvraag bevat het gebruik van {}" msgstr "The application makes use of {}" -#: reviews/utils/review_utils.py:416 +#: reviews/utils/review_utils.py:417 msgid "" "De aanvraag bevat psychofysiologische metingen bij kinderen onder de {} jaar." msgstr "" @@ -5633,6 +5565,10 @@ msgstr "Net duration (in minutes)" msgid "Feedback?" msgstr "Feedback?" +#: tasks/templates/tasks/task_list.html:21 +msgid "ja,nee" +msgstr "yes,no" + #: tasks/templates/tasks/task_list.html:27 msgid "Taak bewerken" msgstr "Edit task" @@ -5703,145 +5639,9 @@ msgstr "Task edited" msgid "Taak verwijderd" msgstr "Task deleted" -#: proposals/forms.py:190 -msgid "Je dient een eindverantwoordelijke op te geven." -msgstr "You are required to specify the researcher with final responsibility." - -#: proposals/forms.py:579 -msgid "Nieuwe beoogde startdatum" -msgstr "New intended start date" - -#: proposals/models.py:517 -#: proposals/templates/proposals/vue_templates/proposal_archive_list.html:115 -#: proposals/templates/proposals/vue_templates/proposal_list.html:166 -msgid "Eindverantwoordelijke onderzoeker" -msgstr "Researcher with final responsibility" - -#: proposals/templates/proposals/proposal_update_date_start.html:14 -#: proposals/templates/proposals/proposal_update_date_start.html:28 -msgid "Startdatum aanpassen" -msgstr "Edit start date" - -#: proposals/templates/proposals/proposal_update_date_start.html:17 -msgid "" -"Op deze pagina kan de startdatum worden aangepast van de aanvraag %(title)s " -"(referentienummer %(ref_number)s). Let op! Als de review al " -"is afgerond, wordt de nieuwe startdatum niet automatisch weergegeven in de " -"PDF. Mocht je de PDF opnieuw willen genereren, neem hierover dan contact op " -"met" -msgstr "" -"On this page, the start date of proposal %(title)s (reference number " -"%(ref_number)s) can be edited. Note! If the review has " -"already been concluded, the new start date will not be displayed in the PDF. " -"If you would like the PDF to be generated with the new start date, please " -"reach out to " - -#: reviews/templates/reviews/vue_templates/review_list.html:122 -msgid "Reviewronde beëindigd: " -msgstr "Reviewing round ended: " - -#: reviews/utils/review_actions.py:304 -msgid "Startdatum wijzigen" -msgstr "Edit start date" - -#~ msgid "" -#~ "De revisie bevat interventieonderzoek, terwijl de originele aanvraag dat " -#~ "niet bevat." -#~ msgstr "" -#~ "This revision involves intervention research, whereas the original " -#~ "application does not." - -#~ msgid "" -#~ "De revisie bevat geen interventieonderzoek, terwijl de originele aanvraag " -#~ "dat wel bevat." -#~ msgstr "" -#~ "This revision does not involve intervention research, whereas the " -#~ "original application does include this." - -#~ msgid "" -#~ "De revisie en de originele aanvraag hebben beide een " -#~ "interventieonderzoek, maar deze zijn niet te vergelijken. Dit komt " -#~ "doordat de revisie een andere versie van het formulier gebruikt." -#~ msgstr "" -#~ "This revision and the original application both involve intervention " -#~ "research, but this aspect cannot be compared. The revision uses a newer " -#~ "version of the form than the original." - -#~ msgid "ja,nee," -#~ msgstr "yes,no," - -#~ msgid "" -#~ "De revisie bevat observatieonderzoek, terwijl de originele aanvraag dat " -#~ "niet bevat." -#~ msgstr "" -#~ "This revision involves observation research, whereas the original " -#~ "application does not." - -#~ msgid "" -#~ "De revisie bevat geen observatieonderzoek, terwijl de originele aanvraag " -#~ "dat wel bevat." -#~ msgstr "" -#~ "This revision does not involve intervention research, whereas the " -#~ "original application involve this." - -#~ msgid "" -#~ "De revisie en de originele aanvraag hebben beide een observatieonderzoek, " -#~ "maar deze zijn niet te vergelijken. Dit komt doordat de revisie een " -#~ "andere versie van het formulier gebruikt." -#~ msgstr "" -#~ "This revision and the original application both involve observation " -#~ "research, but this aspect cannot be compared. The revision uses a newer " -#~ "version of the form than the original." - -#~ msgid "" -#~ "De revisie bevat takenonderzoek, terwijl de originele aanvraag dat niet " -#~ "bevat." -#~ msgstr "" -#~ "This revision involves tasks research, whereas the original application " -#~ "does not." - -#~ msgid "" -#~ "De revisie bevat geen takenonderzoek, terwijl de originele aanvraag dat " -#~ "wel bevat." -#~ msgstr "" -#~ "This revision does not involve tasks research, whereas the original " -#~ "application does involve this." - -#~ msgid "Dit traject is nieuw in de revisie." -#~ msgstr "This trajectory was added in this revision." - -#~ msgid "Dit traject is weggehaald uit de revisie" -#~ msgstr "This trajectory was removed in this revision." - -#, python-format -#~ msgid "" -#~ "Klik 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." +#~ "Ik heb kennis genomen van het bovenstaande en begrijp mijn " +#~ "verantwoordelijkheden ten opzichte van de AVG." #~ 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" +#~ "I have read the information above and have considered my responsibilities " +#~ "with regard to the AVG." diff --git a/proposals/forms.py b/proposals/forms.py index bb860fb6f..21cabcf24 100644 --- a/proposals/forms.py +++ b/proposals/forms.py @@ -573,9 +573,19 @@ def clean(self): class ProposalDataManagementForm(SoftValidationMixin, forms.ModelForm): class Meta: model = Proposal - fields = ['avg_understood', 'dmp_file'] + fields = ['privacy_officer', 'dmp_file'] + widgets = { + 'privacy_officer': forms.RadioSelect(choices=YES_NO), + } + + def clean(self): + cleaned_data = super(ProposalDataManagementForm, self).clean() - _soft_validation_fields = ['avg_understood'] + if cleaned_data['privacy_officer'] is None: + self.add_error( + 'privacy_officer', + _('Dit veld is verplicht om verder te gaan.') + ) class ProposalUpdateDataManagementForm(forms.ModelForm): class Meta: diff --git a/proposals/migrations/0034_auto_20211213_1503.py b/proposals/migrations/0034_auto_20211213_1503.py index f026a0ed4..a5afdc58d 100644 --- a/proposals/migrations/0034_auto_20211213_1503.py +++ b/proposals/migrations/0034_auto_20211213_1503.py @@ -5,8 +5,12 @@ import django.db.models.deletion import main.validators import proposals.utils.proposal_utils -import proposals.validators +def AVGUnderstoodValidator(): + '''This was formerly a validator, imported from proposals.validators, + but it is currently no longer required, so it has been removed. + To prevent an error, it has been replaced with this stub.''' + pass class Migration(migrations.Migration): @@ -18,7 +22,7 @@ class Migration(migrations.Migration): migrations.AlterField( model_name='proposal', name='avg_understood', - field=models.BooleanField(default=False, validators=[proposals.validators.AVGUnderstoodValidator], verbose_name='Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'), + field=models.BooleanField(default=False, validators=[AVGUnderstoodValidator], verbose_name='Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'), ), migrations.AlterField( model_name='proposal', diff --git a/proposals/migrations/0050_auto_20231116_1413.py b/proposals/migrations/0050_auto_20231116_1413.py new file mode 100644 index 000000000..2de122f4d --- /dev/null +++ b/proposals/migrations/0050_auto_20231116_1413.py @@ -0,0 +1,22 @@ +# Generated by Django 3.2.20 on 2023-11-16 13:13 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('proposals', '0049_alter_proposal_supervisor'), + ] + + operations = [ + migrations.RemoveField( + model_name='proposal', + name='avg_understood', + ), + migrations.AddField( + model_name='proposal', + name='privacy_officer', + field=models.BooleanField(blank=True, default=None, null=True, verbose_name='Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'), + ), + ] diff --git a/proposals/models.py b/proposals/models.py index 4c1cef382..09749e2b0 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -15,7 +15,6 @@ from main.models import YES, YES_NO_DOUBT from main.validators import MaxWordsValidator, validate_pdf_or_doc -from .validators import AVGUnderstoodValidator from .utils import available_urls, FilenameFactory, OverwriteStorage from datetime import date, timedelta @@ -399,11 +398,11 @@ class Proposal(models.Model): blank=True, ) - avg_understood = models.BooleanField( - _('Ik heb kennis genomen van het bovenstaande en begrijp mijn verantwoordelijkheden ten opzichte van de AVG.'), - default=False, - null=False, - validators=[AVGUnderstoodValidator], + privacy_officer = models.BooleanField( + _('Ik heb mijn aanvraag en de documenten voor deelnemers besproken met de privacy officer.'), + default=None, + null=True, + blank=True, ) dmp_file = models.FileField( diff --git a/proposals/templates/proposals/proposal_pdf.html b/proposals/templates/proposals/proposal_pdf.html index ec5b1216f..9d1d10631 100644 --- a/proposals/templates/proposals/proposal_pdf.html +++ b/proposals/templates/proposals/proposal_pdf.html @@ -84,8 +84,8 @@ {% block page_header %}
- {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name trimmed %} - FETC-GW - {{ title }} (referentienummer {{ reference_number }}, ingediend door {{ submitter }}) + {% blocktrans with title=proposal.title reference_number=proposal.reference_number submitter=proposal.created_by.get_full_name reviewing_committee=proposal.reviewing_committee.name trimmed %} + FETC-GW - {{ title }} (referentienummer {{reviewing_committee}}-{{ reference_number }}, ingediend door {{ submitter }}) {% endblocktrans %} {% if proposal.is_revision %}
diff --git a/proposals/utils/pdf_diff_logic.py b/proposals/utils/pdf_diff_logic.py index f4c5e651d..9ac7cdd57 100644 --- a/proposals/utils/pdf_diff_logic.py +++ b/proposals/utils/pdf_diff_logic.py @@ -963,7 +963,7 @@ class DMPFileSection(PageBreakMixin, BaseSection): section_title = _("Data Management Plan") - row_fields = ["dmp_file"] + row_fields = ["dmp_file", "privacy_officer"] class EmbargoSection(BaseSection): diff --git a/proposals/validators.py b/proposals/validators.py index c70cd8f65..e5005c43c 100644 --- a/proposals/validators.py +++ b/proposals/validators.py @@ -24,12 +24,3 @@ def __call__(self, value): if qs.exists(): raise forms.ValidationError(_('Er bestaat al een aanvraag met deze ' 'titel.'), code='unique') - - -def AVGUnderstoodValidator(value): - - if value != True: - raise forms.ValidationError( - _('Je dient kennis genomen te hebben van de AVG om jouw aanvraag in ' - 'te dienen'), code='avg' - ) diff --git a/reviews/migrations/0013_add_is_committee_review.py b/reviews/migrations/0013_add_is_committee_review.py new file mode 100644 index 000000000..0ff5fedc6 --- /dev/null +++ b/reviews/migrations/0013_add_is_committee_review.py @@ -0,0 +1,32 @@ +# Generated by Django 3.2.20 on 2023-11-16 13:01 + +from django.db import migrations, models + +def update_is_committee_review(apps, schema_editor): + + Review = apps.get_model('reviews', 'Review') + + for review in Review.objects.all(): + #Hardcoded these to account for possible future changes to stages + SUPERVISOR_STAGE = 0 + CLOSED_STAGE = 4 + if review.stage == SUPERVISOR_STAGE: + review.is_committee_review = False + if review.go: + review.stage = CLOSED_STAGE + review.save() + +class Migration(migrations.Migration): + + dependencies = [ + ('reviews', '0012_auto_20211213_1503'), + ] + + operations = [ + migrations.AddField( + model_name='review', + name='is_committee_review', + field=models.BooleanField(default=True), + ), + migrations.RunPython(update_is_committee_review), + ] diff --git a/reviews/models.py b/reviews/models.py index c964e0b20..20825474a 100644 --- a/reviews/models.py +++ b/reviews/models.py @@ -63,6 +63,10 @@ class Review(models.Model): date_end = models.DateTimeField(blank=True, null=True) date_should_end = models.DateField(blank=True, null=True) + is_committee_review = models.BooleanField( + default=True + ) + proposal = models.ForeignKey(Proposal, on_delete=models.CASCADE) def update_go(self, last_decision=None): @@ -89,7 +93,7 @@ def update_go(self, last_decision=None): self.save() # For a supervisor review: - if self.stage == self.SUPERVISOR: + if self.is_committee_review == False: # Update the status of the Proposal with the end date self.proposal.date_reviewed_supervisor = self.date_end self.proposal.save() @@ -99,6 +103,7 @@ def update_go(self, last_decision=None): # in an uWSGI environment, in which it errors. from reviews.utils import start_assignment_phase start_assignment_phase(self.proposal) + self.stage = self.CLOSED # On NO-GO, reset the Proposal status else: # See comment above diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html index ae1f10c15..da68c5636 100644 --- a/reviews/templates/reviews/review_detail_sidebar.html +++ b/reviews/templates/reviews/review_detail_sidebar.html @@ -47,7 +47,7 @@

{% if review.proposal.supervisor %}
  • - {% trans "Supervisor" %}: {{ review.proposal.supervisor }} + {% trans "Supervisor" %}: {{ review.proposal.supervisor.get_full_name }}
    • {% endif %}
  • @@ -90,7 +90,7 @@

    • {% endif %} - {% if review.stage == review.SUPERVISOR %} + {% if not review.is_committee_review %}
  • {% blocktrans trimmed %} diff --git a/reviews/tests.py b/reviews/tests.py index 81fad6e90..60a4de5dc 100644 --- a/reviews/tests.py +++ b/reviews/tests.py @@ -154,6 +154,7 @@ def test_start_supervisor_review(self): # If the Relation on a Proposal requires a supervisor, a Review for the supervisor should be started. review = start_review(self.proposal) self.assertEqual(review.stage, Review.SUPERVISOR) + self.assertEqual(review.is_committee_review, False) self.assertEqual(Decision.objects.filter(reviewer=self.supervisor).count(), 1) self.assertEqual(Decision.objects.filter(review=review).count(), 1) self.assertEqual(review.decision_set.count(), 1) @@ -170,6 +171,7 @@ def test_start_review(self): review = start_review(self.proposal) self.assertEqual(review.stage, Review.ASSIGNMENT) + self.assertEqual(review.is_committee_review, True) self.assertEqual(Decision.objects.filter(reviewer=self.secretary).count(), 1) self.assertEqual(Decision.objects.filter(review=review).count(), 1) self.assertEqual(review.decision_set.count(), 1) @@ -196,6 +198,7 @@ def test_decision_supervisor(self): decision.save() review.refresh_from_db() self.assertEqual(review.go, True) + self.assertEqual(review.is_committee_review, False) self.assertEqual(len(mail.outbox), 2) self.check_subject_lines(mail.outbox) diff --git a/reviews/utils/review_utils.py b/reviews/utils/review_utils.py index 772ed176f..d0a568fd0 100644 --- a/reviews/utils/review_utils.py +++ b/reviews/utils/review_utils.py @@ -42,6 +42,7 @@ def start_supervisor_phase(proposal): """ review = Review.objects.create(proposal=proposal, date_start=timezone.now()) review.stage = Review.SUPERVISOR + review.is_committee_review = False review.save() proposal.date_submitted_supervisor = timezone.now() diff --git a/reviews/views.py b/reviews/views.py index 9a08ce0c1..260438ca5 100644 --- a/reviews/views.py +++ b/reviews/views.py @@ -556,7 +556,7 @@ def form_valid(self, form): # Don't notify the secretary if this is a supervisor decision. # If it was a GO they the secretary will be notified anyway - if not review.stage == review.SUPERVISOR: + if review.is_committee_review: notify_secretary(form.instance) return super(DecisionUpdateView, self).form_valid(form)