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

Jump to bottom

Cleanup around multiple select fields #79

Merged
merged 2 commits into from Dec 13, 2015
Merged

Cleanup around multiple select fields #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4e4c52
Cleanup around multiple select fields
mistercrunch Dec 13, 2015
5701696
py3 compatibility
mistercrunch Dec 13, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
96 changes: 71 additions & 25 deletions panoramix/forms.py
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ def __call__(self, **kwargs):
return widgets.HTMLString(html)


class BetterSelectMultipleField(SelectMultipleField):
class SelectMultipleSortableField(SelectMultipleField):
"""
Works along with select2sortable to preserves the sort order
"""
Expand All @@ -37,6 +37,28 @@ def iter_choices(self):
yield d.pop(d.keys()[0])


class FreeFormSelect(widgets.Select):
def __call__(self, field, **kwargs):
kwargs.setdefault('id', field.id)
if self.multiple:
kwargs['multiple'] = True
html = ['<select %s>' % widgets.html_params(name=field.name, **kwargs)]
found = False
for val, label, selected in field.iter_choices():
html.append(self.render_option(val, label, selected))
if field.data and val == field.data:
found = True
if not found:
html.insert(1, self.render_option(field.data, field.data, True))
html.append('</select>')
return widgets.HTMLString(''.join(html))

class FreeFormSelectField(SelectField):
widget = FreeFormSelect()
def pre_validate(self, form):
return


class OmgWtForm(Form):
fieldsets = {}
css_classes = dict()
Expand All @@ -53,6 +75,12 @@ def field_css_classes(self, fieldname):
class FormFactory(object):
row_limits = [10, 50, 100, 500, 1000, 5000, 10000, 50000]
series_limits = [0, 5, 10, 25, 50, 100, 500]
fieltype_class = {
SelectField: 'select2',
SelectMultipleField: 'select2',
FreeFormSelectField: 'select2_freeform',
SelectMultipleSortableField: 'select2Sortable',
}

def __init__(self, viz):
self.viz = viz
Expand All @@ -69,7 +97,7 @@ def __init__(self, viz):
default='table',
choices=[(k, v.verbose_name) for k, v in viz_types.items()],
description="The type of visualization to display"),
'metrics': BetterSelectMultipleField(
'metrics': SelectMultipleSortableField(
'Metrics', choices=datasource.metrics_combo,
default=[default_metric],
description="One or many metrics to display"),
Expand All @@ -81,16 +109,27 @@ def __init__(self, viz):
'Color Metric', choices=datasource.metrics_combo,
default=default_metric,
description="A metric to use for color"),
'groupby': BetterSelectMultipleField(
'groupby': SelectMultipleSortableField(
'Group by',
choices=self.choicify(datasource.groupby_column_names),
description="One or many fields to group by"),
'columns': SelectMultipleField(
'columns': SelectMultipleSortableField(
'Columns',
choices=self.choicify(datasource.groupby_column_names),
description="One or many fields to pivot as columns"),
'granularity': TextField(
'granularity': FreeFormSelectField(
'Time Granularity', default="one day",
choices=self.choicify([
'all',
'5 seconds',
'30 seconds',
'1 minute',
'5 minutes',
'1 hour',
'6 hour',
'1 day',
'7 days',
]),
description=(
"The time granularity for the visualization. Note that you "
"can type and use simple natural language as in '10 seconds', "
Expand All @@ -102,11 +141,29 @@ def __init__(self, viz):
"The time granularity for the visualization. Note that you "
"can define arbitrary expression that return a DATETIME "
"column in the table editor")),
'since': TextField(
'Since', default="7 days ago", description=(
'since': FreeFormSelectField(
'Since', default="7 days ago",
choices=self.choicify([
'1 hour ago',
'12 hours ago',
'1 day ago',
'7 days ago',
'28 days ago',
'90 days ago',
'1 year ago'
]),
description=(
"Timestamp from filter. This supports free form typing and "
"natural language as in '1 day ago', '28 days' or '3 years'")),
'until': TextField('Until', default="now"),
'until': FreeFormSelectField('Until', default="now",
choices=self.choicify([
'now',
'1 day ago',
'7 days ago',
'28 days ago',
'90 days ago',
'1 year ago'])
),
'row_limit':
SelectField(
'Row limit',
Expand Down Expand Up @@ -262,26 +319,15 @@ def get_form(self, previous=False):
px_form_fields = self.field_dict
viz = self.viz
datasource = viz.datasource
field_css_classes = {k: ['form-control'] for k in px_form_fields.keys()}
select2 = [
'viz_type',
'viz_type', 'columns', 'pandas_aggfunc',
'row_limit', 'rolling_type', 'series',
'entity', 'x', 'y', 'size', 'rotation', 'metric', 'limit',
'markup_type',]
select2Sortable = [
'metrics', 'groupby'
]
field_css_classes['since'] += ['select2_free_since']
field_css_classes['until'] += ['select2_free_until']
field_css_classes['granularity'] += ['select2_free_granularity']
field_css_classes = {}
for name, obj in px_form_fields.items():
field_css_classes[name] = ['form-control']
s = self.fieltype_class.get(obj.field_class)
if s:
field_css_classes[name] += [s]

for field in ('show_brush', 'show_legend', 'rich_tooltip'):
field_css_classes[field] += ['input-sm']
for field in select2:
field_css_classes[field] += ['select2']
for field in select2Sortable:
field_css_classes[field] += ['select2Sortable']

class QueryForm(OmgWtForm):
fieldsets = copy(viz.fieldsetizer())
Expand Down
61 changes: 22 additions & 39 deletions panoramix/static/panoramix.js
View file
Open in desktop
Expand Up @@ -29,6 +29,7 @@ function initializeDatasourceView() {
}

$(".select2").select2();
$(".select2Sortable").select2();
$(".select2Sortable").select2Sortable();
$("form").show();
$('[data-toggle="tooltip"]').tooltip({container: 'body'});
Expand Down Expand Up @@ -114,45 +115,27 @@ function initializeDatasourceView() {
}
return obj;
}
$(".select2_free_since").select2({
createSearchChoice: create_choices,
initSelection: initSelectionToValue,
multiple: false,
data: list_data([
'1 hour ago',
'12 hours ago',
'1 day ago',
'7 days ago',
'28 days ago',
'90 days ago',
'1 year ago'])
});
$(".select2_free_until").select2({
createSearchChoice: create_choices,
initSelection: initSelectionToValue,
multiple: false,
data: list_data([
'now',
'1 day ago',
'7 days ago',
'28 days ago',
'90 days ago',
'1 year ago'])
});
$(".select2_free_granularity").select2({
createSearchChoice: create_choices,
initSelection: initSelectionToValue,
multiple: false,
data: list_data([
'all',
'5 seconds',
'30 seconds',
'1 minute',
'5 minutes',
'1 hour',
'6 hour',
'1 day',
'7 days'])
$(".select2_freeform").each(function(){
parent = $(this).parent();
var name = $(this).attr('name');
var l = [];
var selected = '';
for(var i=0; i<this.options.length; i++) {
l.push({id: this.options[i].value, text: this.options[i].text});
if(this.options[i].selected){
selected = this.options[i].value;
}
}
obj = parent.append(
'<input class="' + $(this).attr('class') + '" name="'+ name +'" type="text" value="' + selected + '">');
$("input[name='" + name +"']")
.select2({
createSearchChoice: create_choices,
initSelection: initSelectionToValue,
multiple: false,
data: l,
});
$(this).remove();
});
}

Expand Down
8 changes: 7 additions & 1 deletion panoramix/static/widgets/viz_sunburst.js
View file
Open in desktop
Expand Up @@ -39,7 +39,13 @@ function viz_sunburst(data_attribute) {
.outerRadius(function(d) { return Math.sqrt(d.y + d.dy); });

var ext;
d3.json(data_attribute.json_endpoint, function(json){
d3.json(data_attribute.json_endpoint, function(error, json){

if (error != null){
var err = '<div class="alert alert-danger">' + error.responseText + '</div>';
token.html(err);
return '';
}
var tree = buildHierarchy(json.data);
createVisualization(tree);
token.select("img.loading").remove();
Expand Down