X axis sorting (#499)

Author: tanvirchahal

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

@@ -282,7 +282,6 @@
                </div>
             </div>
 
-
             {# X-axis label orientation #}
             {% set text_rotation = h.querytool_get_tick_text_rotation() %}
             {% if selected_chart_type in ['pie', 'donut'] %}
@@ -301,6 +300,8 @@
               </div>
             </div>
 
+            
+
             {# X-axis label multiline #}
             {% if chart %}
               {% set x_text_multiline = chart.x_text_multiline %}
@@ -370,6 +371,7 @@
         <div id="accordion_{{ chart_id }}_y_axis" class="accordion-body collapse">
           <div class="accordion-inner">
 
+
             {# Y-axis title #}
             {% if chart %}
               {% set y_label = chart.y_label %}
@@ -454,6 +456,18 @@
         <div id="accordion_{{ chart_id }}_graph" class="accordion-body collapse">
           <div class="accordion-inner">
 
+            {# X sorting #}
+            {% set sort_options = h.querytool_get_chart_sort() %}
+            <div id="chart_field_sort_div_{{ n }}" class="control-group control-select {% if chart and chart.category_name %}hidden{% endif %}">
+              <label class="control-label" for="chart_field_sort_{{ n }}">{{ _('Data sorting') }}</label>
+              <div class="controls ">
+                <select id="chart_field_sort_{{ n }}" name="chart_field_sort_{{ n }}" >
+                  {% for sort in sort_options %}
+                  <option value="{{ sort.value }}" {% if chart %}{{ 'selected' if sort.value == chart.sort }}{% endif %} >{{ sort.text }}</option>
+                  {% endfor %}
+                </select>
+              </div>
+            </div>
 
             {# Data format #}
             {% set data_formats = h.queytool_get_charts_data_formats() %}
@@ -473,19 +487,6 @@
               </div>
             </div>
 
-            {# X sorting #}
-            {% set sort_options = h.querytool_get_chart_sort() %}
-            <div id="chart_field_sort_div_{{ n }}" class="control-group control-select {% if chart and chart.category_name %}hidden{% endif %}">
-              <label class="control-label" for="chart_field_sort_{{ n }}">{{ _('Data sorting') }}</label>
-              <div class="controls ">
-                <select id="chart_field_sort_{{ n }}" name="chart_field_sort_{{ n }}" >
-                  {% for sort in sort_options %}
-                  <option value="{{ sort.value }}" {% if chart %}{{ 'selected' if sort.value == chart.sort }}{% endif %} >{{ sort.text }}</option>
-                  {% endfor %}
-                </select>
-              </div>
-            </div>
-
             {# Donut chart hole #}
             {% if chart %}
               {% set donut_hole = chart.donut_hole or 0.4 %}
@@ -629,18 +630,6 @@
             </div>
             {# {% endif %} #}
 
-            {# X sorting #}
-            {% set sort_options = h.querytool_get_chart_sort() %}
-            <div id="chart_field_sort_div_{{ n }}" class="control-group control-select {% if chart and chart.category_name %}hidden{% endif %}">
-              <label class="control-label" for="chart_field_sort_{{ n }}">{{ _('Data sorting') }}</label>
-              <div class="controls ">
-                <select id="chart_field_sort_{{ n }}" name="chart_field_sort_{{ n }}" >
-                  {% for sort in sort_options %}
-                  <option value="{{ sort.value }}" {% if chart %}{{ 'selected' if sort.value == chart.sort }}{% endif %} >{{ sort.text }}</option>
-                  {% endfor %}
-                </select>
-              </div>
-            </div>
 
           </div>
         </div>