Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Odevzdávací Systém MO
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Martin Mareš
Odevzdávací Systém MO
Commits
b6792ca2
Commit
b6792ca2
authored
3 years ago
by
Martin Mareš
Browse files
Options
Downloads
Patches
Plain Diff
Import: Už si nepleteme Round.code a Round.seq
parent
f69d4b61
No related branches found
No related tags found
1 merge request
!97
Import orgů
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
mo/imports.py
+8
-8
8 additions, 8 deletions
mo/imports.py
with
8 additions
and
8 deletions
mo/imports.py
+
8
−
8
View file @
b6792ca2
...
...
@@ -180,9 +180,9 @@ class Import:
return
self
.
error
(
f
"
Zadána chybná kategorie
{
kategorie
}
"
)
return
kategorie
def
parse_round
(
self
,
year
:
Optional
[
int
],
category
:
Optional
[
str
],
seq
:
str
)
->
Optional
[
db
.
Round
]:
def
parse_
master_
round
(
self
,
year
:
Optional
[
int
],
category
:
Optional
[
str
],
code
:
str
)
->
Optional
[
db
.
Round
]:
try
:
return
mo
.
db
.
find_round
(
year
,
category
,
seq
)
return
mo
.
db
.
find_
master_
round
(
year
,
category
,
code
)
except
mo
.
CheckError
as
e
:
return
self
.
error
(
str
(
e
))
...
...
@@ -545,7 +545,7 @@ class OrgsImport(Import):
template_basename
=
'
sablona-organizatori
'
default_cat
:
Optional
[
str
]
default_
seq
:
Optional
[
str
]
default_
code
:
Optional
[
str
]
def
__init__
(
self
,
...
...
@@ -556,7 +556,7 @@ class OrgsImport(Import):
allow_change_user_to_org
:
bool
=
False
,
default_place
:
Optional
[
db
.
Place
]
=
None
,
default_cat
:
Optional
[
str
]
=
None
,
default_
seq
:
Optional
[
str
]
=
None
,
default_
code
:
Optional
[
str
]
=
None
,
year
:
Optional
[
int
]
=
None
):
super
().
__init__
(
user
)
...
...
@@ -565,7 +565,7 @@ class OrgsImport(Import):
self
.
only_region
=
only_region
self
.
default_place
=
default_place
self
.
default_cat
=
self
.
parse_category
(
default_cat
)
self
.
default_
seq
=
default_
seq
self
.
default_
code
=
default_
code
self
.
default_place
=
default_place
self
.
allow_change_user_to_org
=
allow_change_user_to_org
self
.
root_place
=
db
.
get_root_place
()
...
...
@@ -584,9 +584,9 @@ class OrgsImport(Import):
kategorie
=
self
.
parse_category
(
kat
)
else
:
kategorie
=
self
.
default_cat
seq
=
getattr
(
r
,
"
kolo
"
,
""
)
or
self
.
default_
seq
if
seq
:
kolo
=
self
.
parse_round
(
self
.
year
,
kategorie
,
seq
)
code
=
getattr
(
r
,
"
kolo
"
,
""
)
or
self
.
default_
code
if
code
:
kolo
=
self
.
parse_
master_
round
(
self
.
year
,
kategorie
,
code
)
if
not
kolo
:
return
else
:
...
...
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