diff options
author | Fabian Schneider <fabbbbbi+git@googlemail.com> | 2018-11-06 22:16:49 +0100 |
---|---|---|
committer | Fabian Schneider <fabbbbbi+git@googlemail.com> | 2019-02-06 17:33:56 +0100 |
commit | 27f7771ae1a4b5f9d973a55ccbbbe30b0e05f100 (patch) | |
tree | 6848af95359ff3cb1d84259df159a620b4b64bd5 /app/assets/javascripts/pages/projects/graphs | |
parent | 20c83bbdb0a9729a308957397b37a2569486116f (diff) | |
download | gitlab-ce-27f7771ae1a4b5f9d973a55ccbbbe30b0e05f100.tar.gz |
Add setting for first day of the week
Diffstat (limited to 'app/assets/javascripts/pages/projects/graphs')
-rw-r--r-- | app/assets/javascripts/pages/projects/graphs/charts/index.js | 18 |
1 files changed, 17 insertions, 1 deletions
diff --git a/app/assets/javascripts/pages/projects/graphs/charts/index.js b/app/assets/javascripts/pages/projects/graphs/charts/index.js index 3ccad513c05..26d7fa7371d 100644 --- a/app/assets/javascripts/pages/projects/graphs/charts/index.js +++ b/app/assets/javascripts/pages/projects/graphs/charts/index.js @@ -43,10 +43,26 @@ document.addEventListener('DOMContentLoaded', () => { ], }); + const reorderWeekDays = (weekDays, firstDayOfWeek = 0) => { + if (firstDayOfWeek === 0) { + return weekDays; + } + + return Object.keys(weekDays).reduce((acc, dayName, idx, arr) => { + const reorderedDayName = arr[(idx + firstDayOfWeek) % arr.length]; + + return { + ...acc, + [reorderedDayName]: weekDays[reorderedDayName], + }; + }, {}); + }; + const hourData = chartData(projectChartData.hour); responsiveChart($('#hour-chart'), hourData); - const dayData = chartData(projectChartData.weekDays); + const weekDays = reorderWeekDays(projectChartData.weekDays, gon.first_day_of_week); + const dayData = chartData(weekDays); responsiveChart($('#weekday-chart'), dayData); const monthData = chartData(projectChartData.month); |