Skip to content

Commit ca21fbe

Browse files
authored
Fix/chart creation (#509)
1 parent a1089c8 commit ca21fbe

File tree

5 files changed

+48
-11
lines changed

5 files changed

+48
-11
lines changed

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

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ckanext/querytool/fanstatic/javascript/dist/visualizations_settings.js

Lines changed: 38 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

ckanext/querytool/fanstatic/javascript/vitals.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1111,11 +1111,11 @@ function hideAxisPercentagesCheckbox(selected,chart_number){
11111111

11121112
function hideAxisMinMax(selected,chart_number,rangeEnabled){
11131113
if(['shbar', 'sbar', 'pie', 'donut'].includes(selected) || [false, undefined].includes(rangeEnabled)) {
1114-
$(`.axis_range_min_${chart_number}`).addClass('hidden');
1115-
$(`.axis_range_max_${chart_number}`).addClass('hidden');
1114+
$(`#axis_range_min_${chart_number}`).addClass('hidden');
1115+
$(`#axis_range_max_${chart_number}`).addClass('hidden');
11161116
} else {
1117-
$(`.axis_range_min_${chart_number}`).removeClass('hidden');
1118-
$(`.axis_range_max_${chart_number}`).removeClass('hidden');
1117+
$(`#axis_range_min_${chart_number}`).removeClass('hidden');
1118+
$(`#axis_range_max_${chart_number}`).removeClass('hidden');
11191119
}
11201120
};
11211121

ckanext/querytool/helpers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -422,7 +422,7 @@ def get_geojson_resources():
422422

423423
def get_geojson_properties(url):
424424
# TODO handle if no url
425-
resp = requests.get(url)
425+
resp = requests.get(url, verify=False)
426426
geojson = resp.json()
427427

428428
result = []
@@ -448,7 +448,7 @@ def get_map_data(geojson_url, map_key_field, data_key_field,
448448

449449
geojson_keys = []
450450
# response = urllib.urlopen(geojson_url)
451-
resp = requests.get(geojson_url)
451+
resp = requests.get(geojson_url, verify=False)
452452
# geojson_data = json.loads(response.read())
453453
geojson_data = resp.json()
454454

ckanext/querytool/templates/ajax_snippets/chart_item.html

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -650,23 +650,23 @@
650650
{% set show_range_options = 'hidden' %}
651651
{% endif %}
652652

653-
<div class="control-group show_axis_range_{{ n }} {{show_range}}">
653+
<div class="control-group {{show_range}}" id="show_axis_range_{{ n }}">
654654
<label class="control-label" for="chart_field_axis_range_{{ n }}">{{ _('Set axis range') }}</label>
655655
<div class="controls ">
656656
<input id="chart_field_axis_range_{{ n }}" type="checkbox" name="chart_field_axis_range_{{ n }}" value="{{ axis_range }}" {% if axis_range=='true' %}checked{% endif %}>
657657
</div>
658658
</div>
659659

660660
{# Axis range min #}
661-
<div class="control-group axis_range_min_{{n}} {{ show_range_options }}">
661+
<div class="control-group {{ show_range_options }}" id="axis_range_min_{{n}}">
662662
<label class="control-label" for="chart_field_axis_min_{{ n }}">{{ _('Axis range minimum') }}</label>
663663
<div class="controls ">
664664
<input id="chart_field_axis_min_{{ n }}" type="text" name="chart_field_axis_min_{{ n }}" value="{{ axis_min }}" placeholder="{{ _('Axis minimum') }}">
665665
</div>
666666
</div>
667667

668668
{# Axis range max #}
669-
<div class="control-group axis_range_max_{{n}} {{ show_range_options }}">
669+
<div class="control-group {{ show_range_options }}" id="axis_range_max_{{n}}">
670670
<label class="control-label" for="chart_field_axis_max_{{ n }}">{{ _('Axis range maximum') }}</label>
671671
<div class="controls ">
672672
<input id="chart_field_axis_max_{{ n }}" type="text" name="chart_field_axis_max_{{ n }}" value="{{ axis_max }}" placeholder="{{ _('Axis maximum') }}">

0 commit comments

Comments
 (0)