Merge pull request #112 from ViderumGlobal/charts-improvements

Charts improvements

Author: ZoranPandovski

ckanext/querytool/fanstatic/javascript/modules/viz-preview.js

@@ -186,15 +186,12 @@ ckan.module('querytool-viz-preview', function() {
                     // On horizontal bar the x axis is now actually the y axis
                     yrotate = x_text_rotate;
                 }
-
                 if(this.options.chart_type === 'bscatter'){
-                    var rs = d3.scale.linear()
-                          .domain([0.01, 100000])
-                          .range([5, 50]);
+                    //workaround for bubble charts, scale log base 10 because of large values
+                    var rs = d3.scale.log().base(10).domain([1,1000]).range([0,10]);
                     ctype = 'scatter';
                     options.point = {
                          r: function(d) {
-                                //workaround for bubble charts, divide by 10 because of large values
                                 var num = d.value;
                                 return rs(num)
                             },

ckanext/querytool/helpers.py

@@ -170,11 +170,14 @@ def get_color_scheme():
               {'value': '#22758e, #b63b3b, #f9c414, #e3e8e6, #4c4555, '
                         '#d53c3c, #80add3,  #97cfcc, #e4b03d, #c39de0',
                'text': 'Orient'},
-              {'value': '#3b5998, #8b9dc3, #dfe3ee, #f7f7f7, #ffffff, ',
-               'text': 'Facebook'},
-              {'value': '#ffb3ba, #ffdfba, #ffffba, #baffc9, #bae1ff, ',
+              {'value': '#3b5998, #8b9dc3, #dfe3ee, #f7f7f7, #ffffff, '
+                        '#011f4b, #03396c, #005b96, #6497b1, #6497b1',
+               'text': 'Blue'},
+              {'value': '#ffb3ba, #ffdfba, #ffffba, #baffc9, #bae1ff, '
+                        '#ee4035, #f37736, #fdf498, #7bc043, #0392cf',
                'text': 'Rainbow'},
-              {'value': '#2e4045, #83adb5, #c7bbc9, #5e3c58, #bfb5b2, ',
+              {'value': '#2e4045, #83adb5, #c7bbc9, #5e3c58, #bfb5b2, '
+                        '#a69eb0, #efeff2, #f2e2cd, #dadae3, #000000',
                'text': 'Muted'}
               ]
 
@@ -199,7 +202,8 @@ def get_charts_data_formats():
         Get available formats for charts tooltip and axis ticks
     :return:
     '''
-    options = [{'text': 'Dolar e.g 2000$', 'value': '$'},
+    options = [{'text': 'Default', 'value': ''},
+               {'text': 'Dolar e.g 2000$', 'value': '$'},
                {'text': 'Rounded e.g 2k', 'value': 's'},
                {'text': 'Percentage (multiply by 100) e.g 200000%',
                 'value': 'p'},

ckanext/querytool/templates/ajax_snippets/chart_fields.html

@@ -13,7 +13,7 @@
       <div class="control-group ">
         <label class="control-label" for="chart_field_title_{{ n }}">{{ _('Chart title') }}</label>
         <div class="controls ">
-          <input id="chart_field_title_{{ n }}" name="chart_field_title_{{ n }}" value="{{ chart_title }}" placeholder="{{ _('Chart title') }}" type="text">
+          <input id="chart_field_title_{{ n }}" name="chart_field_title_{{ n }}" value="{{ chart_title }}" placeholder="Chart title" type="text">
         </div>
       </div>
 
@@ -85,7 +85,7 @@
        <div class="control-group ">
         <label class="control-label" for="chart_field_tooltip_name_{{ n }}">{{ _('Tooltip name') }}</label>
         <div class="controls ">
-          <input id="chart_field_tooltip_name_{{ n }}" type="text" name="chart_field_tooltip_name_{{ n }}" value="{{ tooltip_name }}">
+          <input id="chart_field_tooltip_name_{{ n }}" type="text" name="chart_field_tooltip_name_{{ n }}" value="{{ tooltip_name }}" placeholder="Tooltip name">
         </div>
       </div>
 
@@ -119,7 +119,7 @@
        <div class="control-group ">
         <label class="control-label" for="chart_field_y_label_{{ n }}">{{ _('Y axis label') }}</label>
         <div class="controls ">
-          <input id="chart_field_y_label_{{ n }}" type="text" name="chart_field_y_label_{{ n }}" value="{{ y_label }}">
+          <input id="chart_field_y_label_{{ n }}" type="text" name="chart_field_y_label_{{ n }}" value="{{ y_label }}" placeholder="Y axis label">
         </div>
       </div>
 
@@ -130,7 +130,7 @@
        <div class="control-group ">
         <label class="control-label" for="chart_field_padding_top_{{ n }}">{{ _('Padding top') }}</label>
         <div class="controls ">
-          <input id="chart_field_padding_top_{{ n }}" type="text" name="chart_field_padding_top_{{ n }}" value="{{ ptop }}">
+          <input id="chart_field_padding_top_{{ n }}" type="number" min="0" name="chart_field_padding_top_{{ n }}" value="{{ ptop }}" placeholder="Default 0">
         </div>
        </div>
 
@@ -140,7 +140,7 @@
         <div class="control-group ">
         <label class="control-label" for="chart_field_padding_bottom_{{ n }}">{{ _('Padding bottom') }}</label>
         <div class="controls ">
-          <input id="chart_field_padding_bottom_{{ n }}" type="text" name="chart_field_padding_bottom_{{ n }}" value="{{ pbtm }}">
+          <input id="chart_field_padding_bottom_{{ n }}" type="number" min="0" name="chart_field_padding_bottom_{{ n }}" value="{{ pbtm }}" placeholder="Default 0">
         </div>
       </div>