Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Alsijil
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container Registry
Model registry
Operate
Environments
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
AlekSIS®
Official
AlekSIS-App-Alsijil
Commits
5d92d9f6
Commit
5d92d9f6
authored
4 months ago
by
permcu
Browse files
Options
Downloads
Patches
Plain Diff
Add missing loop over documentations in coursebook-printout
parent
a06da45a
No related branches found
Tags
2.0rc2
Tags containing commit
1 merge request
!422
Resolve "Add export functionality to course book"
Pipeline
#193757
failed
4 months ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
+66
-64
66 additions, 64 deletions
...sijil/templates/alsijil/partials/register_coursebook.html
with
66 additions
and
64 deletions
aleksis/apps/alsijil/templates/alsijil/partials/register_coursebook.html
+
66
−
64
View file @
5d92d9f6
...
...
@@ -16,80 +16,82 @@
</thead>
<tbody>
{% for day, documentations in group.documentations_by_day.items %}
<tr
class=
"
{% if doc.amends %}
{% if doc.amends.cancelled %}
lesson-cancelled
{% for doc in documentations %}
<tr
class=
"
{% if doc.amends %}
{% if doc.amends.cancelled %}
lesson-cancelled
{% endif %}
{% if doc.amends.amends %}
lesson-substituted
{% endif %}
{% endif %}
{% if
doc.amends.amends
%}
lesson
-substituted
{% if
forloop.first
%}
lesson
s-day-first
{% endif %}
"
>
{% if forloop.first %}
<!-- TODO: There is no lessons-day-head class -->
<th
rowspan=
"{{ documentations|length }}"
class=
"lessons-day-head"
>
{{ day|date:"D" }}
</th>
{% endif %}
<td
class=
"lesson-pe"
>
{% if doc.amends %}
{% if doc.amends.slot_number_start == doc.amends.slot_number_ends %}
{{ doc.amends.slot_number_start }}.
{% else %}
{{ doc.amends.slot_number_start }}.–{{ doc.amends.slot_number_end }}.
{% endif %}
{% if forloop.first %}
lessons-day-first
{% endif %}
"
>
{% if forloop.first %}
<!-- TODO: There is no lessons-day-head class -->
<th
rowspan=
"{{ documentations|length }}"
class=
"lessons-day-head"
>
{{ day|date:"D" }}
</th>
{% endif %}
<td
class=
"lesson-pe"
>
{% if doc.amends %}
{% if doc.amends.slot_number_start == doc.amends.slot_number_ends %}
{{ doc.amends.slot_number_start }}.
{% else %}
{{ doc.amends.slot_number_start }}.–{{ doc.amends.slot_number_end }}.
{% endif %}
{% else %}
{{ doc.datetime_start|time:"H:i" }}-{{ doc.datetime_end|time:"H:i" }}
{% endif %}
</td>
<td
class=
"lesson-subj"
>
{% include "chronos/partials/subject.html" with subject=doc.subject %}
</td>
<td
class=
"lesson-topic"
>
{{ doc.topic }}
</td>
<td
class=
"lesson-homework"
>
{{ doc.homework }}
</td>
<td
class=
"lesson-notes"
>
{{ documentation.group_note }}
{% for participation in doc.notable_participations %}
{% if participation.absence_reason %}
<span
class=
"lesson-note-absent"
>
{{ participation.person.short_name }}
<span
style=
"color: {{ participation.absence_reason.colour }};"
>
({{ participation.absence_reason.short_name }})
</span>
</span>
{{ doc.datetime_start|time:"H:i" }}-{{ doc.datetime_end|time:"H:i" }}
{% endif %}
{% if participation.tardiness %}
<span
class=
"lesson-note-late"
>
{{ participation.person.short_name }}
({{ participation.tardiness }}′)
</span>
{% endif %}
{% for personal_note in doc.personal_notes.all %}
{% if personal_note.extra_mark %}
<span>
{{ personal_note.person.short_name }}
({{ personal_note.extra_mark.short_name }})
</td>
<td
class=
"lesson-subj"
>
{% include "chronos/partials/subject.html" with subject=doc.subject %}
</td>
<td
class=
"lesson-topic"
>
{{ doc.topic }}
</td>
<td
class=
"lesson-homework"
>
{{ doc.homework }}
</td>
<td
class=
"lesson-notes"
>
{{ documentation.group_note }}
{% for participation in doc.notable_participations %}
{% if participation.absence_reason %}
<span
class=
"lesson-note-absent"
>
{{ participation.person.short_name }}
<span
style=
"color: {{ participation.absence_reason.colour }};"
>
({{ participation.absence_reason.short_name }})
</span>
</span>
{% endif %}
{% if p
ersonal_note.note
%}
<span>
{{ p
ersonal_note
.person.short_name }}
({{ p
ersonal_note.note
}})
{% if p
articipation.tardiness
%}
<span
class=
"lesson-note-late"
>
{{ p
articipation
.person.short_name }}
({{ p
articipation.tardiness
}}
′
)
</span>
{% endif %}
{% for personal_note in doc.personal_notes.all %}
{% if personal_note.extra_mark %}
<span>
{{ personal_note.person.short_name }}
({{ personal_note.extra_mark.short_name }})
</span>
{% endif %}
{% if personal_note.note %}
<span>
{{ personal_note.person.short_name }}
({{ personal_note.note }})
</span>
{% endif %}
{% endfor %}
{% endfor %}
{% endfor %}
</td
>
<td
class=
"lesson-te"
>
{% if documentation.topic %
}
{
{ doc.teachers.get_teachers_short_names|join:', ' }
}
{% endif %}
</t
d
>
</tr>
</td>
<td
class=
"lesson-te"
>
{% if documentation.topic %}
{{ doc.teachers.get_teachers_short_names|join:', ' }
}
{
% endif %
}
</td>
</t
r
>
{% endfor %}
{% endfor %}
</tbody>
</table>
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment