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
898a7b84
Commit
898a7b84
authored
1 year ago
by
Hangzhi Yu
Browse files
Options
Downloads
Patches
Plain Diff
Correct the column order in the person statistics table
parent
1870ffa0
No related branches found
Branches containing commit
No related tags found
Tags containing commit
2 merge requests
!328
Resolve "Two columns in group statistics table are interchanged"
,
!323
Prepare release 3.0b0
Pipeline
#122251
failed
1 year ago
Stage: prepare
Stage: test
Stage: build
Stage: publish
Stage: docker
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
CHANGELOG.rst
+1
-0
1 addition, 0 deletions
CHANGELOG.rst
aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
+11
-9
11 additions, 9 deletions
...lsijil/templates/alsijil/partials/persons_with_stats.html
with
12 additions
and
9 deletions
CHANGELOG.rst
+
1
−
0
View file @
898a7b84
...
...
@@ -14,6 +14,7 @@ Fixed
* In some cases, pages showing the count of extra marks and lessons with custom excuse types of
persons threw an error.
* The redirection to generated class register PDF printouts did not work.
* Some columns in the table showing statistics for the members of a group were labled wrongly.
`3.0b0`_ - 2022-02-28
---------------------
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/templates/alsijil/partials/persons_with_stats.html
+
11
−
9
View file @
898a7b84
...
...
@@ -12,11 +12,13 @@
<th
rowspan=
"2"
>
{% trans "Name" %}
</th>
<th
rowspan=
"2"
>
{% trans "Primary group" %}
</th>
<th
colspan=
"{{ excuse_types.count|add:4 }}"
>
{% trans "Absences" %}
</th>
<th
colspan=
"{{ excuse_types_not_absent.count }}"
>
{% trans "Uncounted Absences" %}
</th>
<th
rowspan=
"2"
>
{% trans "Tardiness" %}
</th>
{% if excuse_types_not_absent %}
<th
colspan=
"{{ excuse_types_not_absent.count }}"
>
{% trans "Uncounted Absences" %}
</th>
{% endif %}
{% if extra_marks %}
<th
colspan=
"{{ extra_marks.count }}"
>
{% trans "Extra marks" %}
</th>
{% endif %}
<th
rowspan=
"2"
>
{% trans "Tardiness" %}
</th>
<th
rowspan=
"2"
></th>
</tr>
<tr
class=
"hide-on-large-only"
>
...
...
@@ -36,12 +38,12 @@
({{ excuse_type.short_name }})
</th>
{% endfor %}
<th
class=
"truncate chip-height"
>
{% trans "Tardiness" %}
</th>
{% for extra_mark in extra_marks %}
<th
class=
"chip-height"
>
{{ extra_mark.short_name }}
</th>
{% endfor %}
<th
class=
"truncate chip-height"
>
{% trans "Tardiness" %}
</th>
<th
rowspan=
"2"
></th>
</tr>
<tr
class=
"hide-on-med-and-down"
>
...
...
@@ -110,12 +112,6 @@
</span>
</td>
{% endfor %}
<td>
<span
class=
"chip orange white-text"
title=
"{% trans "
Tardiness
"
%}"
>
{% firstof person.tardiness|to_time|time:"H\h i\m" "–" %}
</span>
<span
class=
"chip orange white-text"
title=
"{% trans "
Count
of
tardiness
"
%}"
>
{{ person.tardiness_count }}
×
</span>
</td>
{% for extra_mark in extra_marks %}
<td>
<span
class=
"chip grey white-text"
title=
"{{ extra_mark.name }}"
>
...
...
@@ -123,6 +119,12 @@
</span>
</td>
{% endfor %}
<td>
<span
class=
"chip orange white-text"
title=
"{% trans "
Tardiness
"
%}"
>
{% firstof person.tardiness|to_time|time:"H\h i\m" "–" %}
</span>
<span
class=
"chip orange white-text"
title=
"{% trans "
Count
of
tardiness
"
%}"
>
{{ person.tardiness_count }}
×
</span>
</td>
<td>
<a
class=
"btn primary waves-effect waves-light"
href=
"{% url "
overview_person
"
person.pk
%}"
>
...
...
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