Skip to content
Snippets Groups Projects
Commit cfe24e34 authored by Jiří Setnička's avatar Jiří Setnička
Browse files

Názvy rolí přesunuty do mo/db.py

Aby je šlo používat z db package (jinak by byl problém s cyklickou závislostí).
parent 6fbda24a
No related branches found
No related tags found
1 merge request!6Práva organizátorů
...@@ -285,6 +285,14 @@ class RoleType(MOEnum): ...@@ -285,6 +285,14 @@ class RoleType(MOEnum):
opravovatel = auto() opravovatel = auto()
role_type_names = {
RoleType.garant: 'celostátní garant',
RoleType.garant_kraj: 'krajský garant',
RoleType.garant_okres: 'okresní garant',
RoleType.dozor: 'dozor',
RoleType.opravovatel: 'opravovatel',
}
class UserRole(Base): class UserRole(Base):
__tablename__ = 'user_roles' __tablename__ = 'user_roles'
...@@ -302,6 +310,20 @@ class UserRole(Base): ...@@ -302,6 +310,20 @@ class UserRole(Base):
assigned_by_user = relationship('User', primaryjoin='UserRole.assigned_by == User.user_id') assigned_by_user = relationship('User', primaryjoin='UserRole.assigned_by == User.user_id')
place = relationship('Place') place = relationship('Place')
def __str__(self):
parts = [role_type_names[self.role]]
if self.seq:
parts.append(f"{self.seq}. kola")
if self.year:
parts.append(f"{self.year}. ročníku")
if self.category:
parts.append(f"kategorie {self.category}")
parts.append("pro")
parts.append(self.place.type_name())
parts.append(self.place.name)
return " ".join(parts)
class PaperType(MOEnum): class PaperType(MOEnum):
solution = auto() solution = auto()
......
...@@ -32,7 +32,7 @@ class Role: ...@@ -32,7 +32,7 @@ class Role:
roles: List[Role] = [ roles: List[Role] = [
Role( Role(
role=db.RoleType.garant, role=db.RoleType.garant,
name='celostátní garant', name=db.role_type_names[db.RoleType.garant],
rights={ rights={
Right.assign_rights, Right.assign_rights,
Right.edit_place, Right.edit_place,
...@@ -45,7 +45,7 @@ roles: List[Role] = [ ...@@ -45,7 +45,7 @@ roles: List[Role] = [
), ),
Role( Role(
role=db.RoleType.garant_kraj, role=db.RoleType.garant_kraj,
name='krajský garant', name=db.role_type_names[db.RoleType.garant_kraj],
rights={ rights={
Right.assign_rights, Right.assign_rights,
Right.edit_place, Right.edit_place,
...@@ -58,7 +58,7 @@ roles: List[Role] = [ ...@@ -58,7 +58,7 @@ roles: List[Role] = [
), ),
Role( Role(
role=db.RoleType.garant_okres, role=db.RoleType.garant_okres,
name='okresní garant', name=db.role_type_names[db.RoleType.garant_okres],
rights={ rights={
Right.assign_rights, Right.assign_rights,
Right.edit_place, Right.edit_place,
...@@ -69,7 +69,7 @@ roles: List[Role] = [ ...@@ -69,7 +69,7 @@ roles: List[Role] = [
), ),
Role( Role(
role=db.RoleType.dozor, role=db.RoleType.dozor,
name='dozor', name=db.role_type_names[db.RoleType.dozor],
rights={ rights={
Right.upload_solutions, Right.upload_solutions,
Right.add_users, Right.add_users,
...@@ -77,7 +77,7 @@ roles: List[Role] = [ ...@@ -77,7 +77,7 @@ roles: List[Role] = [
), ),
Role( Role(
role=db.RoleType.opravovatel, role=db.RoleType.opravovatel,
name='opravovatel', name=db.role_type_names[db.RoleType.opravovatel],
rights={ rights={
Right.upload_feedback, Right.upload_feedback,
Right.edit_points, Right.edit_points,
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment