diff --git a/lab/experiments/locale/nl/LC_MESSAGES/django.po b/lab/experiments/locale/nl/LC_MESSAGES/django.po index e61df628..8e08fa5e 100644 --- a/lab/experiments/locale/nl/LC_MESSAGES/django.po +++ b/lab/experiments/locale/nl/LC_MESSAGES/django.po @@ -117,7 +117,7 @@ msgstr "Bepaald of participanten zich kunnen opgeven voor dit experiment." #: experiments/models/experiment_models.py:136 msgid "experiment:attribute:excluded_experiments" -msgstr "Uitgesloten experimenten" +msgstr "Ongeoorloofde voorafgaande experimenten" #: experiments/models/experiment_models.py:138 msgid "experiment:attribute:excluded_experiments:help_text" @@ -937,7 +937,7 @@ msgid "experiments:forms:attachments" msgstr "Bijlagen" msgid "experiments:appointment:outcome:completed" -msgstr "Vooltoid" +msgstr "Voltooid" #: experiments/models/appointment_models.py:34 msgid "experiments:appointment:outcome:noshow" diff --git a/lab/experiments/templates/experiments/detail_parts/info.html b/lab/experiments/templates/experiments/detail_parts/info.html index 99487201..ac4f27c5 100644 --- a/lab/experiments/templates/experiments/detail_parts/info.html +++ b/lab/experiments/templates/experiments/detail_parts/info.html @@ -93,6 +93,30 @@ {{ experiment.leader_names }} + + + {% trans 'experiment:attribute:required_experiments' %} + + + {% if experiment.required_experiments.all %} + {{ experiment.required_experiments.all|join:', ' }} + {% else %} + - + {% endif %} + + + + + {% trans 'experiment:attribute:excluded_experiments' %} + + + {% if experiment.excluded_experiments.all %} + {{ experiment.excluded_experiments.all|join:', ' }} + {% else %} + - + {% endif %} + + {% trans 'experiment:attribute:responsible_researcher' %} diff --git a/lab/experiments/templates/experiments/detail_parts/participants.html b/lab/experiments/templates/experiments/detail_parts/participants.html index 2f0ab57e..c8aadd9f 100644 --- a/lab/experiments/templates/experiments/detail_parts/participants.html +++ b/lab/experiments/templates/experiments/detail_parts/participants.html @@ -31,13 +31,19 @@

{% for appointment in appointments %} - {{ appointment.participant.name }} + {% if not appointment.participant.deactivated %} + + {% endif %} + {{ appointment.participant.name }} + {% if not appointment.participant.deactivated %} + + {% endif %} {{ appointment.start|date:"l d M Y, H:i"|lower|capfirst }} - {{ appointment.get_outcome_display }} + {{ appointment.get_outcome_display|default_if_none:'-' }} {% endfor %} diff --git a/lab/experiments/templates/experiments/index.html b/lab/experiments/templates/experiments/index.html index 8fec16b9..d72975dc 100644 --- a/lab/experiments/templates/experiments/index.html +++ b/lab/experiments/templates/experiments/index.html @@ -54,7 +54,7 @@

{% trans "experiments:global:participants" %} - Actions + {% translate "experiments:globals:actions" %} diff --git a/lab/participants/locale/nl/LC_MESSAGES/django.po b/lab/participants/locale/nl/LC_MESSAGES/django.po index 7d333788..c7064711 100644 --- a/lab/participants/locale/nl/LC_MESSAGES/django.po +++ b/lab/participants/locale/nl/LC_MESSAGES/django.po @@ -409,8 +409,8 @@ msgstr "klik om weer te geven" #: participants/templates/participants/delete.html:24 msgid "participants:delete:delete:text" msgstr "" -"Deze participant heeft nooit met een experiment meegedaan en mag dus " -"veilig verwijderd worden vanuit de database." +"Deze participant heeft nooit met een experiment meegedaan en kan dus " +"veilig verwijderd worden uit de database." #: participants/templates/participants/delete.html:27 msgid "participants:delete:delete:prompt" @@ -424,4 +424,13 @@ msgstr "" "Deze participant heeft bij een of meer experimenten mee gedaan en kan niet verwijderen worden: " msgid "participants:delete:deactivate:prompt" -msgstr "U kunt alsnog de participant deactiveren" \ No newline at end of file +msgstr "U kunt alsnog de participant deactiveren" + +msgid "participant:attribute:parent_first_name" +msgstr "Voorname ouder" + +msgid "participant:attribute:parent_last_name" +msgstr "Achternaam ouder" + +msgid "participant:attribute:save_longer" +msgstr "Gegevens mogen tot 10 jaar bewaard worden" \ No newline at end of file diff --git a/lab/participants/templates/participants/detail.html b/lab/participants/templates/participants/detail.html index 2bd3fa14..dd75fa5a 100644 --- a/lab/participants/templates/participants/detail.html +++ b/lab/participants/templates/participants/detail.html @@ -162,7 +162,7 @@

{% translate "participants:detail:appointments" %}

{{ appointment.location }} - {{ appointment.get_outcome_display }} + {{ appointment.get_outcome_display|default_if_none:'-' }} {% endfor %}