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
!68
Resolve "Add option to configure extra marks for personal notes"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Add option to configure extra marks for personal notes"
85-add-option-to-configure-extra-marks-for-personal-notes
into
master
Overview
14
Commits
12
Pipelines
6
Changes
2
Merged
Jonathan Weth
requested to merge
85-add-option-to-configure-extra-marks-for-personal-notes
into
master
4 years ago
Overview
14
Commits
12
Pipelines
6
Changes
2
Expand
Closes
#85 (closed)
Edited
4 years ago
by
Jonathan Weth
0
0
Merge request reports
Viewing commit
49718f69
Prev
Next
Show latest version
2 files
+
32
−
3
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
Verified
49718f69
[Lesson overview] Show extra marks of previous lesson
· 49718f69
Jonathan Weth
authored
4 years ago
aleksis/apps/alsijil/templates/alsijil/class_register/lesson.html
+
13
−
1
Options
@@ -60,7 +60,7 @@
<div
class=
"row"
>
<div
class=
"col s12 m12 l6 xl8"
>
{% with prev_lesson=lesson_period.prev prev_doc=prev_lesson.get_lesson_documentation %}
{% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses %}
{% with prev_doc=prev_lesson.get_lesson_documentation absences=prev_lesson.get_absences tardinesses=prev_lesson.get_tardinesses
extra_marks=prev_lesson.get_extra_marks
%}
{% if prev_doc %}
{% weekday_to_date prev_lesson.week prev_lesson.period.weekday as prev_date %}
@@ -99,6 +99,18 @@
<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 %}
<span>
{{ note.person }}{% if not forloop.last %},{% endif %}
</span>
{% endfor %}
</td>
</tr>
{% endfor %}
</table>
</div>
</div>
Loading