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

Add percision option to terms panel: set up rounding percision for pie chart percents #1122

Closed
wants to merge 2 commits into from
Closed

Add percision option to terms panel: set up rounding percision for pie chart percents #1122

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
d213b5c
Add percision option to terms panel: set up rounding percision for pie
alexey-medvedchikov Apr 7, 2014
e15db07
Add ability to set field used in terms facet: single field with 'fiel…
alexey-medvedchikov Apr 7, 2014
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
18 changes: 17 additions & 1 deletion src/app/panels/terms/editor.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,20 @@ <h5>Parameters</h5>
<select class="input-medium" ng-model="panel.tstat" ng-options="f for f in ['count', 'total_count', 'min', 'max', 'total', 'mean']"></select>
</div>
<div class="editor-option">
<label class="small">Terms field mode</label>
<select class="input-small" ng-model="panel.field_mode" ng-options="f for f in ['field','fields','script_field']" ng-change="set_refresh(true)" ng-show="panel.tmode == 'terms'"></select>
</div>
<div class="editor-option" ng-show="panel.field_mode == 'field'">
<label class="small">Field</label>
<input type="text" class="input-small" bs-typeahead="fields.list" ng-model="panel.field" ng-change="set_refresh(true)">
<input type="text" class="input-medium" bs-typeahead="fields.list" ng-model="panel.field" ng-change="set_refresh(true)">
</div>
<div class="editor-option" ng-show="panel.field_mode == 'fields'">
<label class="small">Field(s) (comma separated)</label>
<input array-join type="text" ng-model='panel.fields' ng-change="set_refresh(true)">
</div>
<div class="editor-option" ng-show="panel.field_mode == 'script_field'">
<label class="small">Script field</label>
<input type="text" class="input-medium" ng-model="panel.script_field" ng-change="set_refresh(true)">
</div>
<div class="editor-option" ng-show="panel.tmode == 'terms_stats'">
<label class="small">Value field</label>
Expand Down Expand Up @@ -66,5 +78,9 @@ <h5>View Options</h5>
<div class="editor-option" ng-show="panel.chart == 'pie'">
<label class="small">Labels</label><input type="checkbox" ng-model="panel.labels" ng-checked="panel.labels">
</div>
<div class="editor-option" ng-show="panel.chart == 'pie'">
<label class="small">Percision</label>
<input class="input-small" type="number" ng-model="panel.percision" ng-change="set_refresh(true)">
</div>
</div>
</div>
70 changes: 56 additions & 14 deletions src/app/panels/terms/module.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,9 +47,21 @@ function (angular, app, _, $, kbn) {
/** @scratch /panels/terms/5
* === Parameters
*
* field:: The field on which to computer the facet
* field:: The field on which to compute the facet, used when field_type is 'field'
*/
field : '_type',
/** @scratch /panels/terms/5
* fields:: The fields array on which to compute the facet, used when field_type is 'fields'
*/
fields : [],
/** @scratch /panels/terms/5
* script_field:: The field script on which to compute the facet, used when field_type is 'script_field'
*/
script_field : '',
/** @scratch /panels/terms/5
* field_mode:: set field method for terms: field, fields or script_field
*/
field_mode : 'field',
/** @scratch /panels/terms/5
* exclude:: terms to exclude from the results
*/
Expand Down Expand Up @@ -125,7 +137,11 @@ function (angular, app, _, $, kbn) {
/** @scratch /panels/terms/5
* valuefield:: Terms_stats facet value field
*/
valuefield : ''
valuefield : '',
/** @scratch /panels/terms/5
* percision:: Set percent display percision
*/
percision : 1
};

_.defaults($scope.panel,_d);
Expand Down Expand Up @@ -168,17 +184,43 @@ function (angular, app, _, $, kbn) {

// Terms mode
if($scope.panel.tmode === 'terms') {
request = request
.facet($scope.ejs.TermsFacet('terms')
.field($scope.field)
.size($scope.panel.size)
.order($scope.panel.order)
.exclude($scope.panel.exclude)
.facetFilter($scope.ejs.QueryFilter(
$scope.ejs.FilteredQuery(
boolQuery,
filterSrv.getBoolFilter(filterSrv.ids())
)))).size(0);
if($scope.panel.field_mode === 'field') {
request = request
.facet($scope.ejs.TermsFacet('terms')
.field($scope.panel.field)
.size($scope.panel.size)
.order($scope.panel.order)
.exclude($scope.panel.exclude)
.facetFilter($scope.ejs.QueryFilter(
$scope.ejs.FilteredQuery(
boolQuery,
filterSrv.getBoolFilter(filterSrv.ids())
)))).size(0);
} else if($scope.panel.field_mode === 'fields') {
request = request
.facet($scope.ejs.TermsFacet('terms')
.fields($scope.panel.fields)
.size($scope.panel.size)
.order($scope.panel.order)
.exclude($scope.panel.exclude)
.facetFilter($scope.ejs.QueryFilter(
$scope.ejs.FilteredQuery(
boolQuery,
filterSrv.getBoolFilter(filterSrv.ids())
)))).size(0);
} else if($scope.panel.field_mode === 'script_field') {
request = request
.facet($scope.ejs.TermsFacet('terms')
.scriptField($scope.panel.script_field)
.size($scope.panel.size)
.order($scope.panel.order)
.exclude($scope.panel.exclude)
.facetFilter($scope.ejs.QueryFilter(
$scope.ejs.FilteredQuery(
boolQuery,
filterSrv.getBoolFilter(filterSrv.ids())
)))).size(0);
}
}
if($scope.panel.tmode === 'terms_stats') {
request = request
Expand Down Expand Up @@ -335,7 +377,7 @@ function (angular, app, _, $, kbn) {
var labelFormat = function(label, series){
return '<div ng-click="build_search(panel.field,\''+label+'\')'+
' "style="font-size:8pt;text-align:center;padding:2px;color:white;">'+
label+'<br/>'+Math.round(series.percent)+'%</div>';
label+'<br/>'+series.percent.toFixed(scope.panel.percision)+'%</div>';
};

plot = $.plot(elem, chartData, {
Expand Down