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
94f525d9
Commit
94f525d9
authored
3 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Plain Diff
Merge branch '190-fix-translations-in-person-overview' into 'master'
Resolve "Fix translations in person overview" Closes
#190
See merge request
!232
parents
b0f06ae4
4cfc5de4
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!232
Resolve "Fix translations in person overview"
Pipeline
#32865
failed
3 years ago
Stage: test
Stage: build
Stage: publish
Changes
3
Pipelines
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
CHANGELOG.rst
+8
-0
8 additions, 0 deletions
CHANGELOG.rst
aleksis/apps/alsijil/tables.py
+4
-4
4 additions, 4 deletions
aleksis/apps/alsijil/tables.py
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+1
-1
1 addition, 1 deletion
...apps/alsijil/templates/alsijil/class_register/person.html
with
13 additions
and
5 deletions
CHANGELOG.rst
+
8
−
0
View file @
94f525d9
...
...
@@ -6,6 +6,14 @@ All notable changes to this project will be documented in this file.
The format is based on `Keep a Changelog`_,
and this project adheres to `Semantic Versioning`_.
Unreleased
----------
Fixed
~~~~~
* Translate table columns and filter button on person overview page.
`2.0rc6`_ - 2021-08-25
----------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/tables.py
+
4
−
4
View file @
94f525d9
...
...
@@ -105,10 +105,10 @@ class PersonalNoteTable(tables.Table):
order_by
=
A
(
"
order_teachers
"
),
)
subject
=
tables
.
Column
(
verbose_name
=
_
(
"
Subject
"
),
accessor
=
A
(
"
subject
"
))
absent
=
tables
.
Column
()
late
=
tables
.
Column
()
absent
=
tables
.
Column
(
verbose_name
=
_
(
"
Absent
"
)
)
late
=
tables
.
Column
(
verbose_name
=
_
(
"
Tardiness
"
)
)
excused
=
tables
.
Column
(
verbose_name
=
_
(
"
Excuse
"
))
extra_marks
=
tables
.
Column
(
verbose_name
=
"
Extra marks
"
,
accessor
=
A
(
"
extra_marks__all
"
))
extra_marks
=
tables
.
Column
(
verbose_name
=
_
(
"
Extra marks
"
)
,
accessor
=
A
(
"
extra_marks__all
"
))
def
render_groups
(
self
,
value
,
record
):
if
isinstance
(
record
.
register_object
,
LessonPeriod
):
...
...
@@ -126,7 +126,7 @@ class PersonalNoteTable(tables.Table):
return
(
render_to_string
(
"
components/materialize-chips.html
"
,
dict
(
content
=
"
Absent
"
,
classes
=
"
red white-text
"
),
dict
(
content
=
_
(
"
Absent
"
)
,
classes
=
"
red white-text
"
),
)
if
value
else
"
–
"
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/templates/alsijil/class_register/person.html
+
1
−
1
View file @
94f525d9
...
...
@@ -88,7 +88,7 @@
{% if can_mark_all_as_excused %} medium-high-right {% endif %}"
data-target=
"filter-modal"
type=
"button"
>
Filter results ({{ num_filters }})
<i
class=
"material-icons right"
>
filter_alt
</i>
{% trans "
Filter results
" %}
({{ num_filters }})
<i
class=
"material-icons right"
>
filter_alt
</i>
</button>
</div>
<form
action=
""
method=
"post"
class=
""
>
...
...
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