Make color pattern to be configurable per view

datopian · Jun 20, 2017 · 598dc97 · 598dc97
1 parent 6b2d4a5
commit 598dc97
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/ckanext/c3charts/fanstatic/charts.js b/ckanext/c3charts/fanstatic/charts.js
@@ -188,6 +188,9 @@ this.ckan.views.c3charts = this.ckan.views.c3charts || {};
         }
 
         var colorPattern = ['#00A58D', '#09505D', '#00587C', '#00A6BC', '#9FCD91', '#293A4C', '#83CCD8', '#A0C1C2'];
+        if (resourceView.color_pattern){
+            colorPattern = resourceView.color_pattern.split(',')
+        }
         if (resourceView.sql_expression) {
             data = resourceView.sql_data;
             if (resourceView.use_sql_keys)

diff --git a/ckanext/c3charts/fanstatic/charts.min.js b/ckanext/c3charts/fanstatic/charts.min.js
diff --git a/ckanext/c3charts/plugin.py b/ckanext/c3charts/plugin.py
@@ -55,7 +55,8 @@ def info(self):
             'sql_expression': [ignore_missing],
             'use_sql_keys': [ignore_missing],
             'y_label_position': [ignore_missing],
-            'x_label_position': [ignore_missing]
+            'x_label_position': [ignore_missing],
+            'color_pattern': [ignore_missing]
         }
         map(lambda s: schema.update({'{0}_padding'.format(s): [ignore_missing]}), ('r', 'l', 't', 'b'))
 

diff --git a/ckanext/c3charts/templates/charts_form.html b/ckanext/c3charts/templates/charts_form.html
@@ -79,6 +79,7 @@ <h2 class="panel-title">{{_('Chart Options')}}</h2>
                 {{ form.select('remap_key', label=_('Remap'), options=remap_keys, selected=resource_view['remap_key'], is_required=False)
                 }}
             </div>
+            {{ form.input('color_pattern', label=_('Color pattern (comma separated list of hex colors)'), value=resource_view['color_pattern']) }}
         </div>
     </div>