django-advanced-report-builder 0.4.3__tar.gz → 0.5.0__tar.gz

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.4.3
+Version: 0.5.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.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/data_merge/utils.py

@@ -2,7 +2,7 @@ import re
 
 from django.apps import apps
 
-from advanced_report_builder.utils import get_field_details
+from advanced_report_builder.utils import get_field_details, get_report_builder_class
 
 
 def get_menu_fields(base_model, report_builder_class,
@@ -26,7 +26,8 @@ def get_menu_fields(base_model, report_builder_class,
 
         new_model = apps.get_model(app_label, model)
         if new_model != previous_base_model:
-            new_report_builder_class = getattr(new_model, report_builder_fields_str, None)
+            new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                class_name=report_builder_fields_str)
             title = new_report_builder_class.title
             if menus is not None:
                 menu = []

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/filter_query.py

@@ -6,6 +6,7 @@ from django.db.models import Q
 from django.shortcuts import get_object_or_404
 
 from advanced_report_builder.models import ReportQuery
+from advanced_report_builder.utils import get_report_builder_class
 from advanced_report_builder.variable_date import VariableDate
 
 
@@ -255,12 +256,14 @@ class FilterQueryMixin:
             if include is not None:
                 app_label, model, report_builder_fields_str = include['model'].split('.')
                 new_model = apps.get_model(app_label, model)
-                new_report_builder_fields = getattr(new_model, report_builder_fields_str, None)
+
+                new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                    class_name=report_builder_fields_str)
 
                 if new_model != previous_base_model:
                     result = self._get_report_builder_class(base_model=new_model,
                                                             field_str=new_field_str,
-                                                            report_builder_class=new_report_builder_fields,
+                                                            report_builder_class=new_report_builder_class,
                                                             previous_base_model=base_model)
                     if result:
                         return result
@@ -269,8 +272,10 @@ class FilterQueryMixin:
             if include is not None:
                 app_label, model, report_builder_fields_str = include['model'].split('.')
                 new_model = apps.get_model(app_label, model)
-                new_report_builder_fields = getattr(new_model, report_builder_fields_str, None)
-                return new_report_builder_fields
+                new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                    class_name=report_builder_fields_str)
+
+                return new_report_builder_class
         return None
 
     def _get_pivot_details(self, base_model, pivot_str, report_builder_class, previous_base_model=None, include_str=''):
@@ -294,12 +299,12 @@ class FilterQueryMixin:
             if include is not None:
                 app_label, model, report_builder_fields_str = include['model'].split('.')
                 new_model = apps.get_model(app_label, model)
-                new_report_builder_fields = getattr(new_model, report_builder_fields_str, None)
-
+                new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                    class_name=report_builder_fields_str)
                 if new_model != previous_base_model:
                     result = self._get_pivot_details(base_model=new_model,
                                                      pivot_str=new_pivot_str,
-                                                     report_builder_class=new_report_builder_fields,
+                                                     report_builder_class=new_report_builder_class,
                                                      previous_base_model=base_model,
                                                      include_str=include_str)
                     if result:

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/utils.py

@@ -117,3 +117,15 @@ def decode_attribute(data_attr):
     data_attr = data_attr.replace('@', '-')
     _data = base64.urlsafe_b64decode(data_attr)
     return _data.decode('utf-8', 'ignore')
+
+
+def get_report_builder_class(model, report_type=None, class_name=None):
+    if class_name is None:
+        class_name = report_type.report_builder_class_name
+
+    report_builder_class = getattr(model, class_name, None)
+    if report_builder_class is not None:
+        report_builder_class = report_builder_class()
+    return report_builder_class
+
+

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/bar_charts.py

@@ -29,7 +29,8 @@ from advanced_report_builder.globals import DEFAULT_DATE_FORMAT, \
     GENERATE_SERIES_INTERVALS
 from advanced_report_builder.models import BarChartReport, ReportType
 from advanced_report_builder.toggle import RBToggle
-from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute, get_field_details
+from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute, get_field_details, \
+    get_report_builder_class
 from advanced_report_builder.views.charts_base import ChartBaseView, ChartBaseFieldForm
 from advanced_report_builder.views.datatables.modal import TableFieldModal, TableFieldForm
 from advanced_report_builder.views.datatables.utils import TableUtilsMixin
@@ -96,8 +97,10 @@ class BarChartView(ChartBaseView):
 
         if start_field_name is None or end_field_name is None:
             return
-        report_builder_class = getattr(base_model,
-                                       self.chart_report.report_type.report_builder_class_name, None)
+
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.chart_report.report_type)
+
         start_django_field, start_col_type_override, _, _ = get_field_details(base_model=base_model,
                                                                               field=start_field_name,
                                                                               report_builder_class=report_builder_class,
@@ -302,10 +305,12 @@ class BarChartFieldForm(ChartBaseFieldForm):
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
 
-        report_builder_fields = getattr(base_model, report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
+
         fields = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
-                                                   report_builder_fields=report_builder_fields,
+                                                   report_builder_class=report_builder_class,
                                                    fields=fields)
 
         self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)
@@ -458,9 +463,8 @@ class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
         self.kwargs['enable_links'] = self.slug['enable_links'] == 'True'
         base_model = bar_chart_report.get_base_modal()
         chart_fields = bar_chart_report.fields
-
-        report_builder_class = getattr(base_model,
-                                       bar_chart_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=bar_chart_report.report_type)
         table = self.add_table(base_model=base_model)
 
         table_fields = bar_chart_report.breakdown_fields

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/charts_base.py

@@ -20,7 +20,7 @@ from advanced_report_builder.exceptions import ReportError
 from advanced_report_builder.globals import NUMBER_FIELDS, ANNOTATION_VALUE_FUNCTIONS, ANNOTATION_VALUE_YEAR, \
     ANNOTATION_VALUE_QUARTER, ANNOTATION_VALUE_WEEK, ANNOTATION_VALUE_DAY, ANNOTATION_VALUE_MONTH
 from advanced_report_builder.models import ReportType
-from advanced_report_builder.utils import split_slug, get_field_details, split_attr
+from advanced_report_builder.utils import split_slug, get_field_details, split_attr, get_report_builder_class
 from advanced_report_builder.variable_date import VariableDate
 from advanced_report_builder.views.report import ReportBase
 from advanced_report_builder.views.report_utils_mixin import ReportUtilsMixin
@@ -131,8 +131,9 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
         field_name = self.chart_report.date_field
         if field_name is None:
             return
-        report_builder_class = getattr(base_model,
-                                       self.chart_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.chart_report.report_type)
+
         django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
                                                                   field=field_name,
                                                                   report_builder_class=report_builder_class,
@@ -181,8 +182,8 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
             return fields
         chart_fields = self.chart_report.fields
 
-        report_builder_class = getattr(base_model,
-                                       self.chart_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.chart_report.report_type)
 
         for index, table_field in enumerate(chart_fields, 1):
             field = table_field['field']
@@ -359,24 +360,30 @@ class ChartBaseFieldForm(CrispyForm):
 
         report_type = get_object_or_404(ReportType, pk=self.slug['report_type_id'])
         base_model = report_type.content_type.model_class()
-        report_builder_class = getattr(base_model,
-                                       report_type.report_builder_class_name, None)
+
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
+
         self.django_field, self.col_type_override, _, _ = get_field_details(base_model=base_model,
                                                                             field=data['field'],
                                                                             report_builder_class=report_builder_class)
 
         return report_type, base_model
 
-    def _get_query_builder_foreign_key_fields(self, base_model, report_builder_fields, fields,
+    def _get_query_builder_foreign_key_fields(self, base_model, report_builder_class, fields,
                                               prefix='', title_prefix='', previous_base_model=None):
-        for include_field, include in report_builder_fields.includes.items():
+        for include_field, include in report_builder_class.includes.items():
             app_label, model, report_builder_fields_str = include['model'].split('.')
             new_model = apps.get_model(app_label, model)
             if new_model != previous_base_model:
-                new_report_builder_fields = getattr(new_model, report_builder_fields_str, None)
+                new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                    class_name=report_builder_fields_str)
+                if new_report_builder_class is not None:
+                    new_report_builder_class = new_report_builder_class()
+
                 fields.append((prefix + include_field, title_prefix + include['title']))
                 self._get_query_builder_foreign_key_fields(base_model=new_model,
-                                                           report_builder_fields=new_report_builder_fields,
+                                                           report_builder_class=new_report_builder_class,
                                                            fields=fields,
                                                            prefix=f"{prefix}{include_field}__",
                                                            title_prefix=f"{title_prefix}{include['title']} --> ",

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/datatables/datatables.py

@@ -5,7 +5,7 @@ from django_menus.menu import MenuItem
 
 from advanced_report_builder.columns import ArrowColumn
 from advanced_report_builder.exceptions import ReportError
-from advanced_report_builder.utils import get_field_details, make_slug_str
+from advanced_report_builder.utils import get_field_details, make_slug_str, get_report_builder_class
 from advanced_report_builder.utils import split_slug
 from advanced_report_builder.views.datatables.utils import TableUtilsMixin
 from advanced_report_builder.views.report import ReportBase
@@ -48,8 +48,8 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
         table_fields = self.table_report.table_fields
         pivot_fields = self.table_report.pivot_fields
         fields_used = set()
-        report_builder_class = getattr(base_model,
-                                       self.table_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.table_report.report_type)
         self.process_query_results(report_builder_class=report_builder_class,
                                    table=table,
                                    base_model=base_model,

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/datatables/modal.py

@@ -21,7 +21,8 @@ from advanced_report_builder.globals import DATE_FIELDS, NUMBER_FIELDS, ANNOTATI
     DATE_FORMAT_TYPES, CURRENCY_COLUMNS, LINK_COLUMNS
 from advanced_report_builder.models import TableReport, ReportQuery, ReportType
 from advanced_report_builder.toggle import RBToggle
-from advanced_report_builder.utils import split_attr, get_field_details, encode_attribute, decode_attribute
+from advanced_report_builder.utils import split_attr, get_field_details, encode_attribute, decode_attribute, \
+    get_report_builder_class
 from advanced_report_builder.views.charts_base import ChartBaseFieldForm
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin, QueryBuilderModalBase
 
@@ -302,10 +303,11 @@ class TableFieldForm(ChartBaseFieldForm):
 
             self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
 
-            report_builder_fields = getattr(base_model, report_type.report_builder_class_name, None)
+            report_builder_class = get_report_builder_class(model=base_model,
+                                                            report_type=report_type)
             fields = []
             self._get_query_builder_foreign_key_fields(base_model=base_model,
-                                                       report_builder_fields=report_builder_fields,
+                                                       report_builder_class=report_builder_class,
                                                        fields=fields)
 
             self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/funnel_charts.py

@@ -14,7 +14,7 @@ from django_modals.widgets.select2 import Select2Multiple
 
 from advanced_report_builder.models import FunnelChartReport
 from advanced_report_builder.toggle import RBToggle
-from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute
+from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute, get_report_builder_class
 from advanced_report_builder.views.charts_base import ChartBaseView, ChartBaseFieldForm
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin, QueryBuilderModalBase
 
@@ -110,10 +110,12 @@ class FunnelChartFieldForm(ChartBaseFieldForm):
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
 
-        report_builder_fields = getattr(base_model, report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
+
         fields = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
-                                                   report_builder_fields=report_builder_fields,
+                                                   report_builder_class=report_builder_class,
                                                    fields=fields)
 
         self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/kanban.py

@@ -30,7 +30,7 @@ from advanced_report_builder.globals import DATE_FORMAT_TYPES_DJANGO_FORMAT, DAT
     DATE_FORMAT_TYPE_SHORT_WORDS_MM_YY
 from advanced_report_builder.models import KanbanReport, KanbanReportLane, ReportType, KanbanReportDescription
 from advanced_report_builder.toggle import RBToggle
-from advanced_report_builder.utils import crispy_modal_link_args, get_field_details
+from advanced_report_builder.utils import crispy_modal_link_args, get_field_details, get_report_builder_class
 from advanced_report_builder.variable_date import VariableDate
 from advanced_report_builder.views.charts_base import ChartJSTable
 from advanced_report_builder.views.modals_base import QueryBuilderModalBase
@@ -116,7 +116,8 @@ class KanbanView(ReportBase, FilterQueryMixin, TemplateView):
 
         table = self.chart_js_table(model=base_model)
 
-        report_builder_class = getattr(base_model, kanban_report_lane.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=kanban_report_lane.report_type)
         table_indexes = []
 
         if kanban_report_lane.heading_field is not None:
@@ -222,7 +223,8 @@ class KanbanView(ReportBase, FilterQueryMixin, TemplateView):
 
         for kanban_report_lane in kanban_report_lanes:
             base_model = kanban_report_lane.get_base_modal()
-            report_builder_class = getattr(base_model, kanban_report_lane.report_type.report_builder_class_name, None)
+            report_builder_class = get_report_builder_class(model=base_model,
+                                                            report_type=kanban_report_lane.report_type)
             if kanban_report_lane.multiple_type == KanbanReportLane.MULTIPLE_TYPE_NA:
                 self.get_lane(base_model=base_model,
                               kanban_report_lane=kanban_report_lane,

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/line_charts.py

@@ -20,7 +20,7 @@ from advanced_report_builder.globals import ANNOTATION_VALUE_YEAR, \
     ANNOTATION_VALUE_QUARTER, ANNOTATION_VALUE_MONTH, ANNOTATION_VALUE_WEEK, ANNOTATION_VALUE_DAY
 from advanced_report_builder.models import LineChartReport, ReportType
 from advanced_report_builder.toggle import RBToggle
-from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute
+from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute, get_report_builder_class
 from advanced_report_builder.views.charts_base import ChartBaseView, ChartJSTable, ChartBaseFieldForm
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin, QueryBuilderModalBase
 
@@ -212,11 +212,11 @@ class LineChartFieldForm(ChartBaseFieldForm):
                 self.fields['filter'].initial = decode_attribute(data_attr['filter'])
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
-
-        report_builder_fields = getattr(base_model, report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
         fields = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
-                                                   report_builder_fields=report_builder_fields,
+                                                   report_builder_class=report_builder_class,
                                                    fields=fields)
 
         self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/modals_base.py

@@ -15,7 +15,7 @@ from django_modals.widgets.select2 import Select2
 from advanced_report_builder.field_types import FieldTypes
 from advanced_report_builder.globals import DATE_FIELDS, NUMBER_FIELDS, LINK_COLUMNS, COLOUR_COLUMNS
 from advanced_report_builder.models import ReportQuery, ReportType
-from advanced_report_builder.utils import get_field_details
+from advanced_report_builder.utils import get_field_details, get_report_builder_class
 
 
 class QueryBuilderModelForm(ModelCrispyForm):
@@ -32,7 +32,8 @@ class QueryBuilderModalBaseMixin:
 
         report_type = get_object_or_404(ReportType, pk=report_type_id)
         base_model = report_type.content_type.model_class()
-        report_builder_class = getattr(base_model, report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
         return report_builder_class, base_model
 
     def get_query_builder_report_type_field(self, report_type_id):
@@ -68,7 +69,8 @@ class QueryBuilderModalBaseMixin:
         for include_field, include in report_builder_class.includes.items():
             app_label, model, report_builder_fields_str = include['model'].split('.')
             new_model = apps.get_model(app_label, model)
-            new_report_builder_fields = getattr(new_model, report_builder_fields_str, None)
+            new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                class_name=report_builder_fields_str)
 
             if new_model != previous_base_model:
                 _foreign_key = getattr(base_model, include_field, None)
@@ -89,7 +91,7 @@ class QueryBuilderModalBaseMixin:
 
                 self._get_query_builder_fields(base_model=new_model,
                                                query_builder_filters=query_builder_filters,
-                                               report_builder_class=new_report_builder_fields,
+                                               report_builder_class=new_report_builder_class,
                                                prefix=f"{prefix}{include_field}__",
                                                title_prefix=f"{include['title']} --> ",
                                                previous_base_model=base_model)
@@ -157,10 +159,10 @@ class QueryBuilderModalBase(QueryBuilderModalBaseMixin, ModelFormModal):
             tables.append({'name': title,
                            'colour': colour})
 
+        report_builder_class_fields = report_builder_class.fields
+
         if extra_fields:
-            report_builder_class_fields = report_builder_class.fields + extra_fields
-        else:
-            report_builder_class_fields = report_builder_class.fields
+            report_builder_class_fields += extra_fields
 
         for report_builder_field in report_builder_class_fields:
 
@@ -206,7 +208,8 @@ class QueryBuilderModalBase(QueryBuilderModalBaseMixin, ModelFormModal):
 
             new_model = apps.get_model(app_label, model)
             if new_model != previous_base_model:
-                new_report_builder_class = getattr(new_model, report_builder_fields_str, None)
+                new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                    class_name=report_builder_fields_str)
                 self._get_fields(base_model=new_model,
                                  fields=fields,
                                  report_builder_class=new_report_builder_class,
@@ -328,37 +331,38 @@ class QueryBuilderModalBase(QueryBuilderModalBaseMixin, ModelFormModal):
         if selected_field_id:
             form.fields[field_name].initial = selected_field_id
             base_model = report_type.content_type.model_class()
-            report_builder_fields = getattr(base_model, report_type.report_builder_class_name, None)
+            report_builder_class = get_report_builder_class(model=base_model,
+                                                            report_type=report_type)
             if field_type == 'date':
                 self._get_date_fields(base_model=base_model,
                                       fields=_fields,
-                                      report_builder_class=report_builder_fields,
+                                      report_builder_class=report_builder_class,
                                       selected_field_id=selected_field_id)
             elif field_type == 'link':
                 self._get_column_link_fields(base_model=base_model,
                                              fields=_fields,
-                                             report_builder_class=report_builder_fields,
+                                             report_builder_class=report_builder_class,
                                              selected_field_id=selected_field_id)
             elif field_type == 'number':
                 self._get_number_fields(base_model=base_model,
                                         fields=_fields,
-                                        report_builder_class=report_builder_fields,
+                                        report_builder_class=report_builder_class,
                                         selected_field_id=selected_field_id)
             elif field_type == 'colour':
                 self._get_colour_fields(base_model=base_model,
                                         fields=_fields,
-                                        report_builder_class=report_builder_fields,
+                                        report_builder_class=report_builder_class,
                                         selected_field_id=selected_field_id)
             elif field_type == 'all':
                 self._get_fields(base_model=base_model,
                                  fields=_fields,
-                                 report_builder_class=report_builder_fields,
+                                 report_builder_class=report_builder_class,
                                  selected_field_id=selected_field_id,
                                  for_select2=True)
             elif field_type == 'order':
                 self._get_fields(base_model=base_model,
                                  fields=_fields,
-                                 report_builder_class=report_builder_fields,
+                                 report_builder_class=report_builder_class,
                                  selected_field_id=selected_field_id,
                                  for_select2=True,
                                  show_order_by_fields=True)

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/pie_charts.py

@@ -14,7 +14,7 @@ from django_modals.widgets.select2 import Select2Multiple
 
 from advanced_report_builder.models import PieChartReport
 from advanced_report_builder.toggle import RBToggle
-from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute
+from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute, get_report_builder_class
 from advanced_report_builder.views.charts_base import ChartBaseView, ChartBaseFieldForm
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin, QueryBuilderModalBase
 
@@ -109,11 +109,11 @@ class PieChartFieldForm(ChartBaseFieldForm):
                 self.fields['filter'].initial = decode_attribute(data_attr['filter'])
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
-
-        report_builder_fields = getattr(base_model, report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
         fields = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
-                                                   report_builder_fields=report_builder_fields,
+                                                   report_builder_class=report_builder_class,
                                                    fields=fields)
 
         self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/advanced_report_builder/views/single_values.py

@@ -12,7 +12,6 @@ from django_modals.fields import FieldEx
 from django_modals.helper import show_modal
 from django_modals.modals import Modal
 from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
-from django_modals.widgets.colour_picker import ColourPickerWidget
 from django_modals.widgets.select2 import Select2Multiple
 from django_modals.widgets.widgets import Toggle
 
@@ -21,7 +20,7 @@ from advanced_report_builder.exceptions import ReportError
 from advanced_report_builder.globals import NUMBER_FIELDS, ANNOTATION_CHOICE_SUM, \
     ANNOTATION_CHOICE_AVERAGE_SUM_FROM_COUNT
 from advanced_report_builder.models import SingleValueReport, ReportType
-from advanced_report_builder.utils import get_field_details
+from advanced_report_builder.utils import get_field_details, get_report_builder_class
 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
@@ -42,7 +41,8 @@ class SingleValueView(ChartBaseView):
     def _process_aggregations(self, fields, aggregations_type=ANNOTATION_CHOICE_SUM, divider=None):
         field = self.chart_report.field
         base_model = self.chart_report.get_base_modal()
-        report_builder_class = getattr(base_model, self.chart_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.chart_report.report_type)
 
         django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
                                                                   field=field,
@@ -140,7 +140,8 @@ class SingleValueView(ChartBaseView):
         denominator_field = self.chart_report.field
         numerator_field = self.chart_report.numerator
         base_model = self.chart_report.get_base_modal()
-        report_builder_class = getattr(base_model, self.chart_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.chart_report.report_type)
 
         deno_django_field, denominator_col_type_override, _, _ = get_field_details(
             base_model=base_model,
@@ -430,8 +431,8 @@ class SingleValueShowBreakdownModal(TableUtilsMixin, Modal):
         table = self.add_table(base_model=base_model)
         table.extra_filters = self.extra_filters
         table_fields = single_value_report.breakdown_fields
-        report_builder_class = getattr(base_model,
-                                       self.table_report.report_type.report_builder_class_name, None)
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=self.table_report.report_type)
         fields_used = set()
         self.process_query_results(report_builder_class=report_builder_class,
                                    table=table,

{django-advanced-report-builder-0.4.3 → django-advanced-report-builder-0.5.0}/django_advanced_report_builder.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.4.3
+Version: 0.5.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.4.3 → django-advanced-report-builder-0.5.0}/setup.py

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