Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Chronos
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-Chronos
Commits
3e3ad4ce
Verified
Commit
3e3ad4ce
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Allow absences for rooms and groups, too
parent
bbb98434
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!47
Advanced data in timetable views
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/chronos/migrations/0011_absence_for_groups_and_rooms.py
+33
-0
33 additions, 0 deletions
...s/chronos/migrations/0011_absence_for_groups_and_rooms.py
aleksis/apps/chronos/models.py
+4
-1
4 additions, 1 deletion
aleksis/apps/chronos/models.py
with
37 additions
and
1 deletion
aleksis/apps/chronos/migrations/0011_absence_for_groups_and_rooms.py
0 → 100644
+
33
−
0
View file @
3e3ad4ce
# Generated by Django 3.0.5 on 2020-04-13 15:07
from
django.db
import
migrations
,
models
import
django.db.models.deletion
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
'
chronos
'
,
'
0010_absence_reason_name
'
),
]
operations
=
[
migrations
.
RemoveField
(
model_name
=
'
absence
'
,
name
=
'
person
'
,
),
migrations
.
AddField
(
model_name
=
'
absence
'
,
name
=
'
group
'
,
field
=
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
related_name
=
'
absences
'
,
to
=
'
core.Group
'
),
),
migrations
.
AddField
(
model_name
=
'
absence
'
,
name
=
'
room
'
,
field
=
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
related_name
=
'
absences
'
,
to
=
'
chronos.Room
'
),
),
migrations
.
AddField
(
model_name
=
'
absence
'
,
name
=
'
teacher
'
,
field
=
models
.
ForeignKey
(
blank
=
True
,
null
=
True
,
on_delete
=
django
.
db
.
models
.
deletion
.
CASCADE
,
related_name
=
'
absences
'
,
to
=
'
core.Person
'
),
),
]
This diff is collapsed.
Click to expand it.
aleksis/apps/chronos/models.py
+
4
−
1
View file @
3e3ad4ce
...
...
@@ -629,7 +629,10 @@ class AbsenceReason(ExtensibleModel):
class
Absence
(
ExtensibleModel
):
reason
=
models
.
ForeignKey
(
"
AbsenceReason
"
,
on_delete
=
models
.
CASCADE
,
related_name
=
"
absences
"
)
person
=
models
.
ManyToManyField
(
"
core.Person
"
,
related_name
=
"
absences
"
)
teacher
=
models
.
ForeignKey
(
"
core.Person
"
,
on_delete
=
models
.
CASCADE
,
related_name
=
"
absences
"
,
null
=
True
,
blank
=
True
)
group
=
models
.
ForeignKey
(
"
core.Group
"
,
on_delete
=
models
.
CASCADE
,
related_name
=
"
absences
"
,
null
=
True
,
blank
=
True
)
room
=
models
.
ForeignKey
(
"
Room
"
,
on_delete
=
models
.
CASCADE
,
related_name
=
"
absences
"
,
null
=
True
,
blank
=
True
)
date_start
=
models
.
DateField
(
verbose_name
=
_
(
"
Effective start date of absence
"
),
null
=
True
)
date_end
=
models
.
DateField
(
verbose_name
=
_
(
"
Effective end date of absence
"
),
null
=
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