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
2cc35243
Commit
2cc35243
authored
2 years ago
by
Martin Mareš
Browse files
Options
Downloads
Patches
Plain Diff
place_level zna i své jméno v množném čísle
parent
324dc605
No related branches found
No related tags found
No related merge requests found
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
mo/place_level.py
+6
-5
6 additions, 5 deletions
mo/place_level.py
mo/web/jinja.py
+2
-0
2 additions, 0 deletions
mo/web/jinja.py
with
8 additions
and
5 deletions
mo/place_level.py
+
6
−
5
View file @
2cc35243
...
@@ -6,6 +6,7 @@ class PlaceLevel:
...
@@ -6,6 +6,7 @@ class PlaceLevel:
level
:
int
level
:
int
genus
:
str
genus
:
str
name
:
str
name
:
str
name_pl
:
str
name_gen
:
str
name_gen
:
str
name_acc
:
str
name_acc
:
str
name_loc
:
str
name_loc
:
str
...
@@ -29,13 +30,13 @@ class PlaceLevel:
...
@@ -29,13 +30,13 @@ class PlaceLevel:
place_levels
=
[
place_levels
=
[
PlaceLevel
(
level
=
0
,
genus
=
'
m
'
,
in_prep
=
'
ve
'
,
PlaceLevel
(
level
=
0
,
genus
=
'
m
'
,
in_prep
=
'
ve
'
,
name
=
'
stát
'
,
name_gen
=
'
státu
'
,
name_acc
=
'
stát
'
,
name_loc
=
'
státě
'
),
name
=
'
stát
'
,
name_pl
=
'
státy
'
,
name_gen
=
'
státu
'
,
name_acc
=
'
stát
'
,
name_loc
=
'
státě
'
),
PlaceLevel
(
level
=
1
,
genus
=
'
m
'
,
in_prep
=
'
v
'
,
PlaceLevel
(
level
=
1
,
genus
=
'
m
'
,
in_prep
=
'
v
'
,
name
=
'
kraj
'
,
name_gen
=
'
kraje
'
,
name_acc
=
'
kraj
'
,
name_loc
=
'
kraji
'
),
name
=
'
kraj
'
,
name_pl
=
'
kraje
'
,
name_gen
=
'
kraje
'
,
name_acc
=
'
kraj
'
,
name_loc
=
'
kraji
'
),
PlaceLevel
(
level
=
2
,
genus
=
'
m
'
,
in_prep
=
'
v
'
,
PlaceLevel
(
level
=
2
,
genus
=
'
m
'
,
in_prep
=
'
v
'
,
name
=
'
okres
'
,
name_gen
=
'
okresu
'
,
name_acc
=
'
okres
'
,
name_loc
=
'
okrese
'
),
name
=
'
okres
'
,
name_pl
=
'
okresy
'
,
name_gen
=
'
okresu
'
,
name_acc
=
'
okres
'
,
name_loc
=
'
okrese
'
),
PlaceLevel
(
level
=
3
,
genus
=
'
f
'
,
in_prep
=
'
v
'
,
PlaceLevel
(
level
=
3
,
genus
=
'
f
'
,
in_prep
=
'
v
'
,
name
=
'
obec
'
,
name_gen
=
'
obce
'
,
name_acc
=
'
obec
'
,
name_loc
=
'
obci
'
),
name
=
'
obec
'
,
name_pl
=
'
obce
'
,
name_gen
=
'
obce
'
,
name_acc
=
'
obec
'
,
name_loc
=
'
obci
'
),
PlaceLevel
(
level
=
4
,
genus
=
'
f
'
,
in_prep
=
'
ve
'
,
PlaceLevel
(
level
=
4
,
genus
=
'
f
'
,
in_prep
=
'
ve
'
,
name
=
'
škola
'
,
name_gen
=
'
školy
'
,
name_acc
=
'
školu
'
,
name_loc
=
'
škole
'
),
name
=
'
škola
'
,
name_pl
=
'
školy
'
,
name_gen
=
'
školy
'
,
name_acc
=
'
školu
'
,
name_loc
=
'
škole
'
),
]
]
This diff is collapsed.
Click to expand it.
mo/web/jinja.py
+
2
−
0
View file @
2cc35243
...
@@ -10,6 +10,7 @@ import urllib.parse
...
@@ -10,6 +10,7 @@ import urllib.parse
import
mo.config
as
config
import
mo.config
as
config
import
mo.db
as
db
import
mo.db
as
db
import
mo.place_level
from
mo.rights
import
Right
from
mo.rights
import
Right
import
mo.util_format
as
util_format
import
mo.util_format
as
util_format
from
mo.web
import
app
from
mo.web
import
app
...
@@ -40,6 +41,7 @@ jf.update(parse_decimal=decimal.Decimal)
...
@@ -40,6 +41,7 @@ jf.update(parse_decimal=decimal.Decimal)
jg
=
jenv
.
globals
jg
=
jenv
.
globals
jg
.
update
(
web_flavor
=
config
.
WEB_FLAVOR
)
jg
.
update
(
web_flavor
=
config
.
WEB_FLAVOR
)
jg
.
update
(
place_levels
=
mo
.
place_level
.
place_levels
)
# Export enumů z mo.db:
# Export enumů z mo.db:
jg
.
update
(
RoundState
=
db
.
RoundState
)
jg
.
update
(
RoundState
=
db
.
RoundState
)
...
...
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