Merge remote-tracking branch 'origin/malostik-feature-#6332-improve-searching-with-js' into devel

lib/hawat/blueprints/design_bs3/templates/_macros_chart.html

@@ -516,9 +516,11 @@
 -#}
 {%- macro _snippet_handle_rendering(data_var_name, dict_key) %}
     {%- if data_var_name %}
-                            render({{ data_var_name }})
-    {%- else %}
+                            render({{ data_var_name }});
+    {%- elif dict_key %}
                             (rendering_functions['{{ dict_key }}'] ??= []).push(render);
+    {%- else %}
+                            console.error('data_var_name nor dict_key are defined, skipping rendering');
     {%- endif %}
 {%- endmacro %}
 
@@ -540,10 +542,11 @@
         generating identifiers for all required HTML and JS elements.
     string list_keys: List of requested subkeys from which the target dataset will
         be constructed.
+    string dict_key: name under which the rendering function will be stored.
     dict cfg_params: Additional chart configuration and customization parameters.
 
 -#}
-{%- macro render_chart_timeline_list(full_data, data_var_name, id_prefix, list_keys, cfg_params = {}) %}
+{%- macro render_chart_timeline_list(full_data, data_var_name, id_prefix, list_keys, dict_key = '', cfg_params = {}) %}
 {%- set chart_id = 'chart_timeline_' + id_prefix %}
                     <!------------------------------------------------------------------
                         Dataset visualisation '{{ chart_id }}'
@@ -551,25 +554,31 @@
                     {{ _snippet_columns_toggable(chart_id) }}
 
                     <script>
-                        // Define dataset series.
-                        var {{ chart_id }}_series = [
+                        {
+                            let render = (data) => {
+                                // Define dataset series.
+                                var {{ chart_id }}_series = [
     {%- for subkey in list_keys %}
-                            {
-                                ident: '{{ subkey[0] }}',
-                                key: '{{ subkey[1] }}'
-                            }{%- if not loop.last %},{%- endif %}
+                                    {
+                                        ident: '{{ subkey[0] }}',
+                                        key: '{{ subkey[1] }}'
+                                    }{%- if not loop.last %},{%- endif %}
     {%- endfor %}
-                        ];
+                                ];
+
+                                // Calculate dataset '{{ chart_id }}'.
+                                var {{ chart_id }}_dataset = get_dataset_timeline_list(
+                                    data,
+                                    {{ chart_id }}_series
+                                    );
 
-                        // Calculate dataset '{{ chart_id }}'.
-                        var {{ chart_id }}_dataset = get_dataset_timeline_list(
-                            {{ data_var_name }},
-                            {{ chart_id }}_series
-                        );
+                                {{ _snippet_chart_timeline(chart_id, cfg_params) }}
+                                {{ _snippet_table_timeline(chart_id, cfg_params) }}
+                                {{ _snippet_ecbks_timeline(chart_id, cfg_params) }}
+                            }
 
-                        {{ _snippet_chart_timeline(chart_id, cfg_params) }}
-                        {{ _snippet_table_timeline(chart_id, cfg_params) }}
-                        {{ _snippet_ecbks_timeline(chart_id, cfg_params) }}
+                            {{ _snippet_handle_rendering(data_var_name, dict_key) }}
+                        }
                     </script>
 
 {%- endmacro %}
@@ -658,10 +667,11 @@
         generating identifiers for all required HTML and JS elements.
     string list_keys: List of requested subkeys from which the target dataset will
         be constructed.
+    string dict_key: name under which the rendering function will be stored.
     dict cfg_params: Additional chart configuration and customization parameters.
 
 -#}
-{%- macro render_dataset_pie_list(full_data, data_var_name, id_prefix, list_keys, cfg_params = {}) %}
+{%- macro render_dataset_pie_list(full_data, data_var_name, id_prefix, list_keys, dict_key = '', cfg_params = {}) %}
 {%- set chart_id = 'chart_pie_' + id_prefix %}
                     <!------------------------------------------------------------------
                         Dataset visualisation '{{ chart_id }}'
@@ -669,27 +679,31 @@
                     {{ _snippet_columns(chart_id, scrollable_table = False) }}
 
                     <script>
-                        // Define dataset series.
-                        var {{ chart_id }}_series = [
+                        {
+                            let render = (data) => {
+                                // Define dataset series.
+                                var {{ chart_id }}_series = [
     {%- for subkey in list_keys %}
-                            {
-                                ident: '{{ subkey[0] }}',
-                                key: '{{ subkey[1] }}'
-                            }{%- if not loop.last %},{%- endif %}
+                                    {
+                                        ident: '{{ subkey[0] }}',
+                                        key: '{{ subkey[1] }}'
+                                    }{%- if not loop.last %},{%- endif %}
     {%- endfor %}
-                        ];
-
-                        // Calculate dataset '{{ chart_id }}'.
-                        var {{ chart_id }}_dataset = get_dataset_list(
-                            {{ data_var_name }},
-                            {{ chart_id }}_series
-                        );
+                                ];
 
+                                // Calculate dataset '{{ chart_id }}'.
+                                var {{ chart_id }}_dataset = get_dataset_list(
+                                    data,
+                                    {{ chart_id }}_series
+                                );
 
-                        {{ _snippet_chart_pie(chart_id, cfg_params) }}
-                        {{ _snippet_table_dict(chart_id, cfg_params) }}
-                        {{ _snippet_ecbks_dict(chart_id, cfg_params) }}
+                                {{ _snippet_chart_pie(chart_id, cfg_params) }}
+                                {{ _snippet_table_dict(chart_id, cfg_params) }}
+                                {{ _snippet_ecbks_dict(chart_id, cfg_params) }}
+                            }
 
+                            {{ _snippet_handle_rendering(data_var_name, dict_key) }}
+                        }
                     </script>
 
 {%- endmacro %}