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
Merge requests
!13
Resolve "Support import from MySQL"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Support import from MySQL"
4-support-import-from-mysql
into
master
Overview
3
Commits
62
Pipelines
0
Changes
2
1 unresolved thread
Hide all comments
Merged
Tom Teichler
requested to merge
4-support-import-from-mysql
into
master
5 years ago
Overview
3
Commits
62
Pipelines
0
Changes
2
1 unresolved thread
Hide all comments
Expand
Closes
#4 (closed)
Edited
4 years ago
by
Jonathan Weth
0
0
Merge request reports
Viewing commit
d07e75d9
Prev
Next
Show latest version
2 files
+
40
−
7
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
2
Search (e.g. *.vue) (Ctrl+P)
Verified
d07e75d9
Improve import process for rooms
· d07e75d9
Jonathan Weth
authored
4 years ago
aleksis/apps/untis/util/mysql/importers/common_data.py
+
34
−
7
Options
@@ -223,25 +223,52 @@ def import_classes(
def
import_rooms
()
->
Dict
[
int
,
chronos_models
.
Room
]:
"""
Import rooms
"""
rooms_ref
=
{}
ref
=
{}
# Get rooms
rooms
=
run_default_filter
(
mysql_models
.
Room
.
objects
)
for
room
in
rooms
:
if
not
room
.
name
:
raise
Exception
(
"
Short name needed.
"
)
logger
.
error
(
"
Room ID {}: Cannot import room without short name.
"
.
format
(
room
.
room_id
)
)
continue
# Build values
short_name
=
room
.
name
[:
10
]
name
=
room
.
longname
[:
30
]
if
room
.
longname
else
short_name
import_ref
=
room
.
room_id
logger
.
info
(
"
Import room {} …
"
.
format
(
short_name
))
new_room
,
created
=
chronos_models
.
Room
.
objects
.
get_or_create
(
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
}
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
,
"
import_ref_untis
"
:
import_ref
}
)
new_room
.
name
=
name
new_room
.
save
()
if
created
:
logger
.
info
(
"
New room created
"
)
changed
=
False
if
config
.
UNTIS_IMPORT_MYSQL_UPDATE_ROOMS_NAME
and
new_room
.
name
!=
name
:
new_room
.
name
=
name
changed
=
True
logger
.
info
(
"
Name updated
"
)
if
new_room
.
import_ref_untis
!=
import_ref
:
new_room
.
import_ref_untis
=
import_ref
changed
=
True
logger
.
info
(
"
Import reference updated
"
)
if
changed
:
new_room
.
save
()
r
ooms_ref
[
room
.
room_id
]
=
new_room
r
ef
[
import_ref
]
=
new_room
return
rooms_
ref
return
ref
def
import_supervision_areas
()
->
Dict
[
int
,
chronos_models
.
SupervisionArea
]:
Loading