kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Merge branch '35136-barchart-not-display-label-at-0-hour' into 'master' 

Fix bar chart does not display label at hour 0

Closes #35136

See merge request !13330
This commit is contained in:
Clement Ho 2017-08-08 12:02:14 +00:00
parent 2b781c782d 2b9a64a212
commit ca2a2aea89
3 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/assets/javascripts/graphs/graphs_charts.js
View File

@ -1,4 +1,5 @@
import Chart from 'vendor/Chart'; import Chart from 'vendor/Chart';
import _ from 'underscore';
document.addEventListener('DOMContentLoaded', () => { document.addEventListener('DOMContentLoaded', () => {
const projectChartData = JSON.parse(document.getElementById('projectChartData').innerHTML); const projectChartData = JSON.parse(document.getElementById('projectChartData').innerHTML);
@ -27,28 +28,25 @@ document.addEventListener('DOMContentLoaded', () => {
return generateChart(); return generateChart();
}; };
const chartData = (keys, values) => { const chartData = data => ({
const data = { labels: Object.keys(data),
labels: keys,
datasets: [{ datasets: [{
fillColor: 'rgba(220,220,220,0.5)', fillColor: 'rgba(220,220,220,0.5)',
strokeColor: 'rgba(220,220,220,1)', strokeColor: 'rgba(220,220,220,1)',
barStrokeWidth: 1, barStrokeWidth: 1,
barValueSpacing: 1, barValueSpacing: 1,
barDatasetSpacing: 1, barDatasetSpacing: 1,
data: values, data: _.values(data),
}], }],
}; });
return data;
};
const hourData = chartData(projectChartData.hour.keys, projectChartData.hour.values); const hourData = chartData(projectChartData.hour);
responsiveChart($('#hour-chart'), hourData); responsiveChart($('#hour-chart'), hourData);
const dayData = chartData(projectChartData.weekDays.keys, projectChartData.weekDays.values); const dayData = chartData(projectChartData.weekDays);
responsiveChart($('#weekday-chart'), dayData); responsiveChart($('#weekday-chart'), dayData);
const monthData = chartData(projectChartData.month.keys, projectChartData.month.values); const monthData = chartData(projectChartData.month);
responsiveChart($('#month-chart'), monthData); responsiveChart($('#month-chart'), monthData);
const data = projectChartData.languages; const data = projectChartData.languages;

6
app/views/projects/graphs/charts.html.haml
View File

@ -78,8 +78,8 @@
%script#projectChartData{ type: "application/json" } %script#projectChartData{ type: "application/json" }
- projectChartData = {}; - projectChartData = {};
- projectChartData['hour'] = { 'keys' => @commits_per_time.keys, 'values' => @commits_per_time.values } - projectChartData['hour'] = @commits_per_time
- projectChartData['weekDays'] = { 'keys' => @commits_per_week_days.keys, 'values' => @commits_per_week_days.values } - projectChartData['weekDays'] = @commits_per_week_days
- projectChartData['month'] = { 'keys' => @commits_per_month.keys, 'values' => @commits_per_month.values } - projectChartData['month'] = @commits_per_month
- projectChartData['languages'] = @languages - projectChartData['languages'] = @languages
= projectChartData.to_json.html_safe = projectChartData.to_json.html_safe

4
changelogs/unreleased/35136-barchart-not-display-label-at-0-hour.yml Normal file
View File

@ -0,0 +1,4 @@
---
title: Fix bar chart does not display label at 0 hour
merge_request: 35136
author: Jason Dai