django-advanced-report-builder 0.7.1__tar.gz → 0.7.4__tar.gz

{django-advanced-report-builder-0.7.1/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.7.1
+Version: 0.7.4
 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.7.1 → django-advanced-report-builder-0.7.4}/advanced_report_builder/views/charts_base.py

@@ -24,6 +24,7 @@ from advanced_report_builder.globals import NUMBER_FIELDS, ANNOTATION_VALUE_FUNC
 from advanced_report_builder.models import ReportType
 from advanced_report_builder.utils import split_slug, split_attr, get_report_builder_class
 from advanced_report_builder.variable_date import VariableDate
+from advanced_report_builder.views.helpers import QueryBuilderForm
 from advanced_report_builder.views.report import ReportBase
 from advanced_report_builder.views.report_utils_mixin import ReportUtilsMixin
 from advanced_report_builder.views.targets.utils import get_target_value
@@ -334,7 +335,7 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
         return divider
 
 
-class ChartBaseFieldForm(ReportBuilderFieldUtils, CrispyForm):
+class ChartBaseFieldForm(ReportBuilderFieldUtils, QueryBuilderForm):
     cancel_class = 'btn-secondary modal-cancel'
 
     def __init__(self, *args, **kwargs):
@@ -342,9 +343,6 @@ class ChartBaseFieldForm(ReportBuilderFieldUtils, CrispyForm):
         self.col_type_override = None
         super().__init__(*args, **kwargs)
 
-    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
-        return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
-
     def cancel_button(self, css_class=cancel_class, **kwargs):
         commands = [{'function': 'close'}]
         return self.button('Cancel', commands, css_class, **kwargs)

django-advanced-report-builder-0.7.4/advanced_report_builder/views/helpers.py

@@ -0,0 +1,12 @@
+from crispy_forms.bootstrap import StrictButton
+from django_modals.forms import ModelCrispyForm, CrispyForm
+
+
+class QueryBuilderModelForm(ModelCrispyForm):
+    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
+        return StrictButton(button_text, onclick=f'save_modal_{ self.form_id }()', css_class=css_class, **kwargs)
+
+
+class QueryBuilderForm(CrispyForm):
+    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
+        return StrictButton(button_text, onclick=f'save_modal_{ self.form_id }()', css_class=css_class, **kwargs)

{django-advanced-report-builder-0.7.1 → django-advanced-report-builder-0.7.4}/advanced_report_builder/views/query_modal/modal.py

@@ -16,10 +16,11 @@ from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
 from advanced_report_builder.models import ReportQuery, ReportQueryOrder, ReportType
 from advanced_report_builder.toggle import RBToggle
 from advanced_report_builder.utils import get_query_js
+from advanced_report_builder.views.helpers import QueryBuilderModelForm
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin
 
 
-class QueryForm(ModelCrispyForm):
+class QueryForm(QueryBuilderModelForm):
     cancel_class = 'btn-secondary modal-cancel'
 
     class Meta:
@@ -27,9 +28,6 @@ class QueryForm(ModelCrispyForm):
         fields = ['name',
                   'query']
 
-    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
-        return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
-
 
 class QueryModal(QueryBuilderModalBaseMixin, ModelFormModal):
     model = ReportQuery

{django-advanced-report-builder-0.7.1 → django-advanced-report-builder-0.7.4}/advanced_report_builder/views/single_values.py

@@ -28,6 +28,7 @@ from advanced_report_builder.variable_date import VariableDate
 from advanced_report_builder.views.charts_base import ChartBaseView
 from advanced_report_builder.views.datatables.modal import TableFieldModal, TableFieldForm
 from advanced_report_builder.views.datatables.utils import TableUtilsMixin
+from advanced_report_builder.views.helpers import QueryBuilderModelForm
 from advanced_report_builder.views.modals_base import QueryBuilderModalBase, QueryBuilderModalBaseMixin
 from advanced_report_builder.views.query_modal.mixin import MultiQueryModalMixin
 
@@ -241,16 +242,18 @@ class SingleValueView(ChartBaseView):
         context['single_value_report'] = self.chart_report
         return context
 
+    def get_breakdown_slug(self):
+        query_id = self.slug.get(f'query{self.report.pk}')
+        if query_id is None and self.dashboard_report is not None:
+            query_id = self.dashboard_report.report_query_id
+        slug = f'pk-{self.table.single_value.id}-enable_links-{self.table.enable_links}'
+        if query_id is not None:
+            slug += f'-query{self.report.pk}-{query_id}'
+        return slug
+
     def get_breakdown_url(self):
         if self.table.single_value.show_breakdown:
-            query_id = self.slug.get(f'query{self.report.pk}')
-            if query_id is None and self.dashboard_report is not None:
-                query_id = self.dashboard_report.report_query_id
-
-            slug = f'pk-{self.table.single_value.id}-enable_links-{self.table.enable_links}'
-            if query_id is not None:
-                slug += f'-query{self.report.pk}-{query_id}'
-
+            slug = self.get_breakdown_slug()
             return show_modal('advanced_report_builder:single_value_show_breakdown_modal',
                               slug, href=True)
         return None
@@ -503,7 +506,7 @@ class SingleValueTableFieldModal(TableFieldModal):
         return self.command_response('close')
 
 
-class QueryNumeratorForm(ModelCrispyForm):
+class QueryNumeratorForm(QueryBuilderModelForm):
     cancel_class = 'btn-secondary modal-cancel'
 
     class Meta:
@@ -512,9 +515,6 @@ class QueryNumeratorForm(ModelCrispyForm):
                   'query',
                   'extra_query']
 
-    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
-        return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
-
     def setup_modal(self, *args, **kwargs):
         self.fields['extra_query'].label = 'Numerator'
         super().setup_modal(*args, **kwargs)

{django-advanced-report-builder-0.7.1 → django-advanced-report-builder-0.7.4/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.7.1
+Version: 0.7.4
 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.7.1 → django-advanced-report-builder-0.7.4}/django_advanced_report_builder.egg-info/SOURCES.txt

@@ -139,6 +139,7 @@ advanced_report_builder/views/charts_base.py
 advanced_report_builder/views/custom.py
 advanced_report_builder/views/dashboard.py
 advanced_report_builder/views/funnel_charts.py
+advanced_report_builder/views/helpers.py
 advanced_report_builder/views/kanban.py
 advanced_report_builder/views/line_charts.py
 advanced_report_builder/views/modals_base.py

{django-advanced-report-builder-0.7.1 → django-advanced-report-builder-0.7.4}/setup.py

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