diff --git a/mo/web/org_contest.py b/mo/web/org_contest.py index d5710d507b53dac571933d68b1965de446b4e4d0..f9bdb12ca0b40f1696aa7399f6a881aa6413d81f 100644 --- a/mo/web/org_contest.py +++ b/mo/web/org_contest.py @@ -480,7 +480,7 @@ def org_contest_list(id: int, site_id: Optional[int] = None): filter=filter, count=count, action_form=action_form, ) else: - table = make_contestant_table(query) + table = make_contestant_table(query, is_export=True) return table.send_as(format) @@ -535,7 +535,7 @@ def get_contestants_query( return query -def make_contestant_table(query: Query, add_checkbox: bool = False, add_contest_column: bool = False): +def make_contestant_table(query: Query, add_checkbox: bool = False, add_contest_column: bool = False, is_export: bool = False): ctants = query.all() rows: List[Row] = [] @@ -550,6 +550,7 @@ def make_contestant_table(query: Query, add_checkbox: bool = False, add_contest_ rows.append(Row( keys={ 'sort_key': u.sort_key(), + 'user_id': u.user_id, 'first_name': cell_pion_link(u, pion.contest_id, u.first_name), 'last_name': cell_pion_link(u, pion.contest_id, u.last_name), 'email': cell_email_link(u), @@ -567,11 +568,13 @@ def make_contestant_table(query: Query, add_checkbox: bool = False, add_contest_ rows.sort(key=lambda r: r.keys['sort_key']) - cols: Sequence[Column] = contest_list_columns + cols: List[Column] = list(contest_list_columns) if add_checkbox: - cols = [Column(key='checkbox', name=' ', title=' ')] + list(cols) + cols = [Column(key='checkbox', name=' ', title=' ')] + cols if add_contest_column: - cols = list(cols) + [Column(key='region_code', name='kod_oblasti', title='Oblast')] + cols.append(Column(key='region_code', name='kod_oblasti', title='Oblast')) + if is_export: + cols.append(Column(key='user_id', name='user_id')) return Table( columns=cols, diff --git a/mo/web/org_round.py b/mo/web/org_round.py index 8d8b16ff8c50e32b1bea8648aeb20a096826f7d5..c0c698479301cd02961fc08c3b8450ab752e14d6 100644 --- a/mo/web/org_round.py +++ b/mo/web/org_round.py @@ -389,7 +389,7 @@ def org_round_list(id: int): filter=filter, count=count, action_form=action_form, ) else: - table = make_contestant_table(query) + table = make_contestant_table(query, is_export=True) return table.send_as(format)