DGNum/demarches-normaliennes
15
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Merge pull request #407 from sgmap/chartkick-colors

Browse source 
Use the Chartkick colors option
This commit is contained in:
gregoirenovel 2017-06-07 16:45:13 +02:00 committed by GitHub
commit 0a842480c1
2 changed files with 11 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app/views/stats/index.html.haml
View file

@ -24,11 +24,9 @@
.chart-container
.chart.monthly-procedures-chart
= column_chart @procedures_in_the_last_4_months,
:colors => ["rgba(61, 149, 236, 1)"]
= column_chart @procedures_in_the_last_4_months
.chart.cumulative-procedures-chart.hidden
= area_chart @procedures_cumulative,
:colors => ["rgba(61, 149, 236, 1)"]
= area_chart @procedures_cumulative
.stat-card.stat-card-half.pull-left
%ul.segmented-control.pull-right
@ -41,11 +39,9 @@
.chart-container
.chart.monthly-dossiers-chart
= column_chart @dossiers_in_the_last_4_months,
:colors => ["rgba(61, 149, 236, 1)"]
= column_chart @dossiers_in_the_last_4_months
.chart.cumulative-dossiers-chart.hidden
= area_chart @dossiers_cumulative,
:colors => ["rgba(61, 149, 236, 1)"]
= area_chart @dossiers_cumulative
.stat-card.stat-card-half.pull-left
%span.stat-card-title
@ -53,8 +49,7 @@
.chart-container
.chart
= pie_chart @procedures_count_per_administrateur,
:colors => ["rgba(191, 220, 249, 1)", "rgba(113, 176, 239, 1)", "rgba(61, 149, 236, 1)"]
= pie_chart @procedures_count_per_administrateur
- if administration_signed_in?
.stat-card.stat-card-half.pull-left
@ -63,8 +58,7 @@
.chart-container
.chart
= line_chart @dossier_instruction_mean_time,
:ytitle => "Jours",
:colors => ["rgba(61, 149, 236, 1)"]
:ytitle => "Jours"
.stat-card.stat-card-half.pull-left
%span.stat-card-title Temps de remplissage moyen d'un dossier
@ -72,8 +66,7 @@
.chart-container
.chart
= line_chart @dossier_filling_mean_time,
:ytitle => "Minutes",
:colors => ["rgba(61, 149, 236, 1)"]
:ytitle => "Minutes"
.clearfix

5
config/initializers/chartkick.rb
View file

@ -1 +1,4 @@
Chartkick.options[:content_for] = :charts_js
Chartkick.options = {
content_for: :charts_js,
colors: ["rgba(191, 220, 249, 1)", "rgba(113, 176, 239, 1)", "rgba(61, 149, 236, 1)"]
}