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
27284019
Verified
Commit
27284019
authored
4 years ago
by
Julian
Committed by
Jonathan Weth
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Include said table in the template and move statistics to another tab
parent
68ad7d31
No related branches found
No related tags found
1 merge request
!111
Resolve "[Person overview] Implement multiple selection for marking absences as excused or for deleting"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+13
-4
13 additions, 4 deletions
...apps/alsijil/templates/alsijil/class_register/person.html
with
13 additions
and
4 deletions
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+
13
−
4
View file @
27284019
...
...
@@ -5,6 +5,7 @@
{% load week_helpers %}
{% load i18n %}
{% load static %}
{% load render_table from django_tables2 %}
{% block extra_head %}
<link
rel=
"stylesheet"
href=
"{% static "
css
/
alsijil
/
person.css
"
%}"
>
...
...
@@ -38,8 +39,15 @@
{% endif %}
<div
class=
"row"
>
<div
class=
"col s12 m12 l6"
>
{% if stats %}
<div
class=
"col s12"
>
<ul
class=
"tabs"
>
<li
class=
"tab col s6"
><a
href=
"#overview"
class=
"active"
>
{% trans "Overview" %}
</a></li>
<li
class=
"tab col s6"
><a
href=
"#statistics"
>
{% trans "Statistics" %}
</a></li>
</ul>
</div>
{% endif %}
<div
class=
"col s12"
id=
"statistics"
>
<h5>
{% trans "Unexcused absences" %}
</h5>
<ul
class=
"collection"
>
...
...
@@ -82,7 +90,7 @@
form=
"excuse-multiple-form"
class=
"filled-in"
/>
<span></span>
</label>
<form
action=
""
method=
"post"
class=
"right hide-on-small-only"
style=
"margin-top: -7px;"
>
<form
action=
""
method=
"post"
class=
"right hide-on-small-only"
>
{% csrf_token %}
{% trans "Mark as" %}
<input
type=
"hidden"
value=
"{{ note.pk }}"
name=
"personal_note"
>
...
...
@@ -164,8 +172,9 @@
</ul>
{% endif %}
</div>
<div
class=
"col s12
m12 l6
"
>
<div
class=
"col s12
"
id=
"overview
"
>
<h5>
{% trans "Relevant personal notes" %}
</h5>
{% render_table personal_notes_table %}
<ul
class=
"collapsible"
>
<li>
<div>
...
...
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