Commit 7d095c38f0cd291319aa6111c09a850f5f14b00b
1 parent
5f89fdc7
Exists in
master
and in
4 other branches
One color scale by chart
Showing
1 changed file
with
6 additions
and
5 deletions
Show diff stats
app/main/static/js/charges.js
... | ... | @@ -10,7 +10,6 @@ function build_chart(div_selector, data_url, project_name, category) { |
10 | 10 | const tooltip_offset = {dx: 0, dy: 100} |
11 | 11 | const tooltip_offset_dot = {dx: 20, dy: 60} |
12 | 12 | |
13 | - const colorScale = d3.scaleOrdinal(d3.schemeCategory10); | |
14 | 13 | |
15 | 14 | const y_ticks_num = 5 |
16 | 15 | |
... | ... | @@ -26,23 +25,25 @@ function build_chart(div_selector, data_url, project_name, category) { |
26 | 25 | const yScale = d3.scaleLinear() |
27 | 26 | .range([height, 0]) |
28 | 27 | |
28 | + var colorScale = d3.scaleOrdinal([]) | |
29 | 29 | |
30 | 30 | var chart_title = "" |
31 | 31 | var category_title = "" |
32 | - var draw_total_line = function (data, categories) { | |
33 | - } | |
34 | - var draw_categories_bars = function (data, categories) { | |
35 | - } | |
32 | + var draw_total_line = function (data, categories) { } | |
33 | + var draw_categories_bars = function (data, categories) { } | |
34 | + | |
36 | 35 | if (category == 'capacity') { |
37 | 36 | chart_title = "Charges par fonction" |
38 | 37 | category_title = "Fonction" |
39 | 38 | //draw_total_line |
40 | 39 | draw_categories_bars = draw_categories_grouped |
40 | + colorScale = d3.scaleOrdinal(d3.schemeSet3); | |
41 | 41 | } else if (category == 'service') { |
42 | 42 | chart_title = "Charges par service" |
43 | 43 | category_title = "Service" |
44 | 44 | draw_total_line = draw_totalcharge_line |
45 | 45 | draw_categories_bars = draw_categories_stacked |
46 | + colorScale = d3.scaleOrdinal(d3.schemeTableau10); | |
46 | 47 | } else { |
47 | 48 | alert("ALERT ! Every body shall quit the boat, we are sinking ! ALERT !") |
48 | 49 | } | ... | ... |