text and minor fixes

UiL-OTS-labs · Nov 7, 2024 · b9ba480 · b9ba480
1 parent 2afb4bb
commit b9ba480
Show file tree

Hide file tree

Showing 6 changed files with 48 additions and 9 deletions.
diff --git 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
@@ -93,6 +93,30 @@
                     {{ experiment.leader_names }}
                 </td>
             </tr>
+            <tr>
+                <td>
+                    {% trans 'experiment:attribute:required_experiments' %}
+                </td>
+                <td>
+                    {% if experiment.required_experiments.all %}
+                        {{ experiment.required_experiments.all|join:', ' }}
+                    {% else %}
+                        -
+                    {% endif %}
+                </td>
+            </tr>
+            <tr>
+                <td>
+                    {% trans 'experiment:attribute:excluded_experiments' %}
+                </td>
+                <td>
+                    {% if experiment.excluded_experiments.all %}
+                        {{ experiment.excluded_experiments.all|join:', ' }}
+                    {% else %}
+                        -
+                    {% endif %}
+                </td>
+            </tr>
             <tr>
                 <td>
                     {% 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
@@ -31,13 +31,19 @@ <h3 class="d-inline">
     {% for appointment in appointments %}
         <tr>
             <td>
-                {{ appointment.participant.name }}
+                {% if not appointment.participant.deactivated %}
+                    <a href="{% url 'participants:detail' appointment.participant.pk %}">
+                {% endif %}
+                    {{ appointment.participant.name }}
+                {% if not appointment.participant.deactivated %}
+                    </a>
+                {% endif %}
             </td>
             <td data-order="{{ appointment.start|date:'U' }}">
                 {{ appointment.start|date:"l d M Y, H:i"|lower|capfirst }}
             </td>
             <td>
-                {{ appointment.get_outcome_display }}
+                {{ appointment.get_outcome_display|default_if_none:'-' }}
             </td>
         </tr>
     {% endfor %}

diff --git a/lab/experiments/templates/experiments/index.html b/lab/experiments/templates/experiments/index.html
@@ -54,7 +54,7 @@ <h1 class="h2">
                         {% trans "experiments:global:participants" %}
                     </th>
                     <th data-priority="100">
-                        Actions
+                        {% translate "experiments:globals:actions" %}
                     </th>
                 </tr>
             </thead>

diff --git 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"
+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"
diff --git a/lab/participants/templates/participants/detail.html b/lab/participants/templates/participants/detail.html
@@ -162,7 +162,7 @@ <h2>{% translate "participants:detail:appointments" %}</h2>
                         {{ appointment.location }}
                     </td>
                     <td>
-                        {{ appointment.get_outcome_display }}
+                        {{ appointment.get_outcome_display|default_if_none:'-' }}
                     </td>
                 </tr>
                 {% endfor %}