django-advanced-report-builder 0.1.9__tar.gz → 0.2.0__tar.gz

{django-advanced-report-builder-0.1.9/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.2.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.1.9
+Version: 0.2.0
 Summary: Django app that allows you to build reports from modals
 Home-page: https://github.com/django-advance-utils/django-advanced-report-builder
 Author: Thomas Turner

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/includes.py

@@ -3,40 +3,40 @@ from ajax_helpers.html_include import SourceBase
 
 
 class Dot(SourceBase):
-    static_path = '/advanced_report_builder/dot/'
+    static_path = 'advanced_report_builder/dot/'
     js_filename = 'doT.js'
 
 
 class JQueryExtendext(SourceBase):
-    static_path = '/advanced_report_builder/jquery_extendext/'
+    static_path = 'advanced_report_builder/jquery_extendext/'
     js_filename = 'jQuery.extendext.js'
 
 
 class QueryBuilder(SourceBase):
-    static_path = '/advanced_report_builder/query_builder/'
+    static_path = 'advanced_report_builder/query_builder/'
     css_filename = 'query-builder.default.css'
     js_filename = 'query-builder.min.js'
 
 
 class DashboardInclude(SourceBase):
-    static_path = '/advanced_report_builder/dashboard/'
+    static_path = 'advanced_report_builder/dashboard/'
     js_filename = 'dashboard.js'
 
 
 class ChartJS(SourceBase):
-    static_path = '/advanced_report_builder/chart-js/'
+    static_path = 'advanced_report_builder/chart-js/'
     js_filename = ['chart.min.js',
                    'chartjs-adapter-moment.min.js',  # this does require moment however it's already included
                    'chartjs-plugin-datalabels.min.js']
 
 
 class D3(SourceBase):
-    static_path = '/advanced_report_builder/d3/'
+    static_path = 'advanced_report_builder/d3/'
     js_filename = ['d3.min.js']
 
 
 class D3Funnel(SourceBase):
-    static_path = '/advanced_report_builder/d3-funnel/'
+    static_path = 'advanced_report_builder/d3-funnel/'
     js_filename = ['d3-funnel.min.js']
 
 

django-advanced-report-builder-0.2.0/advanced_report_builder/templates/advanced_report_builder/charts/modal_field.html

@@ -0,0 +1,13 @@
+{% extends 'django_modals/modal_base.html' %}
+
+{% block javascript %}
+<script>
+
+
+    function save_modal_{{ form.form_id }}() {
+        id_filter.save_query_builder();
+        django_modal.process_commands_lock([{'function': 'post_modal'}]);
+    }
+
+</script>
+{% endblock %}

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/templates/advanced_report_builder/datatables/fields/single_query_builder.html

@@ -80,8 +80,7 @@
 
 
     ajax_helpers.command_functions.save_query_builder_{{ field.auto_id }} = function (command) {
-        {{ field.auto_id }}.
-        save_query_builder()
+        {{ field.auto_id }}.save_query_builder()
     };
 
     </script>

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/views/bar_charts.py

@@ -206,7 +206,7 @@ class BarChartFieldForm(ChartBaseFieldForm):
 class BarChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
     form_class = BarChartFieldForm
     size = 'xl'
-    template_name = 'advanced_report_builder/charts/modal.html'
+    template_name = 'advanced_report_builder/charts/modal_field.html'
     no_header_x = True
     helper_class = HorizontalNoEnterHelper
 

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/views/funnel_charts.py

@@ -147,7 +147,7 @@ class FunnelChartFieldForm(ChartBaseFieldForm):
 class FunnelChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
     form_class = FunnelChartFieldForm
     size = 'xl'
-    template_name = 'advanced_report_builder/charts/modal.html'
+    template_name = 'advanced_report_builder/charts/modal_field.html'
     no_header_x = True
     helper_class = HorizontalNoEnterHelper
 

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/views/line_charts.py

@@ -250,7 +250,7 @@ class LineChartFieldForm(ChartBaseFieldForm):
 class LineChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
     form_class = LineChartFieldForm
     size = 'xl'
-    template_name = 'advanced_report_builder/charts/modal.html'
+    template_name = 'advanced_report_builder/charts/modal_field.html'
     no_header_x = True
     helper_class = HorizontalNoEnterHelper
 

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/views/pie_charts.py

@@ -147,7 +147,7 @@ class PieChartFieldForm(ChartBaseFieldForm):
 class PieChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
     form_class = PieChartFieldForm
     size = 'xl'
-    template_name = 'advanced_report_builder/charts/modal.html'
+    template_name = 'advanced_report_builder/charts/modal_field.html'
     no_header_x = True
     helper_class = HorizontalNoEnterHelper
 

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/advanced_report_builder/views/single_values.py

@@ -411,7 +411,6 @@ class ShowBreakdownModal(TableUtilsMixin, Modal):
         return table.render()
 
 
-
 class SingleValueTableFieldForm(TableFieldForm):
     cancel_class = 'btn-secondary modal-cancel'
 

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.1.9
+Version: 0.2.0
 Summary: Django app that allows you to build reports from modals
 Home-page: https://github.com/django-advance-utils/django-advanced-report-builder
 Author: Thomas Turner

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/django_advanced_report_builder.egg-info/SOURCES.txt

@@ -103,6 +103,7 @@ advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugin
 advanced_report_builder/templates/advanced_report_builder/query_builder.html
 advanced_report_builder/templates/advanced_report_builder/select_column.html
 advanced_report_builder/templates/advanced_report_builder/charts/modal.html
+advanced_report_builder/templates/advanced_report_builder/charts/modal_field.html
 advanced_report_builder/templates/advanced_report_builder/charts/report.html
 advanced_report_builder/templates/advanced_report_builder/charts/bar/middle.html
 advanced_report_builder/templates/advanced_report_builder/charts/funnel/middle.html

{django-advanced-report-builder-0.1.9 → django-advanced-report-builder-0.2.0}/setup.py

@@ -5,7 +5,7 @@ with open("README.md", "r") as fh:
 
 setuptools.setup(
     name="django-advanced-report-builder",
-    version="0.1.9",
+    version="0.2.0",
     author="Thomas Turner",
     description="Django app that allows you to build reports from modals",
     long_description=long_description,