django-advanced-report-builder 0.5.5__tar.gz → 0.5.7__tar.gz

{django-advanced-report-builder-0.5.5/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.5.7}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.5.5
+Version: 0.5.7
 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
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -17,5 +15,3 @@ License-File: LICENSE
 
 
 # django-advanced-report-builder
-
-

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/columns.py

@@ -1,6 +1,7 @@
 from django.contrib.humanize.templatetags.humanize import intcomma
 from django.db.models import Count
-from django_datatables.columns import ColumnBase, CurrencyPenceColumn, CurrencyColumn, NoHeadingColumn, ColumnLink
+from django_datatables.columns import ColumnBase, CurrencyPenceColumn, CurrencyColumn, NoHeadingColumn, ColumnLink, \
+    ManyToManyColumn
 from django_datatables.helpers import get_url, DUMMY_ID
 
 
@@ -107,3 +108,11 @@ class RecordCountColumn(ColumnBase):
         if 'column_name' not in kwargs:
             kwargs['column_name'] = 'record_count'
         super().__init__(field, **kwargs)
+
+
+class ReportBuilderManyToManyColumn(ManyToManyColumn):
+    def row_result(self, data_dict, page_results):
+        model_path = ''
+        if self.model_path != '':
+            model_path = self.model_path[:-1]
+        return page_results['m2m' + self.column_name].get(data_dict[model_path + 'id'], self.blank)

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/data_merge/utils.py

@@ -2,19 +2,21 @@ import re
 
 from django.apps import apps
 
-from advanced_report_builder.utils import get_field_details, get_report_builder_class
+from advanced_report_builder.field_utils import ReportBuilderFieldUtils
+from advanced_report_builder.utils import get_report_builder_class
 
 
-class DataMergeUtils:
+class DataMergeUtils(ReportBuilderFieldUtils):
     def get_menu_fields(self, base_model, report_builder_class,
                         menus=None, codes=None, code_prefix='', next_code_prefix='__',
                         previous_base_model=None, table=None):
 
         for report_builder_field in report_builder_class.fields:
-            django_field, col_type_override, columns, _ = get_field_details(base_model=base_model,
-                                                                            field=report_builder_field,
-                                                                            report_builder_class=report_builder_class,
-                                                                            table=table)
+            django_field, col_type_override, columns, _ = self.get_field_details(
+                base_model=base_model,
+                field=report_builder_field,
+                report_builder_class=report_builder_class,
+                table=table)
             for column in columns:
                 full_id = code_prefix + column.column_name
                 if menus is not None:
@@ -77,10 +79,10 @@ class DataMergeUtils:
         columns = set()
         column_map = {}
         for field in all_fields:
-            django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                                      field=field,
-                                                                      report_builder_class=report_builder_class,
-                                                                      table=table)
+            django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                           field=field,
+                                                                           report_builder_class=report_builder_class,
+                                                                           table=table)
             if django_field is not None or isinstance(col_type_override.field, (list, tuple)):
                 if field not in columns and f'.{field}' not in columns:
                     columns.add('.' + field)

django-advanced-report-builder-0.5.7/advanced_report_builder/field_utils.py

@@ -0,0 +1,57 @@
+from django_datatables.columns import ColumnNameError
+from django_datatables.datatables import ColumnInitialisor
+
+from advanced_report_builder.exceptions import ReportError
+
+
+class ReportBuilderFieldUtils:
+    column_initialisor_cls = ColumnInitialisor
+    def get_field_details(self, base_model, field, report_builder_class, table=None, field_attr=None):
+
+        if field_attr is None:
+            field_attr = {}
+        if isinstance(field, str) and field in report_builder_class.field_classes:
+            field = report_builder_class.field_classes[field]
+
+        path = field
+        original_column_initialisor = self.column_initialisor_cls(start_model=base_model,
+                                                                  path=field,
+                                                                  table=table,
+                                                                  **field_attr)
+
+        try:
+            columns = original_column_initialisor.get_columns()
+        except ColumnNameError as e:
+            raise ReportError(e)
+        django_field = original_column_initialisor.django_field
+        col_type_override = None
+        if columns:
+            col_type_override = columns[0]
+            if isinstance(field, str) and '__' in field and col_type_override.model_path == '':
+                # I think there is a bug in datatables where the model path isn't always set! hence the following code
+                field_parts = field.split('__')[:-1]
+                model_path = '__'.join(field_parts) + '__'
+                col_type_override.model_path = model_path
+                col_type_override.field = col_type_override.field  # actions the setter
+                path = model_path
+
+        if django_field is None and columns:
+            col_type_override = columns[0]
+            if isinstance(col_type_override.field, str):
+                if isinstance(field, str):
+                    path_parts = field.split('__')[:-1]
+                    path_parts.append(col_type_override.field.split('__')[-1])
+                    path = '__'.join(path_parts)
+                    column_initialisor = self.column_initialisor_cls(start_model=base_model, path=path, table=table,
+                                                                     **field_attr)
+                    column_initialisor.get_columns()
+                    django_field = column_initialisor.django_field
+                else:
+                    column_initialisor = self.column_initialisor_cls(start_model=base_model,
+                                                                     path=col_type_override.field,
+                                                                     table=table,
+                                                                     **field_attr)
+                    column_initialisor.get_columns()
+                    django_field = column_initialisor.django_field
+
+        return django_field, col_type_override, columns, path

django-advanced-report-builder-0.5.7/advanced_report_builder/utils.py

@@ -0,0 +1,78 @@
+import base64
+
+from crispy_forms.layout import HTML, Div
+from django.conf import settings
+from django.utils.module_loading import import_string
+from django_modals.helper import show_modal
+
+
+def split_attr(data):
+    if 'data_attr' not in data:
+        return {}
+    _attr = {}
+    s = data['data_attr'].split('-')
+    _attr.update({s[k]: s[k + 1] for k in range(0, int(len(s) - 1), 2)})
+    return _attr
+
+
+def split_slug(slug_str):
+    s = slug_str.split('-')
+    slug = {}
+    if len(s) == 1:
+        slug['pk'] = s[0]
+    else:
+        slug.update({s[k]: s[k + 1] for k in range(0, int(len(s) - 1), 2)})
+    return slug
+
+
+def make_slug_str(slug, overrides=None):
+    if len(slug) == 1 and 'pk' in slug and not overrides:
+        return slug['pk']
+
+    if not overrides:
+        slug_parts = [f'{k}-{v}' for k, v in slug.items()]
+    else:
+        slug_parts = []
+        for key, value in slug.items():
+            if key in overrides:
+                continue
+            slug_parts.append(f'{key}-{value}')
+        for key, value in overrides.items():
+            slug_parts.append(f'{key}-{value}')
+
+    return '-'.join(slug_parts)
+
+
+def get_custom_report_builder():
+    return import_string(getattr(settings,
+                                 'REPORT_BUILDER_CUSTOMISATION',
+                                 'report_builder.customise.CustomiseReportBuilder'))
+
+
+def crispy_modal_link_args(modal_name, text, *args, div=False, div_classes='', button_classes='', font_awesome=None):
+    link = HTML(show_modal(modal_name, *args, button=text, button_classes=button_classes, font_awesome=font_awesome))
+    if div:
+        link = Div(link, css_class=div_classes)
+    return link
+
+
+def encode_attribute(string_in):
+    _data = string_in.encode('utf-8', 'ignore')
+    _data = base64.urlsafe_b64encode(_data).decode('utf-8', 'ignore')
+    return _data.replace('-', '@')
+
+
+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.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/bar_charts.py

@@ -29,7 +29,7 @@ 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_report_builder_class
 from advanced_report_builder.views.charts_base import ChartBaseView, ChartBaseFieldForm
 from advanced_report_builder.views.datatables.modal import TableFieldModal, TableFieldForm
@@ -101,17 +101,19 @@ class BarChartView(ChartBaseView):
         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,
-                                                                              table=table)
+        start_django_field, start_col_type_override, _, _ = self.get_field_details(
+            base_model=base_model,
+            field=start_field_name,
+            report_builder_class=report_builder_class,
+            table=table)
         if start_col_type_override:
             start_field_name = start_col_type_override.field
 
-        end_django_field, end_col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                                          field=end_field_name,
-                                                                          report_builder_class=report_builder_class,
-                                                                          table=table)
+        end_django_field, end_col_type_override, _, _ = self.get_field_details(
+            base_model=base_model,
+            field=end_field_name,
+            report_builder_class=report_builder_class,
+            table=table)
         if end_col_type_override:
             end_field_name = end_col_type_override.field
 
@@ -477,10 +479,10 @@ class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
         data_index = int(self.slug['data'])
         table_field = chart_fields[data_index]
         field = table_field['field']
-        django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                                  field=field,
-                                                                  report_builder_class=report_builder_class,
-                                                                  table=table)
+        django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                       field=field,
+                                                                       report_builder_class=report_builder_class,
+                                                                       table=table)
 
         self.field_filter = None
         if (isinstance(django_field, NUMBER_FIELDS) or
@@ -494,16 +496,16 @@ class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
                     _filter = decode_attribute(b64_filter)
                     self.field_filter = json.loads(_filter)
 
-        self.date_field_path = get_field_details(base_model=base_model,
-                                                 field=bar_chart_report.date_field,
-                                                 report_builder_class=report_builder_class,
-                                                 table=table)[3]
+        self.date_field_path = self.get_field_details(base_model=base_model,
+                                                      field=bar_chart_report.date_field,
+                                                      report_builder_class=report_builder_class,
+                                                      table=table)[3]
         if bar_chart_report.date_field_type == BarChartReport.DATE_FIELD_RANGE:
-            self.end_date_field_path = get_field_details(base_model=base_model,
-                                                         field=bar_chart_report.end_date_field,
-                                                         report_builder_class=report_builder_class,
-                                                         table=table)[3]
-        
+            self.end_date_field_path = self.get_field_details(base_model=base_model,
+                                                              field=bar_chart_report.end_date_field,
+                                                              report_builder_class=report_builder_class,
+                                                              table=table)[3]
+
         table.extra_filters = self.extra_filters
 
         table.ajax_data = False

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/charts_base.py

@@ -17,10 +17,11 @@ from django_modals.forms import CrispyForm
 
 from advanced_report_builder.columns import ReportBuilderDateColumn
 from advanced_report_builder.exceptions import ReportError
+from advanced_report_builder.field_utils import ReportBuilderFieldUtils
 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, get_report_builder_class
+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.report import ReportBase
 from advanced_report_builder.views.report_utils_mixin import ReportUtilsMixin
@@ -134,10 +135,10 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
         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,
-                                                                  table=table)
+        django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                       field=field_name,
+                                                                       report_builder_class=report_builder_class,
+                                                                       table=table)
 
         if col_type_override:
             field_name = col_type_override.field
@@ -188,10 +189,10 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
         for index, table_field in enumerate(chart_fields, 1):
             field = table_field['field']
 
-            django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                                      field=field,
-                                                                      report_builder_class=report_builder_class,
-                                                                      table=table)
+            django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                           field=field,
+                                                                           report_builder_class=report_builder_class,
+                                                                           table=table)
 
             if (isinstance(django_field, NUMBER_FIELDS) or
                     (col_type_override is not None and col_type_override.annotations)):
@@ -336,7 +337,7 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
         return divider
 
 
-class ChartBaseFieldForm(CrispyForm):
+class ChartBaseFieldForm(ReportBuilderFieldUtils, CrispyForm):
     cancel_class = 'btn-secondary modal-cancel'
 
     def __init__(self, *args, **kwargs):
@@ -364,9 +365,10 @@ class ChartBaseFieldForm(CrispyForm):
         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)
+        self.django_field, self.col_type_override, _, _ = self.get_field_details(
+            base_model=base_model,
+            field=data['field'],
+            report_builder_class=report_builder_class)
 
         return report_type, base_model
 

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/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, get_report_builder_class
+from advanced_report_builder.utils import 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
@@ -72,9 +72,9 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
         if self.table_report.has_clickable_rows and self.table_report.link_field and self.kwargs.get('enable_links'):
             table.table_classes.append('row_link')
             table.add_columns(ArrowColumn(column_name='arrow_icon'))
-            _, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                           field=self.table_report.link_field,
-                                                           report_builder_class=report_builder_class)
+            _, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                field=self.table_report.link_field,
+                                                                report_builder_class=report_builder_class)
             if isinstance(col_type_override.field, list):
                 field = col_type_override.field[0]
             else:

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/datatables/modal.py

@@ -21,8 +21,7 @@ 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, \
-    get_report_builder_class
+from advanced_report_builder.utils import split_attr, 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
 
@@ -422,9 +421,9 @@ class TableFieldModal(QueryBuilderModalBaseMixin, FormModal):
 
         data = json.loads(base64.b64decode(self.slug['data']))
         report_builder_class, base_model = self.get_report_builder_class(report_type_id=self.slug['report_type_id'])
-        django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                                  field=data['field'],
-                                                                  report_builder_class=report_builder_class)
+        django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                       field=data['field'],
+                                                                       report_builder_class=report_builder_class)
         if django_field is not None and isinstance(django_field, NUMBER_FIELDS):
             form.add_trigger('annotations_type', 'onchange', [
                 {'selector': '#annotations_fields_div', 'values': {'': 'hide'}, 'default': 'show'}])

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/datatables/utils.py

@@ -6,7 +6,7 @@ from django_datatables.plugins.column_totals import ColumnTotals
 from advanced_report_builder.columns import ReportBuilderDateColumn
 from advanced_report_builder.globals import DATE_FIELDS, NUMBER_FIELDS, CURRENCY_COLUMNS, LINK_COLUMNS
 from advanced_report_builder.globals import DATE_FORMAT_TYPES_DJANGO_FORMAT, ANNOTATION_VALUE_FUNCTIONS
-from advanced_report_builder.utils import split_attr, get_field_details, decode_attribute
+from advanced_report_builder.utils import split_attr, decode_attribute
 from advanced_report_builder.views.report_utils_mixin import ReportUtilsMixin
 
 
@@ -106,11 +106,11 @@ class TableUtilsMixin(ReportUtilsMixin):
                 field_attr['title'] = table_field['title']
 
             fields_used.add(field)
-            django_field, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                                      field=field,
-                                                                      table=table,
-                                                                      report_builder_class=report_builder_class,
-                                                                      field_attr=field_attr)
+            django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                           field=field,
+                                                                           table=table,
+                                                                           report_builder_class=report_builder_class,
+                                                                           field_attr=field_attr)
 
             data_attr = split_attr(table_field)
             if int(data_attr.get('display_heading', 1)) == 0:

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/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, get_report_builder_class
+from advanced_report_builder.utils import crispy_modal_link_args, 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
@@ -135,9 +135,9 @@ class KanbanView(DataMergeUtils, ReportBase, FilterQueryMixin, TemplateView):
         if kanban_report_lane.kanban_report_description is not None:
             description = kanban_report_lane.kanban_report_description.description
             columns, column_map = self.get_data_merge_columns(base_model=base_model,
-                                                         report_builder_class=report_builder_class,
-                                                         html=description,
-                                                         table=table)
+                                                              report_builder_class=report_builder_class,
+                                                              html=description,
+                                                              table=table)
 
             table_indexes.append('description')
             table.add_columns(DescriptionColumn(column_name='description',
@@ -149,9 +149,9 @@ class KanbanView(DataMergeUtils, ReportBase, FilterQueryMixin, TemplateView):
         table.table_options['indexes'] = table_indexes
 
         if kanban_report_lane.link_field and self.kwargs.get('enable_links'):
-            _, col_type_override, _, _ = get_field_details(base_model=base_model,
-                                                           field=kanban_report_lane.link_field,
-                                                           report_builder_class=report_builder_class)
+            _, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                field=kanban_report_lane.link_field,
+                                                                report_builder_class=report_builder_class)
             if isinstance(col_type_override.field, list):
                 field = col_type_override.field[0]
             else:
@@ -240,15 +240,16 @@ class KanbanView(DataMergeUtils, ReportBase, FilterQueryMixin, TemplateView):
                 multiple_type = kanban_report_lane.multiple_type
                 current_start_date = start_date_and_time
 
-                _, _, _, field_name = get_field_details(base_model=base_model,
-                                                        field=kanban_report_lane.multiple_type_date_field,
-                                                        report_builder_class=report_builder_class)
+                _, _, _, field_name = self.get_field_details(base_model=base_model,
+                                                             field=kanban_report_lane.multiple_type_date_field,
+                                                             report_builder_class=report_builder_class)
 
                 end_field_name = None
                 if kanban_report_lane.multiple_type_end_date_field:
-                    _, _, _, end_field_name = get_field_details(base_model=base_model,
-                                                                field=kanban_report_lane.multiple_type_end_date_field,
-                                                                report_builder_class=report_builder_class)
+                    _, _, _, end_field_name = self.get_field_details(
+                        base_model=base_model,
+                        field=kanban_report_lane.multiple_type_end_date_field,
+                        report_builder_class=report_builder_class)
 
                 sub_lanes = []
                 while (current_end_date := self.get_multiple_date(

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/modals_base.py

@@ -13,9 +13,10 @@ from django_modals.modals import ModelFormModal
 from django_modals.widgets.select2 import Select2
 
 from advanced_report_builder.field_types import FieldTypes
+from advanced_report_builder.field_utils import ReportBuilderFieldUtils
 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, get_report_builder_class
+from advanced_report_builder.utils import get_report_builder_class
 
 
 class QueryBuilderModelForm(ModelCrispyForm):
@@ -23,7 +24,7 @@ class QueryBuilderModelForm(ModelCrispyForm):
         return StrictButton(button_text, onclick=f'save_modal_{ self.form_id }()', css_class=css_class, **kwargs)
 
 
-class QueryBuilderModalBaseMixin:
+class QueryBuilderModalBaseMixin(ReportBuilderFieldUtils):
 
     @staticmethod
     def get_report_builder_class(report_type_id):
@@ -56,9 +57,9 @@ class QueryBuilderModalBaseMixin:
         for report_builder_field in report_builder_class.fields:
             if (not isinstance(report_builder_field, str) or
                     report_builder_field not in report_builder_class.exclude_search_fields):
-                django_field, _, columns, _ = get_field_details(base_model=base_model,
-                                                                field=report_builder_field,
-                                                                report_builder_class=report_builder_class)
+                django_field, _, columns, _ = self.get_field_details(base_model=base_model,
+                                                                     field=report_builder_field,
+                                                                     report_builder_class=report_builder_class)
                 for column in columns:
                     field_types.get_filter(query_builder_filters=query_builder_filters,
                                            django_field=django_field,
@@ -169,7 +170,7 @@ class QueryBuilderModalBase(QueryBuilderModalBaseMixin, ModelFormModal):
             if (not isinstance(report_builder_field, str) or
                     report_builder_field not in report_builder_class.exclude_display_fields or
                     (show_order_by_fields and report_builder_field in report_builder_class.order_by_fields)):
-                django_field, col_type_override, columns, _ = get_field_details(
+                django_field, col_type_override, columns, _ = self.get_field_details(
                     base_model=base_model,
                     field=report_builder_field,
                     report_builder_class=report_builder_class)

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/report_utils_mixin.py

@@ -9,12 +9,13 @@ from django_datatables.columns import CurrencyPenceColumn, CurrencyColumn
 
 from advanced_report_builder.columns import ReportBuilderCurrencyPenceColumn, ReportBuilderCurrencyColumn, \
     ReportBuilderNumberColumn
+from advanced_report_builder.field_utils import ReportBuilderFieldUtils
 from advanced_report_builder.filter_query import FilterQueryMixin
 from advanced_report_builder.globals import ANNOTATION_FUNCTIONS, ANNOTATION_CHOICE_COUNT
 from advanced_report_builder.utils import decode_attribute
 
 
-class ReportUtilsMixin(FilterQueryMixin):
+class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
     use_annotations = True
     number_field = ReportBuilderNumberColumn
 

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/advanced_report_builder/views/single_values.py

@@ -20,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, get_report_builder_class
+from advanced_report_builder.utils import 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
@@ -44,9 +44,9 @@ class SingleValueView(ChartBaseView):
         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,
-                                                                  report_builder_class=report_builder_class)
+        django_field, col_type_override, _, _ = self.get_field_details(base_model=base_model,
+                                                                       field=field,
+                                                                       report_builder_class=report_builder_class)
 
         if (isinstance(django_field, NUMBER_FIELDS) or
                 col_type_override is not None and col_type_override.annotations):
@@ -143,7 +143,7 @@ class SingleValueView(ChartBaseView):
         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(
+        deno_django_field, denominator_col_type_override, _, _ = self.get_field_details(
             base_model=base_model,
             field=denominator_field,
             report_builder_class=report_builder_class)
@@ -151,7 +151,7 @@ class SingleValueView(ChartBaseView):
                 (denominator_col_type_override is not None and not denominator_col_type_override.annotations)):
             raise ReportError('denominator is not a number field')
 
-        num_django_field, numerator_col_type_override, _, _ = get_field_details(
+        num_django_field, numerator_col_type_override, _, _ = self.get_field_details(
             base_model=base_model,
             field=denominator_field,
             report_builder_class=report_builder_class)

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,11 +1,9 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.5.5
+Version: 0.5.7
 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
-License: UNKNOWN
-Platform: UNKNOWN
 Classifier: Programming Language :: Python :: 3
 Classifier: License :: OSI Approved :: MIT License
 Classifier: Operating System :: OS Independent
@@ -17,5 +15,3 @@ License-File: LICENSE
 
 
 # django-advanced-report-builder
-
-

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/django_advanced_report_builder.egg-info/SOURCES.txt

@@ -10,6 +10,7 @@ advanced_report_builder/customise.py
 advanced_report_builder/duplicate.py
 advanced_report_builder/exceptions.py
 advanced_report_builder/field_types.py
+advanced_report_builder/field_utils.py
 advanced_report_builder/filter_query.py
 advanced_report_builder/generate_series.py
 advanced_report_builder/globals.py

{django-advanced-report-builder-0.5.5 → django-advanced-report-builder-0.5.7}/setup.py

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