Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
A
AlekSIS-App-Untis
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-Untis
Commits
814ffe64
Verified
Commit
814ffe64
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Improve import of time periods and breaks
parent
4db39687
No related branches found
No related tags found
1 merge request
!13
Resolve "Support import from MySQL"
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/untis/util/mysql/importers/common_data.py
+21
-9
21 additions, 9 deletions
aleksis/apps/untis/util/mysql/importers/common_data.py
with
21 additions
and
9 deletions
aleksis/apps/untis/util/mysql/importers/common_data.py
+
21
−
9
View file @
814ffe64
...
@@ -336,7 +336,7 @@ def import_supervision_areas() -> Dict[int, chronos_models.SupervisionArea]:
...
@@ -336,7 +336,7 @@ def import_supervision_areas() -> Dict[int, chronos_models.SupervisionArea]:
def
import_time_periods_and_breaks
()
->
List
[
List
[
chronos_models
.
TimePeriod
]]:
def
import_time_periods_and_breaks
()
->
List
[
List
[
chronos_models
.
TimePeriod
]]:
"""
Import time periods an breaks
"""
"""
Import time periods an breaks
"""
time_periods_
ref
=
[]
ref
=
[]
periods
=
(
periods
=
(
run_default_filter
(
mysql_models
.
Commondata
.
objects
,
filter_term
=
False
)
run_default_filter
(
mysql_models
.
Commondata
.
objects
,
filter_term
=
False
)
.
filter
(
id
=
40
)
# Fixed UNTIS constant
.
filter
(
id
=
40
)
# Fixed UNTIS constant
...
@@ -349,23 +349,30 @@ def import_time_periods_and_breaks() -> List[List[chronos_models.TimePeriod]]:
...
@@ -349,23 +349,30 @@ def import_time_periods_and_breaks() -> List[List[chronos_models.TimePeriod]]:
start_time
=
time
(
time_period
.
fieldbyte1
,
time_period
.
fieldbyte2
)
start_time
=
time
(
time_period
.
fieldbyte1
,
time_period
.
fieldbyte2
)
end_time
=
time
(
time_period
.
fieldbyte3
,
time_period
.
fieldbyte4
)
end_time
=
time
(
time_period
.
fieldbyte3
,
time_period
.
fieldbyte4
)
logger
.
info
(
"
Import time period on weekday {} in the {}. period
"
.
format
(
weekday
,
period
))
new_time_period
,
created
=
chronos_models
.
TimePeriod
.
objects
.
get_or_create
(
new_time_period
,
created
=
chronos_models
.
TimePeriod
.
objects
.
get_or_create
(
weekday
=
weekday
,
weekday
=
weekday
,
period
=
period
,
period
=
period
,
defaults
=
{
"
time_start
"
:
start_time
,
"
time_end
"
:
end_time
},
defaults
=
{
"
time_start
"
:
start_time
,
"
time_end
"
:
end_time
},
)
)
new_time_period
.
time_start
=
start_time
if
created
:
new_time_period
.
time_end
=
end_time
logger
.
info
(
"
New time period created
"
)
new_time_period
.
save
()
if
new_time_period
.
time_start
!=
start_time
or
new_time_period
.
time_end
!=
end_time
:
new_time_period
.
time_start
=
start_time
new_time_period
.
time_end
=
end_time
new_time_period
.
save
()
logger
.
info
(
"
Time period updated
"
)
# Build index with time periods
# Build index with time periods
if
len
(
time_periods_
ref
)
<
weekday
+
1
:
if
len
(
ref
)
<
weekday
+
1
:
time_periods_
ref
.
append
([])
ref
.
append
([])
time_periods_
ref
[
weekday
].
append
(
new_time_period
)
ref
[
weekday
].
append
(
new_time_period
)
# Build breaks for all weekdays
# Build breaks for all weekdays
for
weekday
,
time_periods
in
enumerate
(
time_periods_
ref
):
for
weekday
,
time_periods
in
enumerate
(
ref
):
# Add None two times in order to create breaks before first lesson and after last lesson
# Add None two times in order to create breaks before first lesson and after last lesson
time_periods
=
[
None
]
+
time_periods
+
[
None
]
time_periods
=
[
None
]
+
time_periods
+
[
None
]
...
@@ -383,10 +390,15 @@ def import_time_periods_and_breaks() -> List[List[chronos_models.TimePeriod]]:
...
@@ -383,10 +390,15 @@ def import_time_periods_and_breaks() -> List[List[chronos_models.TimePeriod]]:
before_period
.
period
if
before_period
else
"
-
"
,
before_period
.
period
if
before_period
else
"
-
"
,
)
)
logger
.
info
(
"
Generate break {}
"
.
format
(
short_name
))
new_break
,
created
=
chronos_models
.
Break
.
objects
.
get_or_create
(
new_break
,
created
=
chronos_models
.
Break
.
objects
.
get_or_create
(
after_period
=
after_period
,
after_period
=
after_period
,
before_period
=
before_period
,
before_period
=
before_period
,
defaults
=
{
"
short_name
"
:
short_name
,
"
name
"
:
short_name
},
defaults
=
{
"
short_name
"
:
short_name
,
"
name
"
:
short_name
},
)
)
return
time_periods_ref
if
created
:
logger
.
info
(
"
New break created
"
)
return
ref
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