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
c94a142a
Verified
Commit
c94a142a
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Fix format and typo
parent
48521964
No related branches found
No related tags found
No related merge requests found
Pipeline
#4107
failed
4 years ago
Stage: test
Stage: build
Changes
1
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+52
-51
52 additions, 51 deletions
...apps/alsijil/templates/alsijil/class_register/lesson.html
with
52 additions
and
51 deletions
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+
52
−
51
View file @
c94a142a
...
...
@@ -131,64 +131,65 @@
{% if prev_doc and can_view_prev_lesson_documentation %}
{% weekday_to_date prev_lesson.week prev_lesson.period.weekday as prev_date %}
<div
class=
"col s12"
id=
"previous-lesson"
>
<div
class=
"card"
>
<div
class=
"card-content"
>
<div
class=
"card"
>
<div
class=
"card-content"
>
<span
class=
"card-title"
>
{% blocktrans %}Overview: Previous lesson{% endblocktrans %} ({{ prev_date }},
{% blocktrans with period=prev_lesson.period.period %}{{ period }}. period{% endblocktrans %})
</span>
<table>
{% if prev_doc.topic %}
<tr>
<th
class=
"collection-item"
>
{% trans "Lesson topic of previous lesson:" %}
</th>
<td>
{{ prev_doc.topic }}
</td>
</tr>
{% endif %}
<table>
{% if prev_doc.topic %}
<tr>
<th
class=
"collection-item"
>
{% trans "Lesson topic of previous lesson:" %}
</th>
<td>
{{ prev_doc.topic }}
</td>
</tr>
{% endif %}
{% if prev_doc.homework %}
<tr>
<th
class=
"collection-item"
>
{% trans "Homework for this lesson:" %}
</th>
<td>
{{ prev_doc.homework }}
</td>
</tr>
{% endif %}
{% if prev_doc.homework %}
<tr>
<th
class=
"collection-item"
>
{% trans "Homework for this lesson:" %}
</th>
<td>
{{ prev_doc.homework }}
</td>
</tr>
{% endif %}
{% if prev_doc.group_note %}
<tr>
<th
class=
"collection-item"
>
{% trans "Group notes for previous lesson:" %}
</th>
<td>
{{ prev_doc.group_note }}
</td>
</tr>
{% endif %}
{% if prev_doc.group_note %}
<tr>
<th
class=
"collection-item"
>
{% trans "Group notes for previous lesson:" %}
</th>
<td>
{{ prev_doc.group_note }}
</td>
</tr>
{% endif %}
{% if absences %}
<tr>
<th>
{% trans "Absent persons:" %}
</th>
<td>
{% include "alsijil/partials/absences.html" with notes=absences %}
</td>
</tr>
{% endif %}
{% if absences %}
<tr>
<th>
{% trans "Absent persons:" %}
</th>
<td>
{% include "alsijil/partials/absences.html" with notes=absences %}
</td>
</tr>
{% endif %}
{% if tardinesses %}
<tr>
<th>
{% trans "Late persons:" %}
</th>
<td>
{% include "alsijil/partials/tardinesses.html" with notes=tardinesses %}
</td>
</tr>
{% endif %}
{% if tardinesses %}
<tr>
<th>
{% trans "Late persons:" %}
</th>
<td>
{% include "alsijil/partials/tardinesses.html" with notes=tardinesses %}
</td>
</tr>
{% endif %}
{% for extra_mark, notes in extra_marks.items %}
<tr>
<th>
{{ extra_mark.name }}
</th>
<td>
{% for note in notes %}
{% has_perm "alsijil.view_personalnote" user note as can_view_personalnote %}
{% if can_view_personalnote %}
<span>
{{ note.person }}{% if not forloop.last %},{% endif %}
</span>
{% endif %}
{% endfor %}
</td>
</tr>
{% endfor %}
{% for extra_mark, notes in extra_marks.items %}
<tr>
<th>
{{ extra_mark.name }}
</th>
<td>
{% for note in notes %}
{% has_perm "alsijil.view_personalnote" user note as can_view_personalnote %}
{% if can_view_personalnote %}
<span>
{{ note.person }}{% if not forloop.last %},{% endif %}
</span>
{% endif %}
{% endfor %}
</td>
</tr>
{% endfor %}
</table>
</table>
</div>
</div>
</div>
{% endif %}
...
...
@@ -316,10 +317,10 @@
</div>
</div>
{% endif %}
</div>
</div>
{% if can_edit_lesson_documentation or can_edit_lesson_personalnote %}
<p>
{% include "core/partials/save_button.html" %}
</p>
{% endif %}
{% if can_edit_lesson_documentation or can_edit_lesson_personalnote %}
<p>
{% include "core/partials/save_button.html" %}
</p>
{% endif %}
</form>
{% endblock %}
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