From e7a16dbb98de59ea10da3c4d7b24733ef784a865 Mon Sep 17 00:00:00 2001 From: Tanvir Chahal Date: Wed, 10 Nov 2021 20:23:52 +0530 Subject: [PATCH] Fix/charts colorpicker (#513) --- .../javascript/dist/modules/viz-preview.js | 2 +- .../dist/visualizations_settings.js | 36 +++++++++++++++++-- 2 files changed, 35 insertions(+), 3 deletions(-) diff --git a/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js b/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js index f5413d06..9d5e6d35 100644 --- a/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js +++ b/ckanext/querytool/fanstatic/javascript/dist/modules/viz-preview.js @@ -2490,7 +2490,7 @@ if(document.getElementById("loading-"+this.options.chart_id)){ document.getElementById("loading-"+this.options.chart_id).style.display = "none"; } - + var q = JSON.parse(JSON.stringify(plotly)); diff --git a/ckanext/querytool/fanstatic/javascript/dist/visualizations_settings.js b/ckanext/querytool/fanstatic/javascript/dist/visualizations_settings.js index 9f476501..32241b6f 100644 --- a/ckanext/querytool/fanstatic/javascript/dist/visualizations_settings.js +++ b/ckanext/querytool/fanstatic/javascript/dist/visualizations_settings.js @@ -1460,7 +1460,7 @@ g = e.find("[id*=chart_field_padding_top_]"), y = e.find("[id*=chart_field_padding_bottom_]"), b = e.find("[id*=chart_field_tick_count_]"), - x = e.find("[id*=chart_field_size_]"), + xx = e.find("[id*=chart_field_size_]"), S = e.find("[id*=chart_field_filter_name_]"), O = e.find("[id*=chart_field_filter_value_]"), w = e.find("[id*=chart_div_filter_value_]"), @@ -1498,11 +1498,43 @@ plotly_label = e.find("[id*=chart_field_plotly_label_]"), donut_hole = e.find("[id*=chart_field_donut_hole_]"), bar_width = e.find("[id*=chart_field_bar_width_]"); - e.attr("id", "chart_field_" + i), r.attr("id", "chart_field_graph_" + i), r.attr("name", "chart_field_graph_" + i), n.attr("id", "chart_field_color_" + i), n.attr("name", "chart_field_color_" + i), dr.attr("data-target", "chart_field_color_" + i), n.attr("for", "chart_field_color_" + i), nn.attr("id", "chart_field_seq_color_" + i), nn.attr("name", "chart_field_seq_color_" + i), dtr.attr("data-target", "chart_field_seq_color_" + i), nn.attr("for", "chart_field_seq_color_" + i), nnn.attr("id", "chart_field_color_type_" + i), nnn.attr("name", "chart_field_color_type_" + i), nnnn.attr("class", "chart_field_color_wrap_" + i), sq.attr("class", "seq-colors-" + i), dv.attr("class", "diver-colors-" + i), sa.attr("id", "chart_field_show_annotations_" + i), sa.attr("name", "chart_field_show_annotations_" + i), a.attr("id", "chart_field_axis_y_" + i), a.attr("name", "chart_field_axis_y_" + i), o.attr("id", "chart_field_axis_x_" + i), o.attr("name", "chart_field_axis_x_" + i), l.attr("id", "chart_field_title_" + i), l.attr("name", "chart_field_title_" + i), _.attr("id", "chart_field_x_text_rotate_" + i), _.attr("name", "chart_field_x_text_rotate_" + i), c.attr("id", "chart_field_labels_" + i), c.attr("name", "chart_field_labels_" + i), d.attr("id", "chart_field_legend_" + i), d.attr("name", "chart_field_legend_" + i), f.attr("id", "chart_field_show_labels_as_percentages_" + i), f.attr("name", "chart_field_show_labels_as_percentages_" + i), u.attr("id", "chart_field_tooltip_name_" + i), u.attr("name", "chart_field_tooltip_name_" + i), s.attr("id", "chart_field_data_format_" + i), s.attr("name", "chart_field_data_format_" + i), p.attr("id", "chart_field_y_ticks_format_" + i), p.attr("name", "chart_field_y_ticks_format_" + i), xf.attr("id", "chart_field_x_ticks_format_" + i), xf.attr("name", "chart_field_x_ticks_format_" + i), h.attr("id", "chart_field_y_label_" + i), h.attr("name", "chart_field_y_label_" + i), m.attr("id", "chart_field_y_label_hide_" + i), m.attr("name", "chart_field_y_label_hide_" + i), xl.attr("id", "chart_field_x_label_" + i), xl.attr("name", "chart_field_x_label_" + i), xlh.attr("id", "chart_field_x_label_hide_" + i), xlh.attr("name", "chart_field_x_label_hide_" + i), v.attr("id", "chart_field_y_from_zero_" + i), v.attr("name", "chart_field_y_from_zero_" + i), xfz.attr("id", "chart_field_x_from_zero_" + i), xfz.attr("name", "chart_field_x_from_zero_" + i), g.attr("id", "chart_field_padding_top_" + i), g.attr("name", "chart_field_padding_top_" + i), y.attr("id", "chart_field_padding_bottom_" + i), y.attr("name", "chart_field_padding_bottom_" + i), x.attr("id", "chart_field_size_" + i), x.attr("name", "chart_field_size_" + i), S.attr("id", "chart_field_filter_name_" + i), S.attr("name", "chart_field_filter_name_" + i), b.attr("id", "chart_field_tick_count_" + i), b.attr("name", "chart_field_tick_count_" + i), O.attr("id", "chart_field_filter_value_" + i), O.attr("name", "chart_field_filter_value_" + i), w.attr("id", "chart_div_filter_value_" + i), k.attr("id", "chart_field_filter_alias_" + i), k.attr("name", "chart_field_filter_alias_" + i), j.attr("id", "chart_div_filter_alias_" + i), E.attr("id", "chart_field_filter_visibility_" + i), E.attr("name", "chart_field_filter_visibility_" + i), P.attr("id", "chart_div_filter_visibility_" + i), T.attr("id", "chart_field_static_reference_columns_" + i), T.attr("name", "chart_field_static_reference_columns_" + i), C.attr("id", "chart_field_static_reference_label_" + i), C.attr("name", "chart_field_static_reference_label_" + i), z.attr("id", "chart_field_dynamic_reference_type_" + i), z.attr("name", "chart_field_dynamic_reference_type_" + i), A.attr("id", "chart_field_dynamic_reference_factor_" + i), A.attr("name", "chart_field_dynamic_reference_factor_" + i), I.attr("id", "chart_field_dynamic_reference_label_" + i), I.attr("name", "chart_field_dynamic_reference_label_" + i), q.attr("id", "resource_id_" + i), q.attr("name", "resource_id_" + i), N.attr("id", "chart_field_category_name_" + i), N.attr("name", "chart_field_category_name_" + i), D.attr("id", "chart_field_sort_" + i), D.attr("name", "chart_field_sort_" + i), V.attr("id", "chart_field_sort_div_" + i), M.attr("id", "chart_field_chart_padding_left_" + i), M.attr("name", "chart_field_chart_padding_left_" + i), L.attr("id", "chart_field_chart_padding_bottom_" + i), L.attr("name", "chart_field_chart_padding_bottom_" + i), R.attr("id", "chart_field_x_text_multiline_" + i), R.attr("name", "chart_field_x_text_multiline_" + i), F.attr("id", "chart_field_x_tick_culling_max_" + i), F.attr("name", "chart_field_x_tick_culling_max_" + i), + + + //console.log(dr); + console.log(n); + if(dr['length'] > 1) { + for(var x = 1; x <= dr['length'] ; x++){ + //console.log(x); + //console.log(dr[0]) + dr[x-1].setAttribute("data-target", "chart_field_color_" + i+"_"+x) + n[x].setAttribute("for", "chart_field_color_" + i+"_"+x) + n[x].setAttribute("id", "chart_field_color_" + i+"_"+x) + n[x].setAttribute("name", "chart_field_color_" + i+"_"+x) + } + } else { + dr.attr("data-target", "chart_field_color_" + i+"_1") + n.attr("for", "chart_field_color_" + i+"_1") + n.attr("id", "chart_field_color_" + i+"_1") + n.attr("name", "chart_field_color_" + i+"_1") + } + + e.attr("id", "chart_field_" + i), r.attr("id", "chart_field_graph_" + i), r.attr("name", "chart_field_graph_" + i), nn.attr("id", "chart_field_seq_color_" + i), nn.attr("name", "chart_field_seq_color_" + i), dtr.attr("data-target", "chart_field_seq_color_" + i), nn.attr("for", "chart_field_seq_color_" + i), nnn.attr("id", "chart_field_color_type_" + i), nnn.attr("name", "chart_field_color_type_" + i), nnnn.attr("class", "chart_field_color_wrap_" + i), sq.attr("class", "seq-colors-" + i), dv.attr("class", "diver-colors-" + i), sa.attr("id", "chart_field_show_annotations_" + i), sa.attr("name", "chart_field_show_annotations_" + i), a.attr("id", "chart_field_axis_y_" + i), a.attr("name", "chart_field_axis_y_" + i), o.attr("id", "chart_field_axis_x_" + i), o.attr("name", "chart_field_axis_x_" + i), l.attr("id", "chart_field_title_" + i), l.attr("name", "chart_field_title_" + i), _.attr("id", "chart_field_x_text_rotate_" + i), _.attr("name", "chart_field_x_text_rotate_" + i), c.attr("id", "chart_field_labels_" + i), c.attr("name", "chart_field_labels_" + i), d.attr("id", "chart_field_legend_" + i), d.attr("name", "chart_field_legend_" + i), f.attr("id", "chart_field_show_labels_as_percentages_" + i), f.attr("name", "chart_field_show_labels_as_percentages_" + i), u.attr("id", "chart_field_tooltip_name_" + i), u.attr("name", "chart_field_tooltip_name_" + i), s.attr("id", "chart_field_data_format_" + i), s.attr("name", "chart_field_data_format_" + i), p.attr("id", "chart_field_y_ticks_format_" + i), p.attr("name", "chart_field_y_ticks_format_" + i), xf.attr("id", "chart_field_x_ticks_format_" + i), xf.attr("name", "chart_field_x_ticks_format_" + i), h.attr("id", "chart_field_y_label_" + i), h.attr("name", "chart_field_y_label_" + i), m.attr("id", "chart_field_y_label_hide_" + i), m.attr("name", "chart_field_y_label_hide_" + i), xl.attr("id", "chart_field_x_label_" + i), xl.attr("name", "chart_field_x_label_" + i), xlh.attr("id", "chart_field_x_label_hide_" + i), xlh.attr("name", "chart_field_x_label_hide_" + i), v.attr("id", "chart_field_y_from_zero_" + i), v.attr("name", "chart_field_y_from_zero_" + i), xfz.attr("id", "chart_field_x_from_zero_" + i), xfz.attr("name", "chart_field_x_from_zero_" + i), g.attr("id", "chart_field_padding_top_" + i), g.attr("name", "chart_field_padding_top_" + i), y.attr("id", "chart_field_padding_bottom_" + i), y.attr("name", "chart_field_padding_bottom_" + i), xx.attr("id", "chart_field_size_" + i), xx.attr("name", "chart_field_size_" + i), S.attr("id", "chart_field_filter_name_" + i), S.attr("name", "chart_field_filter_name_" + i), b.attr("id", "chart_field_tick_count_" + i), b.attr("name", "chart_field_tick_count_" + i), O.attr("id", "chart_field_filter_value_" + i), O.attr("name", "chart_field_filter_value_" + i), w.attr("id", "chart_div_filter_value_" + i), k.attr("id", "chart_field_filter_alias_" + i), k.attr("name", "chart_field_filter_alias_" + i), j.attr("id", "chart_div_filter_alias_" + i), E.attr("id", "chart_field_filter_visibility_" + i), E.attr("name", "chart_field_filter_visibility_" + i), P.attr("id", "chart_div_filter_visibility_" + i), T.attr("id", "chart_field_static_reference_columns_" + i), T.attr("name", "chart_field_static_reference_columns_" + i), C.attr("id", "chart_field_static_reference_label_" + i), C.attr("name", "chart_field_static_reference_label_" + i), z.attr("id", "chart_field_dynamic_reference_type_" + i), z.attr("name", "chart_field_dynamic_reference_type_" + i), A.attr("id", "chart_field_dynamic_reference_factor_" + i), A.attr("name", "chart_field_dynamic_reference_factor_" + i), I.attr("id", "chart_field_dynamic_reference_label_" + i), I.attr("name", "chart_field_dynamic_reference_label_" + i), q.attr("id", "resource_id_" + i), q.attr("name", "resource_id_" + i), N.attr("id", "chart_field_category_name_" + i), N.attr("name", "chart_field_category_name_" + i), D.attr("id", "chart_field_sort_" + i), D.attr("name", "chart_field_sort_" + i), V.attr("id", "chart_field_sort_div_" + i), M.attr("id", "chart_field_chart_padding_left_" + i), M.attr("name", "chart_field_chart_padding_left_" + i), L.attr("id", "chart_field_chart_padding_bottom_" + i), L.attr("name", "chart_field_chart_padding_bottom_" + i), R.attr("id", "chart_field_x_text_multiline_" + i), R.attr("name", "chart_field_x_text_multiline_" + i), F.attr("id", "chart_field_x_tick_culling_max_" + i), F.attr("name", "chart_field_x_tick_culling_max_" + i), plotly.attr("id", "chart_field_plotly_" + i), plotly.attr("name", "chart_field_plotly_" + i), plotly_label.attr("id", "chart_field_plotly_label_" + i), plotly_label.attr("name", "chart_field_plotly_label_" + i), donut_hole.attr("id", "chart_field_donut_hole_" + i), donut_hole.attr("name", "chart_field_donut_hole_" + i), bar_width.attr("id", "chart_field_bar_width_" + i), bar_width.attr("name", "chart_field_bar_width_" + i) + + + + if(nnn[0].value == "2"){ + dv[0].classList.add("hidden"); + sq[0].classList.remove("hidden"); + //alert('seq'); + } else { + //alert('diver'); + dv[0].classList.remove("hidden"); + sq[0].classList.add("hidden"); + } desc.attr('id', 'chart_field_desc_' + i); desc.attr('name', 'chart_field_desc_' + i);