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

Use the appropriate time format for auto tick generation #6182

Merged
merged 2 commits into from Apr 26, 2019
Merged

Use the appropriate time format for auto tick generation #6182

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
f63aaf1
Use the appropriate time format for auto tick generation
nagix Apr 4, 2019
49a791e
Add a unit test
nagix Apr 24, 2019
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
5 changes: 4 additions & 1 deletion src/scales/scale.time.js
View file
Open in desktop
Expand Up @@ -774,9 +774,12 @@ module.exports = Scale.extend({
*/
getLabelCapacity: function(exampleTime) {
var me = this;
var timeOpts = me.options.time;
var displayFormats = timeOpts.displayFormats;

// pick the longest format (milliseconds) for guestimation
var format = me.options.time.displayFormats.millisecond;
var format = displayFormats[timeOpts.unit] || displayFormats.millisecond;

var exampleLabel = me.tickFormatFunction(exampleTime, 0, [], format);
var tickLabelWidth = me.getLabelWidth(exampleLabel);
var innerWidth = me.isHorizontal() ? me.width : me.height;
Expand Down
22 changes: 21 additions & 1 deletion test/specs/scale.time.tests.js
View file
Open in desktop
Expand Up @@ -298,7 +298,7 @@ describe('Time scale tests', function() {
expect(ticks).toEqual(['8PM', '9PM', '10PM', '11PM', '12AM', '1AM', '2AM', '3AM', '4AM', '5AM', '6AM', '7AM', '8AM', '9AM', '10AM', '11AM', '12PM', '1PM', '2PM', '3PM', '4PM', '5PM', '6PM', '7PM', '8PM', '9PM']);
});

it('build ticks honoring the minUnit', function() {
it('should build ticks honoring the minUnit', function() {
var mockData = {
labels: ['2015-01-01T20:00:00', '2015-01-02T21:00:00'], // days
};
Expand All @@ -316,6 +316,26 @@ describe('Time scale tests', function() {
expect(ticks).toEqual(['Jan 1', 'Jan 2', 'Jan 3']);
});

it('should build ticks based on the appropriate label capacity', function() {
var mockData = {
labels: [
'2012-01-01', '2013-01-01', '2014-01-01', '2015-01-01',
'2016-01-01', '2017-01-01', '2018-01-01', '2019-01-01'
]
};

var config = Chart.helpers.mergeIf({
time: {
unit: 'year'
}
}, Chart.scaleService.getScaleDefaults('time'));

var scale = createScale(mockData, config);
var ticks = getTicksLabels(scale);

expect(ticks).toEqual(['2012', '2013', '2014', '2015', '2016', '2017', '2018', '2019']);
});

it('should build ticks using the config diff', function() {
var mockData = {
labels: ['2015-01-01T20:00:00', '2015-02-02T21:00:00', '2015-02-21T01:00:00'], // days
Expand Down