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
056f8fca
Verified
Commit
056f8fca
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Add model for excuse type
parent
3cb069cd
No related branches found
No related tags found
1 merge request
!64
Resolve "Add support for multiple excuse types"
Pipeline
#3019
passed
4 years ago
Stage: test
Stage: build
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/alsijil/migrations/0002_excuse_type.py
+40
-0
40 additions, 0 deletions
aleksis/apps/alsijil/migrations/0002_excuse_type.py
aleksis/apps/alsijil/models.py
+16
-0
16 additions, 0 deletions
aleksis/apps/alsijil/models.py
with
56 additions
and
0 deletions
aleksis/apps/alsijil/migrations/0002_excuse_type.py
0 → 100644
+
40
−
0
View file @
056f8fca
# Generated by Django 3.0.8 on 2020-07-10 10:46
import
django.contrib.postgres.fields.jsonb
import
django.contrib.sites.managers
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
sites
'
,
'
0002_alter_domain_unique
'
),
(
'
alsijil
'
,
'
0001_initial
'
),
]
operations
=
[
migrations
.
CreateModel
(
name
=
'
ExcuseType
'
,
fields
=
[
(
'
id
'
,
models
.
AutoField
(
auto_created
=
True
,
primary_key
=
True
,
serialize
=
False
,
verbose_name
=
'
ID
'
)),
(
'
extended_data
'
,
django
.
contrib
.
postgres
.
fields
.
jsonb
.
JSONField
(
default
=
dict
,
editable
=
False
)),
(
'
short_name
'
,
models
.
CharField
(
max_length
=
255
,
unique
=
True
,
verbose_name
=
'
Short name
'
)),
(
'
name
'
,
models
.
CharField
(
max_length
=
255
,
unique
=
True
,
verbose_name
=
'
Name
'
)),
(
'
site
'
,
models
.
ForeignKey
(
default
=
1
,
editable
=
False
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
to
=
'
sites.Site
'
)),
],
options
=
{
'
verbose_name
'
:
'
Excuse type
'
,
'
verbose_name_plural
'
:
'
Excuse types
'
,
'
ordering
'
:
[
'
name
'
],
},
managers
=
[
(
'
objects
'
,
django
.
contrib
.
sites
.
managers
.
CurrentSiteManager
()),
],
),
migrations
.
AddField
(
model_name
=
'
personalnote
'
,
name
=
'
excuse_type
'
,
field
=
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
SET_NULL
,
to
=
'
alsijil.ExcuseType
'
,
verbose_name
=
'
Excuse type
'
),
),
]
This diff is collapsed.
Click to expand it.
aleksis/apps/alsijil/models.py
+
16
−
0
View file @
056f8fca
...
...
@@ -8,6 +8,21 @@ def isidentifier(value: str) -> bool:
return
value
.
isidentifier
()
class
ExcuseType
(
ExtensibleModel
):
"""
An type of excuse.
Can be used to count different types of absences separately.
"""
short_name
=
models
.
CharField
(
max_length
=
255
,
unique
=
True
,
verbose_name
=
_
(
"
Short name
"
))
name
=
models
.
CharField
(
max_length
=
255
,
unique
=
True
,
verbose_name
=
_
(
"
Name
"
))
class
Meta
:
ordering
=
[
"
name
"
]
verbose_name
=
_
(
"
Excuse type
"
)
verbose_name_plural
=
_
(
"
Excuse types
"
)
class
PersonalNote
(
ExtensibleModel
):
"""
A personal note about a single person.
...
...
@@ -27,6 +42,7 @@ class PersonalNote(ExtensibleModel):
absent
=
models
.
BooleanField
(
default
=
False
)
late
=
models
.
IntegerField
(
default
=
0
)
excused
=
models
.
BooleanField
(
default
=
False
)
excuse_type
=
models
.
ForeignKey
(
ExcuseType
,
on_delete
=
models
.
SET_NULL
,
null
=
True
,
blank
=
True
,
verbose_name
=
_
(
"
Excuse type
"
))
remarks
=
models
.
CharField
(
max_length
=
200
,
blank
=
True
)
...
...
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