Merge pull request #111 from ViderumGlobal/add-y-label

Add y label

Author: ZoranPandovski

ckanext/querytool/controllers/querytool.py

@@ -269,6 +269,8 @@ def edit_visualizations(self, querytool=None, data=None,
                         data['chart_field_padding_bottom_{}'.format(id)]
                     visualization['padding_top'] = \
                         data['chart_field_padding_top_{}'.format(id)]
+                    visualization['y_label'] = \
+                        data['chart_field_y_label_{}'.format(id)]
                     if 'chart_field_legend_{}'.format(id) in data:
                         visualization['show_legend'] = 'true'
                     else:

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

@@ -86,7 +86,7 @@ ckan.module('querytool-viz-preview', function() {
             var padding_top = this.options.padding_top;
             var padding_bottom = this.options.padding_bottom;
             var show_labels = this.options.show_labels;
-
+            var y_label = this.options.y_label;
             var options = {
                 bindto: this.el[0],
                 color: {
@@ -228,7 +228,8 @@ ckan.module('querytool-viz-preview', function() {
                     padding: {
                          top: padding_top,
                          bottom: padding_bottom
-                    }
+                    },
+                    label: y_label
                     },
                     x: {
                         type: 'category',
@@ -287,6 +288,9 @@ ckan.module('querytool-viz-preview', function() {
             var dataLabels =  chartField.find('input[name*=chart_field_labels_]');
             var dataLabelsVal = dataLabels.is(':checked');
 
+            var yLabbel = chartField.find('input[name*=chart_field_y_label_]');
+            var yLabbelVal = yLabbel.val();
+
             // If the changed values from the dropdowns are from color, chart type or text rotate
             // then just update the chart without fetching new data. This leads
             // to a better UX.
@@ -304,6 +308,7 @@ ckan.module('querytool-viz-preview', function() {
                 this.options.padding_top = paddingTopVal;
                 this.options.padding_bottom = paddingBottomVal;
                 this.options.show_labels = dataLabelsVal;
+                this.options.y_label = yLabbelVal;
                 this.createChart(this.fetched_data);
 
                 return;
@@ -322,6 +327,7 @@ ckan.module('querytool-viz-preview', function() {
             this.options.padding_top = paddingTopVal;
             this.options.padding_bottom = paddingBottomVal;
             this.options.show_labels = dataLabelsVal;
+            this.options.y_label = yLabbelVal;
             var newSqlString = this.create_sql_string();
 
             this.get_resource_datа(newSqlString);

ckanext/querytool/templates/ajax_snippets/chart_fields.html

@@ -113,6 +113,16 @@
         </div>
       </div>
 
+      {% if chart %}
+        {% set y_label = chart.y_label %}
+      {% endif %}
+       <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 }}">
+        </div>
+      </div>
+
 
         {% if chart %}
           {% set ptop = chart.padding_top %}
@@ -159,6 +169,7 @@
         {% set padding_bottom = chart.padding_bottom %}
         {% set padding_top = chart.padding_top %}
         {% set show_labels = chart.show_labels %}
+        {% set y_label = chart.y_label %}
       {% endif %}
 
       {% snippet 'ajax_snippets/visualization_item.html',
@@ -176,7 +187,8 @@
           y_tick_format = y_tick_format,
           padding_bottom = padding_bottom,
           padding_top = padding_top,
-          show_labels = show_labels
+          show_labels = show_labels,
+          y_label = y_label
       %}
     </div>
 </div>

ckanext/querytool/templates/ajax_snippets/visualization_item.html

@@ -13,6 +13,7 @@
      data-module-y_tick_format="{{ y_tick_format }}"
      data-module-padding_top="{{ padding_top }}"
      data-module-padding_bottom="{{ padding_bottom }}"
-     data-module-show_labels="{{ show_labels }}">
+     data-module-show_labels="{{ show_labels }}"
+     data-module-y_label="{{ y_label }}">
      Loading...
     </div>

ckanext/querytool/templates/querytool/public/read.html

@@ -83,7 +83,8 @@ <h1>{{ querytool.title }}</h1>`
         y_tick_format = item.y_tick_format,
         padding_bottom = item.padding_bottom,
         padding_top = item.padding_top,
-        show_labels = item.show_labels
+        show_labels = item.show_labels,
+        y_label = item.y_label
         %}
       </div>
     {% endfor %}