From f1a84307bc72e1e6855501c4b890105385cb86d6 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Tue, 9 Apr 2024 16:57:48 +0200 Subject: [PATCH 1/6] feat: add help text to Documents.informed_consent --- locale/en/LC_MESSAGES/django.po | 80 ++++++++++--------- .../0028_alter_documents_informed_consent.py | 20 +++++ studies/models.py | 1 + 3 files changed, 65 insertions(+), 36 deletions(-) create mode 100644 studies/migrations/0028_alter_documents_informed_consent.py diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 4af320ac4..94dd84501 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-03 12:31+0200\n" +"POT-Creation-Date: 2024-04-09 14:48+0200\n" "PO-Revision-Date: 2024-04-03 12:32+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -2102,21 +2102,28 @@ msgstr "" "funding, provided by Utrecht University." #: proposals/templates/proposals/proposal_data_management.html:46 -msgid "Nuttige informatie:" -msgstr "Useful information:" +msgid "Nuttige workshops:" +msgstr "Recommended workshops" #: proposals/templates/proposals/proposal_data_management.html:48 msgid "" -"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 "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." +"Als je dit nog niet gedaan hebt, wordt er sterk aangeraden om de volgende " +"workshop te volgen:" +msgstr "If you have not already done so, it is highly recommended you attend: " #: proposals/templates/proposals/proposal_data_management.html:53 +#, fuzzy +#| msgid "" +#| "
  • de workshop Handling personal data in research
    • " +msgid "" +"
  • de workshop Quick start to Research Data Management
    • " +msgstr "" +"
  • the workshop Handling personal data in research
    • " + +#: proposals/templates/proposals/proposal_data_management.html:61 msgid "" "Voor advies op het gebied van data management planning kun je contact " "opnemen met de datamanager GW, Frans de Liagre Böhl via datamanagement.gw@uu.nl, who is the data manager of " "the Faculty of Humanities." -#: proposals/templates/proposals/proposal_data_management.html:57 +#: proposals/templates/proposals/proposal_data_management.html:65 msgid "Privacy: AVG en GDPR" msgstr "Privacy: AVG and GDPR" -#: proposals/templates/proposals/proposal_data_management.html:59 +#: proposals/templates/proposals/proposal_data_management.html:67 msgid "" "Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt " "aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de " @@ -2144,7 +2151,7 @@ msgstr "" "regulation is in line with European GDPR privacy legislation." -#: proposals/templates/proposals/proposal_data_management.html:65 +#: proposals/templates/proposals/proposal_data_management.html:73 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:86 +#: proposals/templates/proposals/proposal_data_management.html:87 msgid "" "Voor advies op het gebied van privacy en de AVG kun je contact opnemen met " "de privacy officer van GW via privacy." @@ -3504,7 +3508,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" @@ -4579,11 +4583,15 @@ 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:518 +msgid "Bij algemeen belang, dien hier s.v.p. een leeg Word document in." +msgstr "In case of public interest, please upload an empty Word document." + +#: studies/models.py:526 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:535 msgid "" "Upload hier de toestemmingsverklaring voor de leiding of het management van " "de instelling (in .pdf of .doc(x)-format)" @@ -4591,7 +4599,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:540 msgid "" "Upload indien mogelijk een ondertekende versie van het document. Upload als " "deze nog niet bestaat een blanco versie, en stuur de ondertekende versie " @@ -4602,7 +4610,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:548 msgid "" "Upload hier de informatiebrief voor de leiding of het management van de " "instelling (in .pdf of .doc(x)-formaat)" @@ -4610,7 +4618,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:558 msgid "" "Upload hier de informatiebrief voor de ouders of verzorgers (in .pdf of ." "doc(x)-formaat)" @@ -5222,4 +5230,4 @@ msgstr "Task edited" #: tasks/views/task_views.py:56 msgid "Taak verwijderd" -msgstr "Task deleted" \ No newline at end of file +msgstr "Task deleted" 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..503d7afaf --- /dev/null +++ b/studies/migrations/0028_alter_documents_informed_consent.py @@ -0,0 +1,20 @@ +# Generated by Django 3.2.20 on 2024-04-09 12:48 + +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='Bij algemeen belang, dien hier s.v.p. een leeg Word document in.', 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..e50f3d875 100644 --- a/studies/models.py +++ b/studies/models.py @@ -515,6 +515,7 @@ class Documents(models.Model): informed_consent = models.FileField( _("Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)"), + help_text=_("Bij algemeen belang, dien hier s.v.p. een leeg Word document in."), blank=True, validators=[validate_pdf_or_doc], upload_to=INFORMED_CONSENT_FILENAME, From 134804e5b7688167aeaa66005ddeb0d038ef36a7 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 10 Apr 2024 11:48:01 +0200 Subject: [PATCH 2/6] formatting --- .../0028_alter_documents_informed_consent.py | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/studies/migrations/0028_alter_documents_informed_consent.py b/studies/migrations/0028_alter_documents_informed_consent.py index 503d7afaf..7e8a8651e 100644 --- a/studies/migrations/0028_alter_documents_informed_consent.py +++ b/studies/migrations/0028_alter_documents_informed_consent.py @@ -8,13 +8,22 @@ class Migration(migrations.Migration): dependencies = [ - ('studies', '0027_auto_20230227_1425'), + ("studies", "0027_auto_20230227_1425"), ] operations = [ migrations.AlterField( - model_name='documents', - name='informed_consent', - field=models.FileField(blank=True, help_text='Bij algemeen belang, dien hier s.v.p. een leeg Word document in.', storage=proposals.utils.proposal_utils.OverwriteStorage(), upload_to=proposals.utils.proposal_utils.FilenameFactory('Informed_Consent'), validators=[main.validators.validate_pdf_or_doc], verbose_name='Upload hier de toestemmingsverklaring (in .pdf of .doc(x)-formaat)'), + model_name="documents", + name="informed_consent", + field=models.FileField( + blank=True, + help_text="Bij algemeen belang, dien hier s.v.p. een leeg Word document in.", + 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)", + ), ), ] From ea2ab9bafc51c42cbf428c790f94e768c15d7fa4 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 10 Apr 2024 14:52:23 +0200 Subject: [PATCH 3/6] feat: added new link to DMP page --- locale/en/LC_MESSAGES/django.po | 43 ++++++----- .../proposals/proposal_data_management.html | 76 ++++++++++--------- 2 files changed, 66 insertions(+), 53 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index 94dd84501..a0c497152 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-09 14:48+0200\n" +"POT-Creation-Date: 2024-04-10 14:51+0200\n" "PO-Revision-Date: 2024-04-03 12:32+0200\n" "Last-Translator: Anna Asbury \n" "Language-Team: \n" @@ -2108,22 +2108,29 @@ msgstr "Recommended workshops" #: proposals/templates/proposals/proposal_data_management.html:48 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 -#, fuzzy -#| msgid "" -#| "
  • de workshop Handling personal data in research
    • " +#: 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 Handling personal data in research
    • " +"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 " @@ -2151,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 Data Privacy Handbook." -#: proposals/templates/proposals/proposal_data_management.html:87 +#: 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." diff --git a/proposals/templates/proposals/proposal_data_management.html b/proposals/templates/proposals/proposal_data_management.html index 65cd7e51c..90b9365ee 100644 --- a/proposals/templates/proposals/proposal_data_management.html +++ b/proposals/templates/proposals/proposal_data_management.html @@ -46,55 +46,61 @@

    {% 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 %} - 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. - {% endblocktrans %} -

    -

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

    -

    - {% blocktrans trimmed %} - Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de Nederlandse implementatie van het Europese GDPR. - {% endblocktrans %} -

    - -

    {% trans "Nuttige informatie:" %}

    -

    +

  • + {% blocktrans trimmed %} + De online training Write your DMP + {% endblocktrans %} +
    • + +

    + {% blocktrans trimmed %} + Voor advies op het gebied van data management planning kun je contact opnemen met de datamanager GW, Frans de Liagre Böhl via datamanagement.gw@uu.nl. + {% endblocktrans %} +

    +

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

    +

    + {% blocktrans trimmed %} + Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de Nederlandse implementatie van het Europese GDPR. + {% endblocktrans %} +

    + +

    {% trans "Nuttige informatie:" %}

    {% blocktrans trimmed %} - Voor advies op het gebied van privacy en de AVG kun je contact opnemen met de privacy officer van GW via privacy.gw@uu.nl. + 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 %}

    -
    - {% csrf_token %} - - {{ form.as_table }} -
    - {% include "base/form_buttons.html" %} -
    + +

    + {% blocktrans trimmed %} + Voor advies op het gebied van privacy en de AVG kun je contact opnemen met de privacy officer van GW via privacy.gw@uu.nl. + {% endblocktrans %} +

    +
    + {% csrf_token %} + + {{ form.as_table }} +
    + {% include "base/form_buttons.html" %} +
    {% endblock %} From 9a5cacd14ca62aa363744827dc440d0436accee0 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Wed, 10 Apr 2024 14:55:22 +0200 Subject: [PATCH 4/6] formatting --- .../proposals/proposal_data_management.html | 64 +++++++++---------- 1 file changed, 32 insertions(+), 32 deletions(-) diff --git a/proposals/templates/proposals/proposal_data_management.html b/proposals/templates/proposals/proposal_data_management.html index 90b9365ee..c64de4383 100644 --- a/proposals/templates/proposals/proposal_data_management.html +++ b/proposals/templates/proposals/proposal_data_management.html @@ -60,47 +60,47 @@

    {% trans "Nuttige workshops:" %}

    {% blocktrans trimmed %} De online training Write your DMP + {% endblocktrans %} + + +

    + {% blocktrans trimmed %} + Voor advies op het gebied van data management planning kun je contact opnemen met de datamanager GW, Frans de Liagre Böhl via datamanagement.gw@uu.nl. {% endblocktrans %} - - -

    - {% blocktrans trimmed %} - Voor advies op het gebied van data management planning kun je contact opnemen met de datamanager GW, Frans de Liagre Böhl via datamanagement.gw@uu.nl. - {% endblocktrans %} -

    -

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

    -

    - {% blocktrans trimmed %} - Wanneer je persoonsgebonden data verzamelt, zorg je er voor dat je je houdt aan de Algemene Verordening Gegevensbescherming, of AVG. Deze wet is de Nederlandse implementatie van het Europese GDPR. - {% endblocktrans %} -

    -
      -
    • +

      +

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

      +

      {% blocktrans trimmed %} - De autoriteit persoonsgegevens heeft GDPR. + {% endblocktrans %} +

      +
        +
      • + {% blocktrans trimmed %} + De autoriteit persoonsgegevens heeft uitgebreide informatie in het Nederlands over hoe de AVG dataverzameling beïnvloedt. + {% endblocktrans %} +
        • +
      +

      {% trans "Nuttige informatie:" %}

      +

      + {% blocktrans trimmed %} + 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 %} -

      • +

    -

    {% trans "Nuttige informatie:" %}

    {% blocktrans trimmed %} - 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. + Voor advies op het gebied van privacy en de AVG kun je contact opnemen met de privacy officer van GW via privacy.gw@uu.nl. {% endblocktrans %}

    - -

    - {% blocktrans trimmed %} - Voor advies op het gebied van privacy en de AVG kun je contact opnemen met de privacy officer van GW via privacy.gw@uu.nl. - {% endblocktrans %} -

    -
    - {% csrf_token %} - - {{ form.as_table }} -
    - {% include "base/form_buttons.html" %} -
    +
    + {% csrf_token %} + + {{ form.as_table }} +
    + {% include "base/form_buttons.html" %} +
    {% endblock %} From 0fe911a996ec9cc3ab595989437722e5f5707723 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Mon, 15 Apr 2024 10:52:50 +0200 Subject: [PATCH 5/6] fix: inconsistent capitalization --- proposals/templates/proposals/proposal_data_management.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/proposals/templates/proposals/proposal_data_management.html b/proposals/templates/proposals/proposal_data_management.html index c64de4383..5453e7f19 100644 --- a/proposals/templates/proposals/proposal_data_management.html +++ b/proposals/templates/proposals/proposal_data_management.html @@ -52,7 +52,7 @@

    {% trans "Nuttige workshops:" %}

    • {% blocktrans trimmed %} - de workshop Quick + De workshop Quick start to Research Data Management {% endblocktrans %}
      • From 4953267686bfc3630cb9303deb97ba028597db25 Mon Sep 17 00:00:00 2001 From: Edo Storm Date: Mon, 15 Apr 2024 11:26:29 +0200 Subject: [PATCH 6/6] fix: improve help text dor Documents.informed_consent --- locale/en/LC_MESSAGES/django.po | 33 ++++++++++++------- .../0028_alter_documents_informed_consent.py | 4 +-- studies/models.py | 4 ++- 3 files changed, 26 insertions(+), 15 deletions(-) diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index a0c497152..7be6e6b94 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-04-10 14:51+0200\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" @@ -2113,10 +2113,10 @@ msgstr "If you have not already done so, it is highly recommended you attend: " #: proposals/templates/proposals/proposal_data_management.html:54 msgid "" -"de workshop Quick start to Research Data Management" msgstr "" -"the workshop Quick start to Research Data Management" @@ -2124,7 +2124,7 @@ msgstr "" msgid "" "De online training Write your DMP" +"target=\"_blank\">Write your DMP" msgstr "" "The online training