diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 6f60d5ff3..e6a4c4004 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,8 +6,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-03-19 16:09+0100\n" -"PO-Revision-Date: 2024-01-17 10:48+0100\n" +"POT-Creation-Date: 2024-04-15 11:16+0200\n" +"PO-Revision-Date: 2024-04-03 12:32+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" "Language: en\n" @@ -270,7 +270,7 @@ msgid "Ingediende aanvragen" msgstr "My submitted applications;" #: main/templates/auth/user_detail.html:36 reviews/api/views.py:47 -#: reviews/api/views.py:276 reviews/api/views.py:337 +#: reviews/api/views.py:281 reviews/api/views.py:342 #: reviews/templates/reviews/committee_members_workload.html:24 msgid "Referentienummer" msgstr "Reference number" @@ -295,7 +295,7 @@ msgstr "Phase" #: proposals/api/views.py:146 #: proposals/templates/proposals/vue_templates/proposal_archive_list.html:102 #: proposals/templates/proposals/vue_templates/proposal_list.html:161 -#: reviews/api/views.py:51 reviews/api/views.py:280 reviews/api/views.py:341 +#: reviews/api/views.py:51 reviews/api/views.py:285 reviews/api/views.py:346 #: reviews/templates/reviews/committee_members_workload.html:25 #: reviews/templates/reviews/vue_templates/decision_list.html:153 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:95 @@ -316,7 +316,7 @@ msgstr "Desired end date" msgid "Mijn besluit" msgstr "My decision" -#: main/templates/auth/user_detail.html:43 reviews/api/views.py:331 +#: main/templates/auth/user_detail.html:43 reviews/api/views.py:336 #: reviews/models.py:34 #: reviews/templates/reviews/vue_templates/decision_list.html:133 #: reviews/templates/reviews/vue_templates/review_list.html:137 @@ -328,7 +328,7 @@ msgstr "Conclusion" msgid "Acties" msgstr "Actions" -#: main/templates/auth/user_detail.html:60 reviews/models.py:117 +#: main/templates/auth/user_detail.html:60 reviews/models.py:118 msgid ", met revisie" msgstr ", with revision" @@ -370,7 +370,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:228 +#: reviews/utils/review_actions.py:230 msgid "Bevestigingsbrief versturen" msgstr "Send confirmation letter" @@ -1057,7 +1057,7 @@ msgstr "" #: proposals/templates/proposals/proposal_update_attachments.html:30 #: proposals/templates/proposals/proposal_update_date_start.html:33 #: reviews/templates/reviews/change_chamber_form.html:23 -#: reviews/templates/reviews/decision_form.html:92 +#: reviews/templates/reviews/decision_form.html:99 #: reviews/templates/reviews/review_assign_form.html:46 #: reviews/templates/reviews/review_close_form.html:40 #: reviews/templates/reviews/review_discontinue_form.html:70 @@ -1381,13 +1381,13 @@ msgid "Aanvraag is beoordeeld door FETC-GW" msgstr "Application has been assessed by FEtC-H" #: proposals/models.py:161 -msgid "om de portal te exploreren" -msgstr "to explore the portal" - -#: proposals/models.py:162 msgid "in het kader van een cursus" msgstr "in the context of a course" +#: proposals/models.py:162 +msgid "om de portal te exploreren" +msgstr "to explore the portal" + # Not actually used in the interface #: proposals/models.py:172 msgid "Door welke comissie dient deze aanvraag te worden beoordeeld?" @@ -1634,7 +1634,7 @@ msgstr "" "proposals." #: proposals/models.py:462 proposals/utils/pdf_diff_logic.py:999 -#: reviews/models.py:162 +#: reviews/models.py:163 msgid "Ruimte voor eventuele opmerkingen" msgstr "Space for possible comments" @@ -1745,10 +1745,10 @@ msgstr "" msgid "Amendement" msgstr "Amendment" -#: proposals/models.py:677 reviews/api/views.py:41 reviews/api/views.py:327 +#: proposals/models.py:677 reviews/api/views.py:41 reviews/api/views.py:332 #: reviews/templates/reviews/committee_members_workload.html:35 #: reviews/templates/reviews/committee_members_workload.html:74 -#: reviews/templates/reviews/review_detail_sidebar.html:106 +#: reviews/templates/reviews/review_detail_sidebar.html:108 msgid "Revisie" msgstr "Revision" @@ -2102,26 +2102,35 @@ msgstr "" "funding, provided by Utrecht University." #: proposals/templates/proposals/proposal_data_management.html:46 -#: proposals/templates/proposals/proposal_data_management.html:79 msgid "Nuttige workshops:" msgstr "Recommended workshops" #: proposals/templates/proposals/proposal_data_management.html:48 -#: proposals/templates/proposals/proposal_data_management.html:81 msgid "" "Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende " -"workshop te volgen:" +"workshop/online training te volgen:" msgstr "If you have not already done so, it is highly recommended you attend: " -#: proposals/templates/proposals/proposal_data_management.html:53 +#: proposals/templates/proposals/proposal_data_management.html:54 msgid "" -"
  • de workshop Quick start to Research Data Management
    • " +"De workshop Quick start to Research Data Management" msgstr "" -"
  • the workshop Quick start to Research Data Management
    • " +"The workshop Quick start to Research Data Management" -#: proposals/templates/proposals/proposal_data_management.html:61 +#: proposals/templates/proposals/proposal_data_management.html:60 +msgid "" +"De online training Write your DMP" +msgstr "" +"The online training Write your DMP" + +#: proposals/templates/proposals/proposal_data_management.html:67 msgid "" "Voor advies op het gebied van data management planning kun je contact " "opnemen met de datamanager GW, Frans de Liagre Böhl via datamanagement.gw@uu.nl, who is the data manager of " "the Faculty of Humanities." -#: proposals/templates/proposals/proposal_data_management.html:65 +#: proposals/templates/proposals/proposal_data_management.html:71 msgid "Privacy: AVG en GDPR" msgstr "Privacy: AVG and GDPR" -#: proposals/templates/proposals/proposal_data_management.html:67 +#: proposals/templates/proposals/proposal_data_management.html:73 msgid "" "Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt " "aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de " @@ -2149,7 +2158,7 @@ msgstr "" "regulation is in line with European GDPR privacy legislation." -#: proposals/templates/proposals/proposal_data_management.html:73 +#: proposals/templates/proposals/proposal_data_management.html:79 msgid "" "De autoriteit persoonsgegevens heeft de workshop Handling personal data in research " +"Voor vragen over privacy, zoals: \"Wat zijn persoonlijke gegevens?\" of " +"\"Wanneer mag ik mijn onderzoek anoniem noemen?\", raden we je aan het Data " +"Privacy Handboek te raadplegen." msgstr "" -"
  • the workshop Handling personal data in research
    • " +"For all your questions regarding privacy, e.g.: \"What are personal data?\" " +"or \"When may I call my research anonymous?\", consult the Data Privacy Handbook." -#: proposals/templates/proposals/proposal_data_management.html:94 +#: proposals/templates/proposals/proposal_data_management.html:93 msgid "" "Voor advies op het gebied van privacy en de AVG kun je contact opnemen met " "de privacy officer van GW via privacy." @@ -2936,12 +2952,12 @@ msgstr "" "the following pages." #: proposals/templates/proposals/table_with_header_diff.html:11 -msgid "Originele aanvraag" -msgstr "Original application" +msgid "Vorige aanvraag" +msgstr "Previous application" #: proposals/templates/proposals/table_with_header_diff.html:12 -msgid "Revisie/amendement" -msgstr "Revision/amendment" +msgid "Huidige aanvraag" +msgstr "Current application" #: proposals/templates/proposals/translated_consent_forms.html:24 #: proposals/utils/validate_proposal.py:224 @@ -3020,7 +3036,7 @@ msgstr "To next step" #: proposals/templates/proposals/vue_templates/proposal_list.html:82 msgid "Verberg" -msgstr "" +msgstr "Hide" #: proposals/templates/proposals/vue_templates/proposal_list.html:89 msgid "Maak revisie" @@ -3079,7 +3095,7 @@ msgstr "" "This section was present in the original application, but was removed for " "the revision." -#: proposals/utils/pdf_diff_logic.py:248 reviews/models.py:111 +#: proposals/utils/pdf_diff_logic.py:248 reviews/models.py:112 msgid "Onbekend" msgstr "Unknown" @@ -3298,21 +3314,21 @@ msgstr "Contact {secretary} to make sure." msgid "Je onderzoek zal moeten worden beoordeeld door de METC." msgstr "Your application will require assessment by an METC." -#: reviews/api/views.py:33 reviews/api/views.py:319 +#: reviews/api/views.py:33 reviews/api/views.py:324 #: reviews/templates/reviews/vue_templates/decision_list.html:111 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:61 #: reviews/templates/reviews/vue_templates/review_list.html:116 msgid "Stadium" msgstr "Stage" -#: reviews/api/views.py:37 reviews/api/views.py:323 reviews/models.py:31 +#: reviews/api/views.py:37 reviews/api/views.py:328 reviews/models.py:31 #: reviews/templates/reviews/vue_templates/decision_list.html:178 #: reviews/templates/reviews/vue_templates/decision_list_reviewer.html:121 #: reviews/templates/reviews/vue_templates/review_list.html:183 msgid "Route" msgstr "Route" -#: reviews/api/views.py:55 reviews/api/views.py:284 reviews/api/views.py:345 +#: reviews/api/views.py:55 reviews/api/views.py:289 reviews/api/views.py:350 msgid "Start datum" msgstr "Start date review" @@ -3380,19 +3396,19 @@ msgstr "All pending decisions committee members" msgid "Alle openstaande besluiten eindverantwoordelijken" msgstr "All pending decisions supervisors" -#: reviews/menus.py:37 reviews/views.py:230 +#: reviews/menus.py:37 reviews/views.py:235 msgid "Nog af te handelen aanvragen" msgstr "Applications waiting for conclusion" -#: reviews/menus.py:42 reviews/views.py:242 +#: reviews/menus.py:42 reviews/views.py:247 msgid "Aanvragen in revisie" msgstr "Applications in revision" -#: reviews/menus.py:47 reviews/views.py:254 +#: reviews/menus.py:47 reviews/views.py:259 msgid "Alle lopende aanvragen" msgstr "All running applications" -#: reviews/menus.py:52 reviews/views.py:280 +#: reviews/menus.py:52 reviews/views.py:285 msgid "Alle ingezonden aanvragen" msgstr "All submitted applications" @@ -3452,32 +3468,32 @@ msgstr "Post hoc negative advice by FETC-H" msgid "Niet verder in behandeling genomen" msgstr "Not to be assessed further" -#: reviews/models.py:32 reviews/models.py:157 +#: reviews/models.py:32 reviews/models.py:158 #: reviews/templates/reviews/review_table.html:9 msgid "Beslissing" msgstr "Decision" -#: reviews/models.py:123 +#: reviews/models.py:124 msgid "lange (4-weken) route" msgstr "long (4-week) route" -#: reviews/models.py:124 +#: reviews/models.py:125 msgid "korte (2-weken) route" msgstr "short (2-week) route" -#: reviews/models.py:125 +#: reviews/models.py:126 msgid "nog geen route" msgstr "no route assigned" -#: reviews/models.py:152 +#: reviews/models.py:153 msgid "goedgekeurd" msgstr "endorsed" -#: reviews/models.py:153 +#: reviews/models.py:154 msgid "niet goedgekeurd" msgstr "not endorsed" -#: reviews/models.py:154 +#: reviews/models.py:155 msgid "revisie noodzakelijk" msgstr "revision necessary" @@ -3499,7 +3515,7 @@ msgstr "" "Click to make your decision " "(as a supervisor)." -#: reviews/templates/reviews/action_explaination.html:53 +#: reviews/templates/reviews/action_explaination.html:55 msgid "Uitleg secretaris" msgstr "Explanation for secretary" @@ -3643,11 +3659,21 @@ msgstr "" "href=\"%(pdf_url)s\" target=\"_blank\">here (downloads as PDF)." #: reviews/templates/reviews/decision_form.html:29 +msgid "" +"Attentie: jij bent de laatste beoordelaar van deze " +"aanvraag. Daarom kun je na het versturen je oordeel en commentaar niet meer " +"bewerken. Controleer je antwoorden goed." +msgstr "" +"Warning: because you are the last remaining reviewer for " +"this proposal, you won't be able to edit your response after submission. " +"Double-check your answers." + +#: reviews/templates/reviews/decision_form.html:36 #, python-format msgid "Je kunt nu de aanvraag %(title)s bekijken.
    " msgstr "You can now (re)view this application here: %(title)s.
    " -#: reviews/templates/reviews/decision_form.html:35 +#: reviews/templates/reviews/decision_form.html:42 msgid "" "Als de aanvraag (incl. geïnformeerde toestemmingsformulieren) in orde is, " "klik dan op ‘goedgekeurd’ en ‘Beslissing opslaan’ hieronder; dan wordt de " @@ -3657,7 +3683,7 @@ msgstr "" "'endorsed' and 'Save decision' below; the application will then be submitted " "to the FEtC-H. " -#: reviews/templates/reviews/decision_form.html:42 +#: reviews/templates/reviews/decision_form.html:49 msgid "" "Als de aanvraag nog niet in orde is, dan zijn er twee mogelijkheden om de " "aanvraag aan te passen:" @@ -3665,7 +3691,7 @@ msgstr "" "If the application is not yet in order, there are two methods to amend the " "study: " -#: reviews/templates/reviews/decision_form.html:49 +#: reviews/templates/reviews/decision_form.html:56 #, python-format msgid "" "door de supervisor (jijzelf)
    Als supervisor kan je deze aanvraag Indien je wilt dat de " "indiener de aanvraag zelf aanpast voordat je de studie kunt goedkeuren en " @@ -3693,7 +3719,7 @@ msgstr "" "any comments, and click 'Save decision'. Once you have done this, the " "submitter can make changes again.
    " -#: reviews/templates/reviews/decision_form.html:70 +#: reviews/templates/reviews/decision_form.html:77 msgid "" "Als de indiener de gevraagde wijzigingen heeft doorgevoerd en opnieuw heeft " "verstuurd, zal je de aangepaste aanvraag opnieuw moeten beoordelen." @@ -3701,7 +3727,7 @@ msgstr "" "Once the submitter has made the requested changes and resubmitted the " "application, you will have to re-evaluate the application. " -#: reviews/templates/reviews/decision_form.html:80 +#: reviews/templates/reviews/decision_form.html:87 #, python-format msgid "" "Dit is een revisie van of amendement op een vorige aanvraag. De verschillen " @@ -3711,7 +3737,7 @@ msgstr "" "differences compared to the previous application     here." -#: reviews/templates/reviews/decision_form.html:95 +#: reviews/templates/reviews/decision_form.html:102 msgid "Beslissing opslaan" msgstr "Save decision" @@ -3734,7 +3760,7 @@ msgstr "Appoint committee members" #, python-format msgid "" "

    Kies hier de geschikte route en commissieleden voor de aanvraag " -"%(title)s. klik hier voor een " +"%(title)s. Klik hier voor een " "overzicht van de werkverdeling van deze commissie.

    " msgstr "" "

    Choose the appropriate route and committee members for the application " @@ -3788,25 +3814,15 @@ msgstr "" "Do you want to change your decision? Please contact the secretary of the FEtC-H." -#: reviews/templates/reviews/review_detail.html:11 -#, python-format -msgid "Details van besluitvorming bij aanmelding %(proposal)s" -msgstr "Details on the review process of application %(proposal)s" - -#: reviews/templates/reviews/review_detail.html:21 -#, python-format -msgid "Details van besluitvorming bij aanmelding %(proposal)s" -msgstr "Details on the review process of application %(proposal)s" - -#: reviews/templates/reviews/review_detail.html:33 +#: reviews/templates/reviews/review_detail.html:25 msgid "Reviewers" msgstr "Reviewers" -#: reviews/templates/reviews/review_detail.html:35 +#: reviews/templates/reviews/review_detail.html:27 msgid "Handelingen" msgstr "Actions" -#: reviews/templates/reviews/review_detail.html:40 +#: reviews/templates/reviews/review_detail.html:32 msgid "Geen handelingen beschikbaar" msgstr "No actions available" @@ -3838,42 +3854,42 @@ msgstr "Reviewing round started on
    %(date_start)s." #: reviews/templates/reviews/review_detail_sidebar.html:54 #, python-format -msgid "Reviewronde beëindigd op
    %(date_end)s." -msgstr "Reviewing round ended on
    %(date_end)s." +msgid "Laatste beoordeling ontvangen op
    %(date_end)s." +msgstr "Last decision received on
    %(date_end)s." #: reviews/templates/reviews/review_detail_sidebar.html:63 #, python-format -msgid "Afhandeling:
    %(continuation)s." -msgstr "Continuation:
    %(continuation)s." +msgid "Afhandeling:
    %(continuation)s,
    %(date_reviewed)s." +msgstr "Continuation:
    %(continuation)s,
    %(date_reviewed)s." -#: reviews/templates/reviews/review_detail_sidebar.html:71 +#: reviews/templates/reviews/review_detail_sidebar.html:73 #, python-format msgid "Bevestiging verzonden op
    %(date_confirmed)s." msgstr "Confirmation sent on
    %(date_confirmed)s." -#: reviews/templates/reviews/review_detail_sidebar.html:77 +#: reviews/templates/reviews/review_detail_sidebar.html:79 #, python-format msgid "Opmerkingen:
    %(comments)s." msgstr "Comments:
    %(comments)s." -#: reviews/templates/reviews/review_detail_sidebar.html:89 +#: reviews/templates/reviews/review_detail_sidebar.html:91 msgid "Dit is een aanvraag voor voortoetsing." msgstr "This is an application for preliminary assessment" -#: reviews/templates/reviews/review_detail_sidebar.html:98 +#: reviews/templates/reviews/review_detail_sidebar.html:100 msgid "Dit is een beslissing van een eindverantwoordelijke" msgstr "This is a supervisor review" -#: reviews/templates/reviews/review_detail_sidebar.html:108 +#: reviews/templates/reviews/review_detail_sidebar.html:110 msgid "Deze aanvraag heeft een revisie gehad tijdens het beslisproces." msgstr "" "A revision was made to this application after it was submitted to the FEtC-H" -#: reviews/templates/reviews/review_detail_sidebar.html:114 +#: reviews/templates/reviews/review_detail_sidebar.html:116 msgid "Er zijn de volgende opmerkingen bijgevoegd:
    " msgstr "The following comments have been provided:
    " -#: reviews/templates/reviews/review_detail_sidebar.html:122 +#: reviews/templates/reviews/review_detail_sidebar.html:124 msgid "Documenten" msgstr "Documents" @@ -3949,7 +3965,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:264 +#: reviews/utils/review_actions.py:266 msgid "Verberg aanvraag uit het archief" msgstr "Remove this application from the archive" @@ -4018,30 +4034,34 @@ msgid "Toestemmingsdocument observatie" msgstr "Consent document for observation" #: reviews/utils/review_actions.py:118 +msgid "Pas jouw beslissing en/of commentaar aan" +msgstr "Edit your feedback on this proposal" + +#: reviews/utils/review_actions.py:120 msgid "Geef jouw beslissing en/of commentaar door" msgstr "Provide feedback on this proposal" -#: reviews/utils/review_actions.py:141 +#: reviews/utils/review_actions.py:143 msgid "Deze versie afhandelen" msgstr "Conclude this version" -#: reviews/utils/review_actions.py:169 +#: reviews/utils/review_actions.py:171 msgid "Beëindig definitief de afhandeling van deze aanvraag" msgstr "Discontinue assessment of this application" -#: reviews/utils/review_actions.py:197 +#: reviews/utils/review_actions.py:199 msgid "Verander aangestelde commissieleden" msgstr "Change appointment of committee members" -#: reviews/utils/review_actions.py:229 +#: reviews/utils/review_actions.py:231 msgid "Datum van bevestigingsbrief aanpassen" msgstr "Change date of confirmation letter" -#: reviews/utils/review_actions.py:266 +#: reviews/utils/review_actions.py:268 msgid "Plaats aanvraag in het archief." msgstr "Add this application to the archive" -#: reviews/utils/review_actions.py:283 +#: reviews/utils/review_actions.py:285 msgid "Startdatum wijzigen" msgstr "Edit start date" @@ -4182,11 +4202,11 @@ msgstr "My results" msgid "Openstaande besluiten commissieleden" msgstr "Pending decisions committee members" -#: reviews/views.py:203 +#: reviews/views.py:208 msgid "Openstaande besluiten eindverantwoordelijken" msgstr "Pending decisions supervisors" -#: reviews/views.py:600 +#: reviews/views.py:605 msgid "" "Deze aanvraag is al beoordeeld, dus je kan je beoordeling niet meer " "toevoegen/aanpassen" @@ -4570,11 +4590,21 @@ msgid "Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)" msgstr "" "Please upload the declaration of consent here (in .pdf or .doc(x)-format)" -#: studies/models.py:525 +#: studies/models.py:519 +msgid "" +"Als je de AVG grondslag 'Algemeen belang' gebruikt, en er helemaal geen " +"toestemmingsverklaring nodig is (ook niet voor bijzondere persoonsgegevens " +"of opnames), upload dan een leeg document in dit veld." +msgstr "" +"When the legal basis for your research is 'Public interest', and no " +"declarations of consent are required (neither for special categories of " +"data, nor for recordings), please upload an empty document in this field." + +#: studies/models.py:528 msgid "Upload hier de informatiebrief (in .pdf of .doc(x)-formaat)" msgstr "Please upload the information letter here (in .pdf or .doc(x)-format)" -#: studies/models.py:534 +#: studies/models.py:537 msgid "" "Upload hier de toestemmingsverklaring voor de leiding of het management van " "de instelling (in .pdf of .doc(x)-format)" @@ -4582,7 +4612,7 @@ msgstr "" "Please upload the declaration of consent for the management of the school or " "institution (in .pdf or .doc(x)-format)" -#: studies/models.py:539 +#: studies/models.py:542 msgid "" "Upload indien mogelijk een ondertekende versie van het document. Upload als " "deze nog niet bestaat een blanco versie, en stuur de ondertekende versie " @@ -4593,7 +4623,7 @@ msgstr "" "and follow up by sending a signed copy to the secretary of the FEtC-H once " "available." -#: studies/models.py:547 +#: studies/models.py:550 msgid "" "Upload hier de informatiebrief voor de leiding of het management van de " "instelling (in .pdf of .doc(x)-formaat)" @@ -4601,7 +4631,7 @@ msgstr "" "Please upload the the information letter for the management of the school or " "institution (in .pdf or .doc(x)-format)" -#: studies/models.py:557 +#: studies/models.py:560 msgid "" "Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ." "doc(x)-formaat)" diff --git a/proposals/models.py b/proposals/models.py index c5de4c55b..d73facb49 100644 --- a/proposals/models.py +++ b/proposals/models.py @@ -158,8 +158,8 @@ class Statuses(models.IntegerChoices): WMO_DECISION_MADE = 60, _("Aanvraag is beoordeeld door FETC-GW") class PracticeReasons(models.IntegerChoices): - COURSE = 1, _("om de portal te exploreren") - EXPLORATION = 2, _("in het kader van een cursus") + COURSE = 1, _("in het kader van een cursus") + EXPLORATION = 2, _("om de portal te exploreren") # Fields of a proposal reference_number = models.CharField( diff --git a/proposals/templates/proposals/proposal_data_management.html b/proposals/templates/proposals/proposal_data_management.html index 0dde106bd..5453e7f19 100644 --- a/proposals/templates/proposals/proposal_data_management.html +++ b/proposals/templates/proposals/proposal_data_management.html @@ -46,16 +46,22 @@

    {% trans "Data Management Plan" %}

    {% trans "Nuttige workshops:" %}

    {% blocktrans trimmed %} - Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop te volgen: + Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop/online training te volgen: {% endblocktrans %}

    {% blocktrans trimmed %} @@ -76,19 +82,12 @@

    {% trans "Privacy: AVG en GDPR" %}

    {% endblocktrans %} -

    {% trans "Nuttige workshops:" %}

    +

    {% trans "Nuttige informatie:" %}

    {% blocktrans trimmed %} - Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende workshop te volgen: + Voor vragen over privacy, zoals: "Wat zijn persoonlijke gegevens?" of "Wanneer mag ik mijn onderzoek anoniem noemen?", raden we je aan het Data Privacy Handboek te raadplegen. {% endblocktrans %}

    -

    {% blocktrans trimmed %} diff --git a/proposals/templates/proposals/table_with_header_diff.html b/proposals/templates/proposals/table_with_header_diff.html index a035042c8..5ebea6f95 100644 --- a/proposals/templates/proposals/table_with_header_diff.html +++ b/proposals/templates/proposals/table_with_header_diff.html @@ -8,8 +8,8 @@

    {% trans section_title %}

    - - + + {% if warning %} {% for row in rows|slice:":1" %} diff --git a/requirements.in b/requirements.in index 72c5bbfd2..8343939d2 100644 --- a/requirements.in +++ b/requirements.in @@ -26,4 +26,5 @@ python-magic pdftotext bpython black -djlint \ No newline at end of file +djlint +sentry-sdk[django] \ No newline at end of file diff --git a/requirements.txt b/requirements.txt index bceff8141..0dad18191 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,8 +1,8 @@ # -# This file is autogenerated by pip-compile with Python 3.10 +# This file is autogenerated by pip-compile with Python 3.9 # by the following command: # -# pip-compile requirements.in +# pip-compile -U # -e git+https://github.com/UiL-OTS-labs/python-docx2txt#egg=docx2txt # via -r requirements.in @@ -12,7 +12,7 @@ alabaster==0.7.16 # via sphinx arabic-reshaper==3.0.0 # via xhtml2pdf -asgiref==3.7.2 +asgiref==3.8.1 # via django asn1crypto==1.5.1 # via @@ -21,7 +21,7 @@ asn1crypto==1.5.1 # pyhanko-certvalidator babel==2.14.0 # via sphinx -black==24.2.0 +black==24.3.0 # via -r requirements.in blessed==1.20.0 # via curtsies @@ -30,7 +30,9 @@ bpython==0.24 cdh-django-core[federated-auth] @ git+https://github.com/CentreForDigitalHumanities/django-shared-core.git@v3.1.0 # via -r requirements.in certifi==2024.2.2 - # via requests + # via + # requests + # sentry-sdk cffi==1.16.0 # via cryptography chardet==5.2.0 @@ -81,9 +83,10 @@ django==3.2.25 # django-user-agents # djangorestframework # djangosaml2 + # sentry-sdk # sphinxcontrib-django # uil-django-core -django-auth-ldap==4.6.0 +django-auth-ldap==4.7.0 # via -r requirements.in django-braces==1.15.0 # via -r requirements.in @@ -99,7 +102,7 @@ django-simple-menu==2.1.3 # via -r requirements.in django-user-agents==0.4.0 # via -r requirements.in -djangorestframework==3.14.0 +djangorestframework==3.15.1 # via # -r requirements.in # uil-django-core @@ -133,17 +136,19 @@ idna==3.6 # via requests imagesize==1.4.1 # via sphinx +importlib-metadata==7.1.0 + # via sphinx jinja2==3.1.3 # via sphinx jsbeautifier==1.15.1 # via # cssbeautifier # djlint -json5==0.9.22 +json5==0.9.24 # via djlint lesscpy==0.15.1 # via uil-django-core -lxml==5.1.0 +lxml==5.2.0 # via svglib markupsafe==2.1.5 # via jinja2 @@ -165,7 +170,7 @@ pbr==6.0.0 # via sphinxcontrib-apidoc pdftotext==2.2.2 # via -r requirements.in -pillow==10.2.0 +pillow==10.3.0 # via # -r requirements.in # reportlab @@ -178,20 +183,20 @@ pprintpp==0.4.0 # via sphinxcontrib-django pscript==0.7.7 # via vbuild -pyasn1==0.5.1 +pyasn1==0.6.0 # via # pyasn1-modules # python-ldap -pyasn1-modules==0.3.0 +pyasn1-modules==0.4.0 # via python-ldap -pycparser==2.21 +pycparser==2.22 # via cffi pygments==2.17.2 # via # -r requirements.in # bpython # sphinx -pyhanko==0.23.0 +pyhanko==0.23.2 # via xhtml2pdf pyhanko-certvalidator==0.26.3 # via @@ -220,7 +225,6 @@ python-magic==0.4.27 pytz==2024.1 # via # django - # djangorestframework # pysaml2 pyxdg==0.28 # via bpython @@ -245,6 +249,8 @@ requests==2.31.0 # pysaml2 # sphinx # uil-django-core +sentry-sdk[django]==1.44.0 + # via -r requirements.in six==1.16.0 # via # blessed @@ -261,10 +267,7 @@ sphinx==7.2.6 # -r requirements.in # sphinx-rtd-theme # sphinxcontrib-apidoc - # sphinxcontrib-applehelp - # sphinxcontrib-devhelp # sphinxcontrib-django - # sphinxcontrib-htmlhelp # sphinxcontrib-jquery sphinx-rtd-theme==2.0.0 # via -r requirements.in @@ -307,6 +310,7 @@ typing-extensions==4.10.0 # asgiref # black # django-modeltranslation + # pypdf # qrcode tzlocal==5.2 # via pyhanko @@ -315,7 +319,9 @@ ua-parser==0.18.0 uritools==4.0.2 # via pyhanko-certvalidator urllib3==2.2.1 - # via requests + # via + # requests + # sentry-sdk user-agents==2.2.0 # via django-user-agents vbuild==0.8.2 @@ -333,3 +339,5 @@ xhtml2pdf==0.2.15 # via -r requirements.in xmlschema==2.5.1 # via pysaml2 +zipp==3.18.1 + # via importlib-metadata diff --git a/reviews/models.py b/reviews/models.py index 78ede667e..a86803074 100644 --- a/reviews/models.py +++ b/reviews/models.py @@ -178,6 +178,17 @@ def save(self, *args, **kwargs): super(Decision, self).save(*args, **kwargs) self.review.update_go(last_decision=self) + def is_final_decision(self): + """ + Checks if this is the final review in a reviewing round. + + Will always return True on Supervisor reviews. + """ + open_decisions = self.review.decision_set.filter( + go="", + ) + return open_decisions.count() < 2 + def __str__(self): return "Decision #%d by %s on %s: %s" % ( self.pk, diff --git a/reviews/templates/reviews/action_explaination.html b/reviews/templates/reviews/action_explaination.html index fd106c7fc..6ba47a1aa 100644 --- a/reviews/templates/reviews/action_explaination.html +++ b/reviews/templates/reviews/action_explaination.html @@ -49,10 +49,10 @@

    {% trans "Uitleg" %}

    -
    -

    {% trans "Uitleg secretaris" %}

    - +
    +{% endif %} diff --git a/reviews/templates/reviews/decision_form.html b/reviews/templates/reviews/decision_form.html index 0f0d8b9ff..8a1c5d85b 100644 --- a/reviews/templates/reviews/decision_form.html +++ b/reviews/templates/reviews/decision_form.html @@ -24,6 +24,13 @@

    {% trans "Aanvraag beoordelen" %}

    De aanvraag is hier in te zien (downloadt als PDF). {% endblocktrans %}

    + {% if decision.is_final_decision %} +
    + {% blocktrans trimmed %} + Attentie: jij bent de laatste beoordelaar van deze aanvraag. Daarom kun je na het versturen je oordeel en commentaar niet meer bewerken. Controleer je antwoorden goed. + {% endblocktrans %} +
    + {% endif %} {% else %}

    {% blocktrans trimmed with title=proposal.title %} diff --git a/reviews/templates/reviews/review_assign_form.html b/reviews/templates/reviews/review_assign_form.html index e639c5d94..3db20b2ba 100644 --- a/reviews/templates/reviews/review_assign_form.html +++ b/reviews/templates/reviews/review_assign_form.html @@ -31,7 +31,7 @@

    {% trans "Commissieleden aanstellen" %}

    {% blocktrans trimmed with title=review.proposal.title %}

    Kies hier de geschikte route en commissieleden voor de aanvraag {{ title }}. - klik hier voor een overzicht van de werkverdeling van deze commissie. + Klik hier voor een overzicht van de werkverdeling van deze commissie.

    {% endblocktrans %}
    -

    - {% blocktrans trimmed with proposal=review.proposal.title %} - Details van besluitvorming bij aanmelding {{ proposal }} - {% endblocktrans %} - - {{ review.proposal.reference_number }} -

    +

    {{ review.proposal.title }} - {{ review.proposal.reference_number }}

    diff --git a/reviews/templates/reviews/review_detail_sidebar.html b/reviews/templates/reviews/review_detail_sidebar.html index ce1dfadb8..fd6219f38 100644 --- a/reviews/templates/reviews/review_detail_sidebar.html +++ b/reviews/templates/reviews/review_detail_sidebar.html @@ -52,7 +52,7 @@

    {% trans "Details" %}

    {% if review.date_end %}
  • {% blocktrans trimmed with date_end=review.date_end|date:"j F Y, G:i" %} - Reviewronde beëindigd op + Laatste beoordeling ontvangen op
    {{ date_end }}. {% endblocktrans %} @@ -60,10 +60,12 @@

    {% trans "Details" %}

    {% endif %} {% if review.stage == review.Stages.CLOSED %}
  • - {% blocktrans trimmed with continuation=review.get_continuation_display %} + {% blocktrans trimmed with continuation=review.get_continuation_display date_reviewed=review.proposal.date_reviewed|date:"j F Y, G:i" %} Afhandeling:
    - {{ continuation }}. + {{ continuation }}, +
    + {{ date_reviewed }}. {% endblocktrans %}
    • {% if review.proposal.date_confirmed %} diff --git a/reviews/utils/review_actions.py b/reviews/utils/review_actions.py index 540f9a72c..a4ddb947b 100644 --- a/reviews/utils/review_actions.py +++ b/reviews/utils/review_actions.py @@ -85,14 +85,13 @@ def get_available_decision(self): user = self.user review = self.review - if review.stage != review.Stages.COMMISSION: + if review.stage in (review.Stages.COMMISSION, review.Stages.SUPERVISOR): return False try: decision = Decision.objects.get( review=review, reviewer=user, - go="", ) except Decision.DoesNotExist: return None @@ -115,7 +114,10 @@ def action_url(self): def description(self): decision = self.get_available_decision() - return _("Geef jouw beslissing en/of commentaar door") + if decision.go != "": + return _("Pas jouw beslissing en/of commentaar aan") + else: + return _("Geef jouw beslissing en/of commentaar door") class CloseReview(ReviewAction): diff --git a/studies/migrations/0028_alter_documents_informed_consent.py b/studies/migrations/0028_alter_documents_informed_consent.py new file mode 100644 index 000000000..b2f8cbfb8 --- /dev/null +++ b/studies/migrations/0028_alter_documents_informed_consent.py @@ -0,0 +1,29 @@ +# Generated by Django 3.2.20 on 2024-04-15 09:15 + +from django.db import migrations, models +import main.validators +import proposals.utils.proposal_utils + + +class Migration(migrations.Migration): + + dependencies = [ + ("studies", "0027_auto_20230227_1425"), + ] + + operations = [ + migrations.AlterField( + model_name="documents", + name="informed_consent", + field=models.FileField( + blank=True, + help_text="Als je de AVG grondslag 'Algemeen belang' gebruikt, en er helemaal geen toestemmingsverklaring nodig is (ook niet voor bijzondere persoonsgegevens of opnames), upload dan een leeg document in dit veld.", + storage=proposals.utils.proposal_utils.OverwriteStorage(), + upload_to=proposals.utils.proposal_utils.FilenameFactory( + "Informed_Consent" + ), + validators=[main.validators.validate_pdf_or_doc], + verbose_name="Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)", + ), + ), + ] diff --git a/studies/models.py b/studies/models.py index 8644113f0..b5463855c 100644 --- a/studies/models.py +++ b/studies/models.py @@ -515,6 +515,9 @@ class Documents(models.Model): informed_consent = models.FileField( _("Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"), + help_text=_( + "Als je de AVG grondslag 'Algemeen belang' gebruikt, en er helemaal geen toestemmingsverklaring nodig is (ook niet voor bijzondere persoonsgegevens of opnames), upload dan een leeg document in dit veld." + ), blank=True, validators=[validate_pdf_or_doc], upload_to=INFORMED_CONSENT_FILENAME,
    {% trans "Originele aanvraag" %}{% trans "Revisie/amendement" %}{% trans "Vorige aanvraag" %}{% trans "Huidige aanvraag" %}