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
af3dcfb3
Verified
Commit
af3dcfb3
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Use weekday_to_date instead of period_to_date everywhere
parent
f128bb25
No related branches found
Branches containing commit
No related tags found
1 merge request
!80
Resolve "Add student view with further information"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+2
-3
2 additions, 3 deletions
...apps/alsijil/templates/alsijil/class_register/person.html
aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+1
-1
1 addition, 1 deletion
...s/apps/alsijil/templates/alsijil/print/full_register.html
with
3 additions
and
4 deletions
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+
2
−
3
View file @
af3dcfb3
...
...
@@ -20,7 +20,7 @@
<ul
class=
"collection"
>
{% for note in unexcused_absences %}
{%
period
_to_date note.week note.lesson_period.period as note_date %}
{%
weekday
_to_date note.
calendar_
week note.lesson_period.period
.weekday
as note_date %}
<li
class=
"collection-item"
>
<form
action=
""
method=
"post"
class=
"right"
style=
"margin-top: -7px;"
>
{% csrf_token %}
...
...
@@ -63,8 +63,7 @@
<strong>
{% blocktrans with week=note.week %}Week {{ week }}{% endblocktrans %}
</strong>
</li>
{% endifchanged %}
{% period_to_date note.week note.lesson_period.period as note_date %}
{% weekday_to_date note.calendar_week note.lesson_period.period.weekday as note_date %}
{% ifchanged note_date %}
<li
class=
"collection-item"
>
<form
action=
""
method=
"post"
class=
"right"
style=
"margin-top: -7px;"
>
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/templates/alsijil/print/full_register.html
+
1
−
1
View file @
af3dcfb3
...
...
@@ -319,7 +319,7 @@
{% 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 %}
{%
period
_to_date note.week note.lesson_period.period as note_date %}
{%
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>
...
...
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