django-advanced-report-builder 0.9.3__tar.gz → 0.9.5__tar.gz

{django-advanced-report-builder-0.9.3/django_advanced_report_builder.egg-info → django_advanced_report_builder-0.9.5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.3
+Version: 0.9.5
 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
@@ -10,6 +10,21 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+Requires-Dist: django-filtered-datatables>=0.0.21
+Requires-Dist: django-ajax-helpers>=0.0.20
+Requires-Dist: django-nested-modals>=0.0.21
+Requires-Dist: time-stamped-model>=0.2.3
+Requires-Dist: date-offset>=0.0.2
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![PyPI version](https://badge.fury.io/py/django-advanced-report-builder.svg)](https://badge.fury.io/py/django-advanced-report-builder)
 

django_advanced_report_builder-0.9.5/advanced_report_builder/.ruff_cache/.gitignore

@@ -0,0 +1,2 @@
+# Automatically created by ruff.
+*

django_advanced_report_builder-0.9.5/advanced_report_builder/.ruff_cache/CACHEDIR.TAG

@@ -0,0 +1 @@
+Signature: 8a477f597d28d172789f06886806bc55

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/admin.py

@@ -1,22 +1,23 @@
 from django.contrib import admin
+
 from advanced_report_builder.models import (
-    Report,
-    ReportType,
-    TableReport,
-    ReportQuery,
-    SingleValueReport,
+    BarChartReport,
+    CustomReport,
     Dashboard,
     DashboardReport,
-    BarChartReport,
-    LineChartReport,
-    PieChartReport,
     FunnelChartReport,
-    ReportTag,
     KanbanReport,
+    KanbanReportDescription,
     KanbanReportLane,
+    LineChartReport,
+    PieChartReport,
+    Report,
+    ReportQuery,
+    ReportTag,
+    ReportType,
+    SingleValueReport,
+    TableReport,
     Target,
-    CustomReport,
-    KanbanReportDescription,
 )
 
 

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/column_types.py

@@ -1,12 +1,12 @@
 from django.db import models
-from django_datatables.columns import CurrencyColumn, CurrencyPenceColumn, ColumnLink
+from django_datatables.columns import ColumnLink, CurrencyColumn, CurrencyPenceColumn
 
 from advanced_report_builder.columns import (
     ColourColumn,
-    ReverseForeignKeyStrColumn,
     ReverseForeignKeyBoolColumn,
     ReverseForeignKeyChoiceColumn,
     ReverseForeignKeyDateColumn,
+    ReverseForeignKeyStrColumn,
 )
 
 NUMBER_FIELDS = (

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/columns.py

@@ -1,31 +1,29 @@
 from django.contrib.humanize.templatetags.humanize import intcomma
-from django.contrib.postgres.aggregates import StringAgg, BoolOr, BoolAnd, ArrayAgg
-from django.db.models import Count, BooleanField, Min, Max
+from django.contrib.postgres.aggregates import ArrayAgg, BoolAnd, BoolOr, StringAgg
+from django.db.models import BooleanField, Count, Max, Min
 from django.db.models.functions import Cast
 from django_datatables.columns import (
     ColumnBase,
-    CurrencyPenceColumn,
-    CurrencyColumn,
-    NoHeadingColumn,
     ColumnLink,
+    CurrencyColumn,
+    CurrencyPenceColumn,
     ManyToManyColumn,
+    NoHeadingColumn,
 )
-from django_datatables.helpers import get_url, DUMMY_ID, render_replace
+from django_datatables.helpers import DUMMY_ID, get_url, render_replace
 from django_datatables.model_def import DatatableModel
 
 from advanced_report_builder.globals import (
-    REVERSE_FOREIGN_KEY_DELIMITER_COMMA,
-    REVERSE_FOREIGN_KEY_DELIMITER_VALUES,
     DATE_FORMAT_TYPE_DD_MM_YY_SLASH,
     DATE_FORMAT_TYPES_DJANGO_FORMAT,
+    REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_AND,
+    REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_ARRAY,
+    REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_XOR,
     REVERSE_FOREIGN_KEY_ANNOTATION_DATE_ARRAY,
     REVERSE_FOREIGN_KEY_ANNOTATION_DATE_MAX,
     REVERSE_FOREIGN_KEY_ANNOTATION_DATE_MIN,
-)
-from advanced_report_builder.globals import (
-    REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_XOR,
-    REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_AND,
-    REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_ARRAY,
+    REVERSE_FOREIGN_KEY_DELIMITER_COMMA,
+    REVERSE_FOREIGN_KEY_DELIMITER_VALUES,
 )
 
 
@@ -70,7 +68,7 @@ class ReportBuilderNumberColumn(ColumnBase):
 class ReportBuilderCurrencyPenceColumn(CurrencyPenceColumn):
     def row_result(self, data, _page_data):
         try:
-            return intcomma('{:.2f}'.format(data[self.field] / 100.0))
+            return intcomma(f'{data[self.field] / 100.0:.2f}')
         except (KeyError, TypeError):
             return '0.00'
 
@@ -78,7 +76,7 @@ class ReportBuilderCurrencyPenceColumn(CurrencyPenceColumn):
 class ReportBuilderCurrencyColumn(CurrencyColumn):
     def row_result(self, data, _page_data):
         try:
-            return intcomma('{:.2f}'.format(data[self.field]))
+            return intcomma(f'{data[self.field]:.2f}')
         except (KeyError, TypeError):
             return '0.00'
 

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/data_merge/utils.py

@@ -44,10 +44,7 @@ class DataMergeUtils(ReportBuilderFieldUtils):
                 title = include.get('title')
                 if title is None or title == '':
                     title = new_report_builder_class.title
-                if menus is not None:
-                    menu = []
-                else:
-                    menu = None
+                menu = [] if menus is not None else None
                 self.get_menu_fields(
                     base_model=new_model,
                     report_builder_class=new_report_builder_class,
@@ -101,7 +98,7 @@ class DataMergeUtils(ReportBuilderFieldUtils):
                 report_builder_class=report_builder_class,
                 table=table,
             )
-            if django_field is not None or isinstance(col_type_override.field, (list, tuple)):
+            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.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/duplicate.py

@@ -1,16 +1,17 @@
 from copy import deepcopy
 
+from django.shortcuts import get_object_or_404
+
 from advanced_report_builder.models import (
-    TableReport,
-    SingleValueReport,
     BarChartReport,
-    PieChartReport,
+    CustomReport,
     FunnelChartReport,
     KanbanReport,
     LineChartReport,
-    CustomReport,
+    PieChartReport,
+    SingleValueReport,
+    TableReport,
 )
-from django.shortcuts import get_object_or_404
 
 
 class DuplicateReport:

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/field_types.py

@@ -76,7 +76,7 @@ class FieldTypes:
                         'operators': self.get_operator(self.FIELD_TYPE_MULTIPLE_CHOICE),
                     }
                 )
-            elif isinstance(django_field, (models.CharField, models.TextField, models.EmailField)):
+            elif isinstance(django_field, models.CharField | models.TextField | models.EmailField):
                 query_builder_filters.append(
                     {
                         'id': column_id,
@@ -89,11 +89,7 @@ class FieldTypes:
                 )
             elif isinstance(
                 django_field,
-                (
-                    models.IntegerField,
-                    models.PositiveSmallIntegerField,
-                    models.PositiveIntegerField,
-                ),
+                models.IntegerField | models.PositiveSmallIntegerField | models.PositiveIntegerField,
             ):
                 if django_field.choices is None:
                     query_builder_filter = {

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/field_utils.py

@@ -1,12 +1,12 @@
+from django.apps import apps
 from django_datatables.columns import ColumnNameError
 from django_datatables.datatables import ColumnInitialisor
-from django.apps import apps
 
 from advanced_report_builder.column_types import (
-    NUMBER_FIELDS,
-    LINK_COLUMNS,
     COLOUR_COLUMNS,
     DATE_FIELDS,
+    LINK_COLUMNS,
+    NUMBER_FIELDS,
 )
 from advanced_report_builder.exceptions import ReportError
 from advanced_report_builder.utils import get_report_builder_class
@@ -111,16 +111,7 @@ class ReportBuilderFieldUtils:
                 selected_field_id=selected_field_value,
                 for_select2=for_select2,
             )
-        elif field_type == 'order':
-            self._get_fields(
-                base_model=base_model,
-                fields=fields_values,
-                report_builder_class=report_builder_class,
-                selected_field_id=selected_field_value,
-                for_select2=for_select2,
-                show_order_by_fields=True,
-            )
-        elif field_type == 'django_order':
+        elif field_type == 'order' or field_type == 'django_order':
             self._get_fields(
                 base_model=base_model,
                 fields=fields_values,

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/filter_query.py

@@ -79,10 +79,7 @@ class FilterQueryMixin:
         :param display_condition:
         :return:
         """
-        if display_condition == 'AND':
-            reduce_by = operator.and_
-        else:
-            reduce_by = operator.or_
+        reduce_by = operator.and_ if display_condition == 'AND' else operator.or_
 
         return reduce_by
 
@@ -179,7 +176,7 @@ class FilterQueryMixin:
             elif display_operator in ['not_equal', 'not_in']:
                 query_list.append(~((Q((field + '__gte', value[0]))) & (Q((field + '__lte', value[1])))))
             else:
-                query_list.append(((Q((field + '__gte', value[0]))) & (Q((field + '__lte', value[1])))))
+                query_list.append((Q((field + '__gte', value[0]))) & (Q((field + '__lte', value[1]))))
 
     @staticmethod
     def get_variable_year(value, query_list, display_operator, field, query_string):
@@ -229,7 +226,7 @@ class FilterQueryMixin:
                     )
                 else:
                     query_list.append(
-                        ((Q((field + '__month__gt', start_month))) & (Q((field + '__month__lte', end_month))))
+                        (Q((field + '__month__gt', start_month))) & (Q((field + '__month__lte', end_month)))
                     )
             else:
                 start_month = self.get_financial_month() - 1
@@ -246,11 +243,11 @@ class FilterQueryMixin:
                     )
                 else:
                     query_list.append(
-                        (
+                        
                             (Q((field + '__month', months[0])))
                             | (Q((field + '__month', months[1])))
                             | (Q((field + '__month', months[2])))
-                        )
+                        
                     )
 
     def get_logged_in_user(self, value, query_list, display_operator, field, query_string):
@@ -352,10 +349,7 @@ class FilterQueryMixin:
     ):
         if pivot_str in report_builder_class.pivot_fields:
             pivot_data = report_builder_class.pivot_fields[pivot_str]
-            if include_str == '':
-                full_field_id = pivot_data['field']
-            else:
-                full_field_id = '__'.join((include_str, pivot_data['field']))
+            full_field_id = pivot_data['field'] if include_str == '' else '__'.join((include_str, pivot_data['field']))
 
             return {'id': full_field_id, 'details': pivot_data}
 

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/globals.py

@@ -1,13 +1,12 @@
-from django.db.models import Sum, Max, Min, Count, Avg
+from django.db.models import Avg, Count, Max, Min, Sum
 from django.db.models.functions import (
+    TruncDay,
     TruncMonth,
     TruncQuarter,
-    TruncYear,
     TruncWeek,
-    TruncDay,
+    TruncYear,
 )
 
-
 REVERSE_FOREIGN_KEY_DELIMITER_COMMA = 1
 REVERSE_FOREIGN_KEY_DELIMITER_SEMICOLON = 2
 REVERSE_FOREIGN_KEY_DELIMITER_PIPE = 3

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/models.py

@@ -1,22 +1,21 @@
+from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils.dates import MONTHS
-from django_datatables.columns import DatatableColumn, NoHeadingColumn, ManyToManyColumn
+from django_datatables.columns import DatatableColumn, ManyToManyColumn, NoHeadingColumn
 from django_datatables.model_def import DatatableModel
 from django_modals.model_fields.colour import ColourField
 from time_stamped_model.models import TimeStampedModel
 
-from django.conf import settings
-
 from advanced_report_builder.globals import (
-    DISPLAY_OPTION_CHOICES,
-    DISPLAY_OPTION_2_PER_ROW,
-    DISPLAY_OPTION_NONE,
-    DISPLAY_OPTION_CLASSES,
+    ANNOTATION_CHART_SCALE,
+    ANNOTATION_CHOICE_COUNT,
     ANNOTATION_VALUE_CHOICES,
     ANNOTATIONS_CHOICES,
-    ANNOTATION_CHOICE_COUNT,
-    ANNOTATION_CHART_SCALE,
+    DISPLAY_OPTION_2_PER_ROW,
+    DISPLAY_OPTION_CHOICES,
+    DISPLAY_OPTION_CLASSES,
+    DISPLAY_OPTION_NONE,
 )
 from advanced_report_builder.signals import model_report_save
 
@@ -138,14 +137,14 @@ class Report(TimeStampedModel):
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        related_name='report_user_created_set'
+        related_name='report_user_created_set',
     )
     user_updated = models.ForeignKey(
         settings.AUTH_USER_MODEL,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
-        related_name='report_user_updated_set'
+        related_name='report_user_updated_set',
     )
 
     def __str__(self):
@@ -161,7 +160,6 @@ class Report(TimeStampedModel):
         return self.name
 
     def save(self, *args, **kwargs):
-
         current_user = getattr(self, '_current_user', None)
         if current_user is not None and current_user.is_authenticated:
             self.user_updated = current_user

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/signals.py

@@ -1,3 +1,3 @@
 from django.dispatch import Signal
 
-model_report_save = Signal()
+model_report_save = Signal()

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/urls.py

@@ -1,45 +1,45 @@
 from django.urls import path
 
 from advanced_report_builder.views.bar_charts import (
-    BarChartModal,
+    BarChartBreakdownFieldModal,
     BarChartFieldModal,
+    BarChartModal,
     BarChartShowBreakdownModal,
-    BarChartBreakdownFieldModal,
 )
 from advanced_report_builder.views.custom import CustomModal
 from advanced_report_builder.views.dashboard import (
-    DashboardReportModal,
-    DashboardModal,
     DashboardAddReportModal,
+    DashboardModal,
+    DashboardReportModal,
 )
 from advanced_report_builder.views.datatables.modal import (
-    TableModal,
     TableFieldModal,
+    TableModal,
     TablePivotModal,
 )
-from advanced_report_builder.views.query_modal.modal import QueryModal, QueryOrderModal
 from advanced_report_builder.views.funnel_charts import (
-    FunnelChartModal,
     FunnelChartFieldModal,
+    FunnelChartModal,
 )
 from advanced_report_builder.views.kanban import (
-    KanbanModal,
-    KanbanLaneModal,
-    KanbanLaneDuplicateModal,
-    KanbanDescriptionModal,
     KanbanDescriptionDuplicateModal,
+    KanbanDescriptionModal,
+    KanbanLaneDuplicateModal,
+    KanbanLaneModal,
+    KanbanModal,
 )
 from advanced_report_builder.views.line_charts import (
-    LineChartModal,
     LineChartFieldModal,
+    LineChartModal,
 )
-from advanced_report_builder.views.pie_charts import PieChartModal, PieChartFieldModal
+from advanced_report_builder.views.pie_charts import PieChartFieldModal, PieChartModal
+from advanced_report_builder.views.query_modal.modal import QueryModal, QueryOrderModal
 from advanced_report_builder.views.reports import DuplicateReportModal
 from advanced_report_builder.views.single_values import (
+    QueryNumeratorModal,
     SingleValueModal,
     SingleValueShowBreakdownModal,
     SingleValueTableFieldModal,
-    QueryNumeratorModal,
 )
 from advanced_report_builder.views.targets.views import TargetModal
 

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/variable_date.py

@@ -1,6 +1,6 @@
 import calendar
-from datetime import datetime, date, timedelta
 from calendar import monthrange
+from datetime import date, datetime, timedelta
 
 from date_offset.date_offset import DateOffset
 
@@ -72,7 +72,6 @@ class VariableDate:
         (RANGE_TYPE_4_WEEKS_AGO, '4 weeks ago'),
         (RANGE_TYPE_3_WEEKS_AGO, '3 weeks ago'),
         (RANGE_TYPE_2_WEEKS_AGO, '2 weeks ago'),
-
         (RANGE_TYPE_LAST_WEEK, 'Last week'),
         (RANGE_TYPE_YESTERDAY, 'Yesterday'),
         (RANGE_TYPE_TODAY, 'Today'),
@@ -297,7 +296,7 @@ class VariableDate:
             end_date = date_offset.get_offset('36m', today)
             number_of_days = (end_date - start_date).days
         else:
-            assert False, 'unknown date value'
+            raise AssertionError('unknown date value')
 
         start_date_and_time = datetime.combine(start_date, datetime.min.time())
         end_date_and_time = datetime.combine(end_date, datetime.max.time())

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/views/bar_charts.py

@@ -9,7 +9,7 @@ from crispy_forms.layout import Div
 from date_offset.monthdelta import MonthDelta
 from django.core.exceptions import FieldDoesNotExist
 from django.db.models import Q
-from django.forms import CharField, ChoiceField, BooleanField
+from django.forms import BooleanField, CharField, ChoiceField
 from django.shortcuts import get_object_or_404
 from django.urls import reverse
 from django_datatables.datatables import DatatableTable
@@ -17,42 +17,42 @@ from django_menus.menu import MenuItem
 from django_modals.fields import FieldEx
 from django_modals.form_helpers import HorizontalNoEnterHelper
 from django_modals.modals import FormModal, Modal
-from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
+from django_modals.processes import PERMISSION_OFF, PROCESS_EDIT_DELETE
 from django_modals.widgets.colour_picker import ColourPickerWidget
-from django_modals.widgets.select2 import Select2Multiple, Select2
+from django_modals.widgets.select2 import Select2, Select2Multiple
 from django_modals.widgets.widgets import Toggle
 
 from advanced_report_builder.column_types import NUMBER_FIELDS
 from advanced_report_builder.exceptions import ReportError
 from advanced_report_builder.generate_series import GenerateSeries
 from advanced_report_builder.globals import (
-    DEFAULT_DATE_FORMAT,
-    DATE_FORMAT_TYPES_DJANGO_FORMAT,
-    ANNOTATION_VALUE_YEAR,
-    ANNOTATION_VALUE_QUARTER,
-    ANNOTATION_VALUE_MONTH,
-    ANNOTATION_VALUE_WEEK,
     ANNOTATION_VALUE_DAY,
     ANNOTATION_VALUE_FUNCTIONS,
+    ANNOTATION_VALUE_MONTH,
+    ANNOTATION_VALUE_QUARTER,
+    ANNOTATION_VALUE_WEEK,
+    ANNOTATION_VALUE_YEAR,
+    DATE_FORMAT_TYPES_DJANGO_FORMAT,
+    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,
+    encode_attribute,
     get_report_builder_class,
+    split_attr,
 )
-from advanced_report_builder.views.charts_base import ChartBaseView, ChartBaseFieldForm
+from advanced_report_builder.views.charts_base import ChartBaseFieldForm, ChartBaseView
 from advanced_report_builder.views.datatables.modal import (
-    TableFieldModal,
     TableFieldForm,
+    TableFieldModal,
 )
 from advanced_report_builder.views.datatables.utils import TableUtilsMixin
 from advanced_report_builder.views.modals_base import (
-    QueryBuilderModalBaseMixin,
     QueryBuilderModalBase,
+    QueryBuilderModalBaseMixin,
 )
 from advanced_report_builder.views.query_modal.mixin import MultiQueryModalMixin
 
@@ -705,7 +705,7 @@ class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
         elif bar_chart_report.axis_scale == ANNOTATION_VALUE_DAY:
             return start_date.strftime('%d/%m/%Y')
         else:
-            assert False
+            raise AssertionError()
 
     def filter_date(self, query):
         bar_chart_report = self.chart_report
@@ -722,7 +722,7 @@ class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
         elif bar_chart_report.axis_scale == ANNOTATION_VALUE_DAY:
             end_date = start_date + timedelta(days=1)
         else:
-            assert False
+            raise AssertionError()
 
         if self.end_date_field_path is None:
             query_list = [

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/views/charts_base.py

@@ -1,12 +1,12 @@
 import base64
 import json
-from datetime import timedelta, datetime
+from datetime import datetime, timedelta
 
 from date_offset.date_offset import DateOffset
 from dateutil.relativedelta import relativedelta
 from django.apps import apps
 from django.core.exceptions import FieldError
-from django.db import ProgrammingError, DataError
+from django.db import DataError, ProgrammingError
 from django.db.models import Q
 from django.forms import ChoiceField
 from django.shortcuts import get_object_or_404
@@ -21,18 +21,18 @@ 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 (
+    ANNOTATION_VALUE_DAY,
     ANNOTATION_VALUE_FUNCTIONS,
-    ANNOTATION_VALUE_YEAR,
+    ANNOTATION_VALUE_MONTH,
     ANNOTATION_VALUE_QUARTER,
     ANNOTATION_VALUE_WEEK,
-    ANNOTATION_VALUE_DAY,
-    ANNOTATION_VALUE_MONTH,
+    ANNOTATION_VALUE_YEAR,
 )
 from advanced_report_builder.models import ReportType
 from advanced_report_builder.utils import (
-    split_slug,
-    split_attr,
     get_report_builder_class,
+    split_attr,
+    split_slug,
 )
 from advanced_report_builder.variable_date import VariableDate
 from advanced_report_builder.views.helpers import QueryBuilderForm

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/views/custom.py

@@ -1,13 +1,12 @@
 from django.views.generic import TemplateView
 from django_menus.menu import MenuItem
-from django_menus.menu import MenuMixin
 from django_modals.modals import ModelFormModal
-from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
+from django_modals.processes import PERMISSION_OFF, PROCESS_EDIT_DELETE
 from django_modals.widgets.select2 import Select2Multiple
 
 from advanced_report_builder.filter_query import FilterQueryMixin
 from advanced_report_builder.models import CustomReport, ReportType
-from advanced_report_builder.utils import split_slug, make_slug_str
+from advanced_report_builder.utils import split_slug
 from advanced_report_builder.views.query_modal.mixin import MultiQueryModalMixin
 from advanced_report_builder.views.report import ReportBase
 

{django-advanced-report-builder-0.9.3 → django_advanced_report_builder-0.9.5}/advanced_report_builder/views/dashboard.py

@@ -1,6 +1,7 @@
 import copy
 
 from ajax_helpers.mixins import AjaxHelpers
+from django.conf import settings
 from django.forms import ModelChoiceField
 from django.http import Http404
 from django.shortcuts import get_object_or_404
@@ -8,11 +9,11 @@ from django.urls import reverse
 from django.views.generic import TemplateView
 from django_menus.menu import MenuMixin
 from django_modals.forms import CrispyForm
-from django_modals.modals import ModelFormModal, FormModal
+from django_modals.modals import FormModal, ModelFormModal
 from django_modals.processes import (
-    PROCESS_EDIT_DELETE,
-    PERMISSION_OFF,
     PERMISSION_DISABLE,
+    PERMISSION_OFF,
+    PROCESS_EDIT_DELETE,
 )
 from django_modals.widgets.select2 import Select2
 from django_modals.widgets.widgets import Toggle
@@ -31,7 +32,6 @@ from advanced_report_builder.views.kanban import KanbanView
 from advanced_report_builder.views.line_charts import LineChartView
 from advanced_report_builder.views.pie_charts import PieChartView
 from advanced_report_builder.views.single_values import SingleValueView
-from django.conf import settings
 
 
 class ViewDashboardBase(AjaxHelpers, MenuMixin, TemplateView):