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
Merge requests
!127
Resolve "Full register printout doesn't load in time"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Full register printout doesn't load in time"
129-full-register-printout-doesn-t-load-in-time
into
master
Overview
2
Commits
1
Pipelines
2
Changes
2
Merged
Jonathan Weth
requested to merge
129-full-register-printout-doesn-t-load-in-time
into
master
4 years ago
Overview
2
Commits
1
Pipelines
2
Changes
2
Expand
Closes
#129 (closed)
Edited
4 years ago
by
Jonathan Weth
0
0
Merge request reports
Compare
master
master (base)
and
latest version
latest version
17956598
1 commit,
4 years ago
2 files
+
67
−
61
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+
30
−
32
Options
@@ -316,40 +316,38 @@
</thead>
<tbody>
{% for note in person.personal_notes.all %}
{% if note.lesson_period in lesson_periods %}
{% if note.absent or note.late or note.remarks or note.extra_marks.all %}
{% weekday_to_date note.calendar_week note.lesson_period.period.weekday as note_date %}
<tr>
<td>
{{ note_date }}
</td>
<td>
{{ note.lesson_period.period.period }}
</td>
<td>
{{ note.lesson_period.get_subject.short_name }}
</td>
<td>
{{ note.lesson_period.get_teachers.first.short_name }}
</td>
<td>
{% if note.absent %}
{% trans 'Yes' %}
{% if note.excused %}
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
{% for note in person.filtered_notes %}
{% if note.absent or note.late or note.remarks or note.extra_marks.all %}
{% weekday_to_date note.calendar_week note.lesson_period.period.weekday as note_date %}
<tr>
<td>
{{ note_date }}
</td>
<td>
{{ note.lesson_period.period.period }}
</td>
<td>
{{ note.lesson_period.get_subject.short_name }}
</td>
<td>
{{ note.lesson_period.get_teachers.first.short_name }}
</td>
<td>
{% if note.absent %}
{% trans 'Yes' %}
{% if note.excused %}
{% if note.excuse_type %}
({{ note.excuse_type.short_name }})
{% else %}
({% trans 'e' %})
{% endif %}
{% endif %}
</td>
<td>
{% if note.late %}
{{
note.late }
}'
{
% endif %}
</td>
<td>
{% for extra_mark in note.extra_marks.all %}
{{
extra_mark
.short_name }}{%
i
f
not
forloop.last %},{% endif
%}
{
%
e
ndfor
%}
</td>
<td>
{{ note.remarks }}
</td>
<
/tr
>
{% endif %}
{% endif %}
<
/
td>
<td>
{% if
note.late
%
}
{
{ note.late }}'
{% endif %}
<
/
td>
<td>
{% for
extra_mark i
n
not
e.extra_marks.all
%}
{
{
e
xtra_mark.short_name }}{% if not forloop.last %},{% endif
%}
{% endfor %}
</td>
<
td>
{{ note.remarks }}
</td
>
</tr>
{% endif %}
{% endfor %}
</tbody>
Loading