diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html index 977ebf40292743a86a8ad91a0ccac1364153032d..c9d21a665fb691b02a6d08a0e7ab3f755cdbbca0 100644 --- a/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html +++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html @@ -13,7 +13,7 @@ </tr> </thead> <tbody> - {% for day, documentations in documentations_by_day %} + {% for day, documentations in group.documentations_by_day %} <tr class=" {% if doc.amends %} {% if doc.amends.cancelled %} diff --git a/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html b/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html index 549be02d4a89c1bf3f3bd918abb43cd45b968016..28ed5ceac5b243881313bfee9ad393fbeb072c13 100644 --- a/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html +++ b/aleksis/apps/alsijil/templates/alsijil/partials/register_members_table.html @@ -27,7 +27,7 @@ </thead> <tbody> - {% for person in members %} + {% for person in group.members_with_stats %} <tr> <td>{{ forloop.counter }}</td> <td>{{ person.last_name }}</td> diff --git a/aleksis/apps/alsijil/templates/alsijil/print/register_for_group.html b/aleksis/apps/alsijil/templates/alsijil/print/register_for_group.html index b784596e4c2842cb1afffe490945be4070e288b4..8b2f811082147e80c42bf74e404c376dbe37d963 100644 --- a/aleksis/apps/alsijil/templates/alsijil/print/register_for_group.html +++ b/aleksis/apps/alsijil/templates/alsijil/print/register_for_group.html @@ -11,45 +11,47 @@ {% endblock %} {% block content %} - {% if include_cover %} - {% include "alsijil/partials/register_cover.html" %} - {% endif %} + {% for group in groups %} + {% if include_cover %} + {% include "alsijil/partials/register_cover.html" %} + {% endif %} + + <div class="page-break"> </div> - <div class="page-break"> </div> - - {% if include_abbreviations %} - {% include "alsijil/partials/register_abbreviations.html" %} - {% endif %} + {% if include_abbreviations %} + {% include "alsijil/partials/register_abbreviations.html" %} + {% endif %} - <div class="page-break"> </div> + <div class="page-break"> </div> - {% if include_members_table %} - {% include "alsijil/partials/register_members_table.html" %} - {% endif %} + {% if include_members_table %} + {% include "alsijil/partials/register_members_table.html" %} + {% endif %} - <div class="page-break"> </div> + <div class="page-break"> </div> + + {% if include_teachers_and_subjects_table %} + {% if group.courses %} + <h4>{% trans 'Teachers and lessons in group' %} {{ group.name }}</h4> + {% include "alsijil/partials/register_teachers_and_subjects_table.html" with groups=[group] only %} + <div class="page-break"> </div> + {% endif %} + {% if group.child_groups %} + <h4>{% trans 'Teachers and lessons in child groups' %}</h4> + {% include "alsijil/partials/register_teachers_and_subjects_table.html" with groups=group.child_groups only %} + <div class="page-break"> </div> + {% endif %} + {% endif %} - {% if include_teachers_and_subjects_table %} - {% if group.courses %} - <h4>{% trans 'Teachers and lessons in group' %} {{ group.name }}</h4> - {% include "alsijil/partials/register_teachers_and_subjects_table.html" with groups=[group] only %} - <div class="page-break"> </div> + {% if include_person_overviews %} + {% for person in group.members_with_stats %} + {% include "alsijil/partials/person_overview.html with person=person only %} + <div class="page-break"> </div> + {% endfor %} {% endif %} - {% if group.child_groups %} - <h4>{% trans 'Teachers and lessons in child groups' %}</h4> - {% include "alsijil/partials/register_teachers_and_subjects_table.html" with groups=group.child_groups only %} - <div class="page-break"> </div> + + {% if include_coursebook %} + {% include "alsijil/partials/register_coursebook.html" %} {% endif %} - {% endif %} - - {% if include_person_overviews %} - {% for person in members %} - {% include "alsijil/partials/person_overview.html with person=person only %} - <div class="page-break"> </div> - {% endfor %} - {% endif %} - - {% if include_coursebook %} - {% include "alsijil/partials/register_coursebook.html" %} - {% endif %} + {% endfor %} {% endblock %}