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
c4c4b1b4
Commit
c4c4b1b4
authored
3 years ago
by
Julian
Browse files
Options
Downloads
Patches
Plain Diff
Use `count_as_missed_lesson` in ExcuseType forms and tables
parent
6ad97931
No related branches found
No related tags found
1 merge request
!274
Resolve "[Excuses] Excuse types that change absence count / are uncounted"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/forms.py
+2
-2
2 additions, 2 deletions
aleksis/apps/alsijil/forms.py
aleksis/apps/alsijil/tables.py
+4
-0
4 additions, 0 deletions
aleksis/apps/alsijil/tables.py
with
6 additions
and
2 deletions
aleksis/apps/alsijil/forms.py
+
2
−
2
View file @
c4c4b1b4
...
...
@@ -180,11 +180,11 @@ class ExtraMarkForm(forms.ModelForm):
class
ExcuseTypeForm
(
forms
.
ModelForm
):
layout
=
Layout
(
"
short_name
"
,
"
name
"
)
layout
=
Layout
(
"
short_name
"
,
"
name
"
,
"
count_as_missed_lesson
"
)
class
Meta
:
model
=
ExcuseType
fields
=
[
"
short_name
"
,
"
name
"
]
fields
=
[
"
short_name
"
,
"
name
"
,
"
count_as_missed_lesson
"
]
class
PersonOverviewForm
(
ActionForm
):
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/tables.py
+
4
−
0
View file @
c4c4b1b4
...
...
@@ -37,6 +37,10 @@ class ExcuseTypeTable(tables.Table):
name
=
tables
.
LinkColumn
(
"
edit_excuse_type
"
,
args
=
[
A
(
"
id
"
)])
short_name
=
tables
.
Column
()
count_as_absent
=
tables
.
BooleanColumn
(
verbose_name
=
_
(
"
Count as absent
"
),
accessor
=
"
count_as_missed_lesson
"
,
)
edit
=
tables
.
LinkColumn
(
"
edit_excuse_type
"
,
args
=
[
A
(
"
id
"
)],
...
...
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