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
8669d7d9
Verified
Commit
8669d7d9
authored
4 years ago
by
Jonathan Weth
Browse files
Options
Downloads
Patches
Plain Diff
Use subject object to match course groups
parent
a1adfaa3
No related branches found
No related tags found
1 merge request
!22
Use subject object to match course groups
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
aleksis/apps/untis/util/mysql/importers/lessons.py
+4
-5
4 additions, 5 deletions
aleksis/apps/untis/util/mysql/importers/lessons.py
with
4 additions
and
5 deletions
aleksis/apps/untis/util/mysql/importers/lessons.py
+
4
−
5
View file @
8669d7d9
...
...
@@ -117,20 +117,19 @@ def import_lessons(time_periods_ref, rooms_ref, subjects_ref, teachers_ref, clas
if
get_site_preferences
()[
"
untis_mysql__use_course_groups
"
]:
# Negative import_ref denotes a course group
group_import_ref
=
-
int
(
"
{}{}
"
.
format
(
lesson_id
,
i
))
subject_ref
=
subject
.
short_name
# Search by parent groups and subject
qs
=
core_models
.
Group
.
objects
.
filter
(
parent_groups__in
=
[
c
.
id
for
c
in
course_classes
],
untis_
subject__
iexa
ct
=
subject
_ref
,
subject__
subje
ct
=
subject
,
)
# Check if found groups match
match
=
False
if
qs
.
exists
()
:
if
compare_m2m
(
course_classes
,
qs
[
0
]
.
parent_groups
.
all
()):
for
found_group
in
qs
:
if
compare_m2m
(
course_classes
,
found_group
.
parent_groups
.
all
()):
match
=
True
course_group
=
qs
[
0
]
course_group
=
found_group
logger
.
info
(
"
Course group found by searching by parent groups and subject
"
)
...
...
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