Skip to content

Force bar chart to show monthly data on large screens instead of faking quarterly data #168

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

Draft
cfarm wants to merge 7 commits into
base: main
Choose a base branch
from
Draft

Force bar chart to show monthly data on large screens instead of faking quarterly data #168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
296d241
bring back all button so i can test latest data w it
cfarm Feb 25, 2019
93acddb
add most recent data from october 2018 so i can test bar chart fix
cfarm Feb 27, 2019
8a7e824
add demo page to the watch task so it reloads data correctly
cfarm Feb 27, 2019
7f572ef
add groupPixelWidth to make bars narrow + fit more months
cfarm Feb 27, 2019
1abccdf
fix excessive browsersync reloads
cfarm Mar 1, 2019
86a7ef6
add latest data from GHE so I can test the bar chart fix
cfarm Mar 1, 2019
a9d8e07
fix infinite browsersync reload by watching only index page for chang…
cfarm Mar 4, 2019
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
3 changes: 2 additions & 1 deletion gulp/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,8 @@ module.exports = {
test: {
src: loc.src + '/js/**/*.js',
tests: loc.test,
unit: loc.test + '/unit_tests/**/*.js'
unit: loc.test + '/unit_tests/**/*.js',
demo: loc.test + '/index.html'
},
clean: {
dest: loc.dist
Expand Down
6 changes: 3 additions & 3 deletions gulp/tasks/watch.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ const gulp = require( 'gulp' );

gulp.task( 'watch:scripts', done => {
gulp.watch(
[ config.test.src, config.demoScripts.src ],
[ config.test.src, config.demoScripts.src, config.test.demo ],
gulp.series( 'scripts', 'test:unit' )
).on( 'change', browserSync.reload );
);
done();
} );

Expand Down Expand Up @@ -52,8 +52,8 @@ function browserSyncInit( done ) {
gulp.task( 'watch',
gulp.parallel(
'watch:scripts',
'watch:styles',
'watch:tests',
'watch:styles',
browserSyncInit
)
);
9 changes: 8 additions & 1 deletion src/js/charts/BarChart.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class BarChart {
rangeSelector: {
floating: true,
// The index of the button to appear pre-selected.
selected: 2,
selected: 3,
height: 35,
inputEnabled: false,
verticalAlign: 'bottom',
Expand Down Expand Up @@ -59,6 +59,10 @@ class BarChart {
type: 'year',
count: 5,
text: '5y'
},
{
type: 'all',
text: 'All'
}
]
},
Expand Down Expand Up @@ -132,6 +136,9 @@ class BarChart {
type: 'column',
data: data,
name: 'Year-over-year change (%)',
dataGrouping: {
groupPixelWidth: 5
},
tooltip: {
valueDecimals: 2
},
Expand Down
Loading