Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Derive set column categories automatically #353

Merged
merged 5 commits into from
Jul 14, 2020
+9 −2
Merged

Derive set column categories automatically #353

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
8984871
Derive set column categories by default
oltionchampari Apr 14, 2020
263dd67
Merge branch 'lineupjs4' into derive-set-column-categories
thinkh Apr 14, 2020
34957ad
Sort retrieved categories for set columns
thinkh Jul 14, 2020
a5fe317
Merge branch 'develop' into derive-set-column-categories
thinkh Jul 14, 2020
70900ff
Fix flake8
thinkh Jul 14, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions tdp_core/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -461,7 +461,7 @@ def derive_columns(table_name, engine, columns=None):
# derive the missing domains and categories
number_columns = [k for k, col in columns.items() if
col['type'] == 'number' and ('min' not in col or 'max' not in col)]
categorical_columns = [k for k, col in columns.items() if col['type'] == 'categorical' and 'categories' not in col]
categorical_columns = [k for k, col in columns.items() if (col['type'] == 'categorical' or col['type'] == 'set') and 'categories' not in col]
if number_columns or categorical_columns:
with session(engine) as s:
if number_columns:
Expand All @@ -477,7 +477,14 @@ def derive_columns(table_name, engine, columns=None):
template += """ AND {col} <> ''"""
template += """ ORDER BY {col} ASC"""
cats = s.execute(template.format(col=col, table=table_name))
columns[col]['categories'] = [str(r['cat']) for r in cats if r['cat'] is not None]
categories = [str(r['cat']) for r in cats if r['cat'] is not None]
if columns[col]['type'] == 'set':
separator = getattr(columns[col], 'separator', ';')
separated_categories = [category.split(separator) for category in categories]
# flatten array
categories = list(set([category for sublist in separated_categories for category in sublist]))
categories.sort() # sort list to avoid random order with each run
columns[col]['categories'] = categories

return columns

Expand Down