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.
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
Initial implementation of numeric report charts. #3894
Merged
Merged
Changes from all commits
Commits
Show all changes
19 commits
Select commit
Hold shift + click to select a range
1900db9
Reporting charts: allow creating concrete number charts.
martinpovolny bc54120
Fix chart type for jqplot report charts.
martinpovolny cbd21bf
Charts: fix regression in pie charts.
martinpovolny d622fc0
Charts: add a spec for count bases 2dim chart.
martinpovolny 3542661
Report editor: handle "null" value for aggreg fun in summary.
martinpovolny d3713ce
Report editor: Summary set to counts does not allow value-based charts.
martinpovolny c0ca936
Report charts: styling and lighlighing for pie charts.
martinpovolny 6955aa8
Report charts: Rubocop styling fixes.
martinpovolny 571509e
Report charts: implement 2dim numeric charts.
martinpovolny 09e526c
Report charts: fix pie highlighter.
martinpovolny 11520d3
Charts: use truncute to shorten texts.
martinpovolny a75d08f
Charts: address Rubocop complaints.
martinpovolny f979296
Report editor: address Rubocop complaints.
martinpovolny 200c378
Report editor: disallow value charts when summary changed.
martinpovolny 74f62ec
Report charts: fix styling for count-based 2dim charts.
martinpovolny ee7f292
Report editor: show nice field names for chart data column.
martinpovolny 473c296
Charting: remove "2D" from chart names.
martinpovolny 93ee3c4
Report charts: add more styling for count based 1dim charts.
martinpovolny 97ceb99
Report charts: handle empty keys in 2dim numeric chart.
martinpovolny File filter
Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -17,6 +17,9 @@ function _jqplot_eval_option(data, option) { | |
function jqplot_process_options(data) { | ||
$.each([ 'seriesDefaults.renderer', | ||
'axes.xaxis.renderer', | ||
'axes.yaxis.tickRenderer', | ||
'axes.yaxis.renderer', | ||
'axes.xaxis.tickRenderer', | ||
'legend.renderer', | ||
'highlighter.tooltipContentEditor' ], function (index, key) { | ||
_jqplot_eval_option(data, key); | ||
|
@@ -68,6 +71,27 @@ function jqplot_redraw_charts() { | |
} | ||
} | ||
|
||
function jqplot_pie_highligh_values(str, seriesIndex, pointIndex, plot) { | ||
return plot.series[seriesIndex].data[pointIndex][0] + ': ' + | ||
plot.series[seriesIndex].data[pointIndex][1]; | ||
} | ||
|
||
function jqplot_pie_highligh(str, seriesIndex, pointIndex, plot) { | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Should highligh be spelled highlight? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. |
||
return plot.series[seriesIndex].data[pointIndex][0]; | ||
} | ||
|
||
function jqplot_xaxis_tick_highlight(str, seriesIndex, pointIndex, plot) { | ||
return plot.options.axes.xaxis.ticks[pointIndex] + ' / ' + | ||
plot.options.series[seriesIndex].label + ': ' + | ||
str; | ||
} | ||
|
||
function jqplot_yaxis_tick_highlight(str, seriesIndex, pointIndex, plot) { | ||
return plot.options.axes.yaxis.ticks[pointIndex] + ' / ' + | ||
plot.options.series[seriesIndex].label + ': ' + | ||
str; | ||
} | ||
|
||
$(document).ready(function(){ | ||
$(window).resize(function() { | ||
setTimeout(jqplot_redraw_charts, 500); | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Should highligh be spelled highlight?