Skip to content
Snippets Groups Projects
Commit 9d85b9ee authored by Martin Mareš's avatar Martin Mareš
Browse files

export-orgs: Bugfix, třídění

Objekt Row() se recykloval, takže jsme vypisovali úplně stejné řádky.
parent 5871f733
No related branches found
No related tags found
No related merge requests found
...@@ -29,14 +29,17 @@ class Row: ...@@ -29,14 +29,17 @@ class Row:
output = [] output = []
for user in sorted(orgs, key=lambda u: u.sort_key()): for user in sorted(orgs, key=lambda u: u.sort_key()):
o = Row(
def row() -> Row:
return Row(
jmeno=user.full_name(), jmeno=user.full_name(),
email=user.email, email=user.email,
last_login=(user.last_login_at.strftime('%Y-%m-%d') if user.last_login_at is not None else '-'), last_login=(user.last_login_at.strftime('%Y-%m-%d') if user.last_login_at is not None else '-'),
) )
if user.roles: if user.roles:
for r in user.roles: for r in sorted(user.roles, key=lambda r: (r.role, r.category or "", r.year or -1, r.seq or -1, r.place_id or -1)):
o = row()
o.role = r.role o.role = r.role
o.kod_souteze = f"{r.category or '*'}-{r.year or '*'}-{r.seq or '*'}" o.kod_souteze = f"{r.category or '*'}-{r.year or '*'}-{r.seq or '*'}"
p = r.place p = r.place
...@@ -44,6 +47,7 @@ for user in sorted(orgs, key=lambda u: u.sort_key()): ...@@ -44,6 +47,7 @@ for user in sorted(orgs, key=lambda u: u.sort_key()):
o.misto = p.type_name() + " " + p.name o.misto = p.type_name() + " " + p.name
output.append(o) output.append(o)
else: else:
o = row()
o.role = '-' o.role = '-'
output.append(o) output.append(o)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment