Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
O
Official
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
Package Registry
Container 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
0inraMfauri
Official
Commits
e46c220e
Verified
Commit
e46c220e
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Reset select_related calls before update_or_create
parent
cf24a587
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
aleksis/apps/untis/util/mysql/importers/substitutions.py
+14
-10
14 additions, 10 deletions
aleksis/apps/untis/util/mysql/importers/substitutions.py
aleksis/apps/untis/util/xml/xml.py
+9
-5
9 additions, 5 deletions
aleksis/apps/untis/util/xml/xml.py
with
23 additions
and
15 deletions
aleksis/apps/untis/util/mysql/importers/substitutions.py
+
14
−
10
View file @
e46c220e
...
...
@@ -178,16 +178,20 @@ def import_substitutions(
subject
=
subject_old
if
not
subject_new
else
subject_new
teachers
=
[
teacher_old
]
if
not
teacher_new
else
[
teacher_new
]
(
extra_lesson
,
created
,)
=
chronos_models
.
ExtraLesson
.
objects
.
update_or_create
(
import_ref_untis
=
sub_id
,
defaults
=
{
"
week
"
:
week
.
week
,
"
year
"
:
week
.
year
,
"
period
"
:
time_period
,
"
subject
"
:
subject
,
"
room
"
:
room
,
"
comment
"
:
comment
,
},
(
extra_lesson
,
created
,)
=
(
chronos_models
.
ExtraLesson
.
objects
.
select_related
(
None
)
.
prefetch_related
(
None
)
.
update_or_create
(
import_ref_untis
=
sub_id
,
defaults
=
{
"
week
"
:
week
.
week
,
"
year
"
:
week
.
year
,
"
period
"
:
time_period
,
"
subject
"
:
subject
,
"
room
"
:
room
,
"
comment
"
:
comment
,
},
)
)
if
created
:
...
...
This diff is collapsed.
Click to expand it.
aleksis/apps/untis/util/xml/xml.py
+
9
−
5
View file @
e46c220e
...
...
@@ -40,7 +40,7 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
colour_fg
=
get_child_node_text
(
subject_node
,
"
forecolor
"
)
colour_bg
=
get_child_node_text
(
subject_node
,
"
backcolor
"
)
Subject
.
objects
.
update_or_create
(
Subject
.
objects
.
select_related
(
None
).
prefetch_related
(
None
).
update_or_create
(
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
,
"
colour_fg
"
:
colour_fg
,
"
colour_bg
"
:
colour_bg
},
)
...
...
@@ -55,7 +55,7 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
time_start
=
time
(
int
(
starttime
[:
2
]),
int
(
starttime
[
2
:]))
time_end
=
time
(
int
(
endtime
[:
2
]),
int
(
endtime
[
2
:]))
TimePeriod
.
objects
.
update_or_create
(
TimePeriod
.
objects
.
select_related
(
None
).
prefetch_related
(
None
).
update_or_create
(
weekday
=
weekday
,
period
=
period
,
defaults
=
{
"
time_start
"
:
time_start
,
"
time_end
"
:
time_end
},
...
...
@@ -66,7 +66,9 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
short_name
=
room_node
.
attributes
[
"
id
"
].
value
[
3
:]
name
=
get_child_node_text
(
room_node
,
"
longname
"
)
Room
.
objects
.
update_or_create
(
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
})
Room
.
objects
.
select_related
(
None
).
prefetch_related
(
None
).
update_or_create
(
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
}
)
classes
=
dom
.
getElementsByTagName
(
"
class
"
)
for
class_node
in
classes
:
...
...
@@ -74,8 +76,10 @@ def untis_import_xml(request: HttpRequest, untis_xml: Union[BinaryIO, str]) -> N
name
=
_
(
"
Class %s
"
)
%
short_name
class_teacher_short_name
=
get_child_node_id
(
class_node
,
"
class_teacher
"
)[
3
:]
class_
,
created
=
Group
.
objects
.
update_or_create
(
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
}
class_
,
created
=
(
Group
.
objects
.
select_related
(
None
)
.
prefetch_related
(
None
)
.
update_or_create
(
short_name
=
short_name
,
defaults
=
{
"
name
"
:
name
})
)
try
:
...
...
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