Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Kolego
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
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®
Onboarding
AlekSIS-App-Kolego
Merge requests
!52
Resolve "Only allow one absence at any point of time"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Only allow one absence at any point of time"
32-only-allow-one-absence-at-any-point-of-time
into
master
Overview
16
Commits
12
Pipelines
11
Changes
4
Merged
Hangzhi Yu
requested to merge
32-only-allow-one-absence-at-any-point-of-time
into
master
4 months ago
Overview
9
Commits
12
Pipelines
11
Changes
4
Expand
Closes
#32 (closed)
0
0
Merge request reports
Compare
master
version 9
c4ddcca2
4 months ago
version 8
8ced4059
4 months ago
version 7
6bf75d9c
4 months ago
version 6
6b58dad8
4 months ago
version 5
178874bc
4 months ago
version 4
01db56c4
4 months ago
version 3
4e97b71b
4 months ago
version 2
3e06c764
4 months ago
version 1
2f14ace5
4 months ago
master (base)
and
latest version
latest version
a7a6b029
12 commits,
4 months ago
version 9
c4ddcca2
10 commits,
4 months ago
version 8
8ced4059
8 commits,
4 months ago
version 7
6bf75d9c
6 commits,
4 months ago
version 6
6b58dad8
7 commits,
4 months ago
version 5
178874bc
3 commits,
4 months ago
version 4
01db56c4
3 commits,
4 months ago
version 3
4e97b71b
1 commit,
4 months ago
version 2
3e06c764
2 commits,
4 months ago
version 1
2f14ace5
1 commit,
4 months ago
4 files
+
396
−
1
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
4
Search (e.g. *.vue) (Ctrl+P)
aleksis/apps/kolego/migrations/0005_fix_overlapping_absences.py
0 → 100644
+
96
−
0
Options
# Generated by Django 4.2.13 on 2024-07-16 11:01
from
datetime
import
datetime
,
time
from
django.db
import
migrations
,
models
from
django.db.models
import
Q
def
_run_forward
(
apps
,
schema_editor
):
Absence
=
apps
.
get_model
(
"
kolego
"
,
"
Absence
"
)
for
absence
in
Absence
.
objects
.
order_by
(
"
-datetime_start
"
,
"
-date_start
"
):
# Convert dates of new event to datetimes in case dates are used
new_datetime_start
=
(
absence
.
datetime_start
if
absence
.
datetime_start
else
datetime
.
combine
(
absence
.
date_start
,
time
.
min
)
).
astimezone
(
absence
.
timezone
)
new_datetime_end
=
(
absence
.
datetime_end
if
absence
.
datetime_end
else
datetime
.
combine
(
absence
.
date_end
,
time
.
max
)
).
astimezone
(
absence
.
timezone
)
events_within
=
Absence
.
objects
.
filter
(
person
=
absence
.
person
,
).
filter
(
Q
(
datetime_start__lte
=
new_datetime_end
,
datetime_end__gte
=
new_datetime_start
)
|
Q
(
date_start__lte
=
new_datetime_end
.
date
(),
date_end__gte
=
new_datetime_start
.
date
())
)
for
event_within
in
events_within
:
event_within_datetime_start
=
(
event_within
.
datetime_start
if
event_within
.
datetime_start
else
datetime
.
combine
(
event_within
.
date_start
,
time
.
min
)
)
event_within_datetime_end
=
(
event_within
.
datetime_end
if
event_within
.
datetime_end
else
datetime
.
combine
(
event_within
.
date_end
,
time
.
max
)
)
# If overlapping absence has the same reason, just extend it
if
event_within
.
reason
==
absence
.
reason
:
event_within
.
datetime_start
=
min
(
new_datetime_start
,
event_within_datetime_start
)
event_within
.
datetime_end
=
max
(
new_datetime_end
,
event_within_datetime_end
)
event_within
.
save
()
else
:
if
(
new_datetime_start
>
event_within_datetime_start
and
new_datetime_end
<
event_within_datetime_end
):
# Cut existing event in two parts
# First, cut end date of existing one
event_within
.
datetime_end
=
new_datetime_start
event_within
.
save
()
# Then, create new event based on existing one filling up the remaining time
end_filler_event
=
event_within
end_filler_event
.
pk
=
None
end_filler_event
.
id
=
None
end_filler_event
.
calendarevent_ptr_id
=
None
end_filler_event
.
freebusy_ptr_id
=
None
end_filler_event
.
_state
.
adding
=
True
end_filler_event
.
datetime_start
=
new_datetime_end
end_filler_event
.
datetime_end
=
event_within_datetime_end
end_filler_event
.
save
()
elif
(
new_datetime_start
<=
event_within_datetime_start
and
new_datetime_end
>=
event_within_datetime_end
):
# Delete existing event
event_within
.
delete
()
elif
(
new_datetime_start
>
event_within_datetime_start
and
new_datetime_start
<
event_within_datetime_end
and
new_datetime_end
>=
event_within_datetime_end
):
# Cut end of existing event
event_within
.
datetime_end
=
new_datetime_start
event_within
.
save
()
elif
(
new_datetime_start
<=
event_within_datetime_start
and
new_datetime_end
<
event_within_datetime_end
and
new_datetime_end
>
event_within_datetime_start
):
# Cut start of existing event
event_within
.
datetime_start
=
new_datetime_end
event_within
.
save
()
class
Migration
(
migrations
.
Migration
):
dependencies
=
[
(
"
kolego
"
,
"
0004_absencereasontag_absencereason_tags
"
),
]
operations
=
[
migrations
.
RunPython
(
_run_forward
)]
Loading