django-advanced-report-builder 0.6.5__tar.gz → 0.7.0__tar.gz

{django-advanced-report-builder-0.6.5/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.6.5
+Version: 0.7.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.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/filter_query.py

@@ -233,14 +233,20 @@ class FilterQueryMixin:
             query_list.append(~Q((query_string, current_user)))
 
     def get_report_query(self, report):
-
-        slug_key = self.slug.get(f'query{report.pk}')
+        dashboard_report = self.dashboard_report
+        if dashboard_report is not None:
+            slug_key = self.slug.get(f'query{report.pk}_{dashboard_report.pk}')
+        else:
+            slug_key = self.slug.get(f'query{report.pk}')
         if slug_key:
             report_query = get_object_or_404(ReportQuery, id=slug_key)
             if report_query.report_id != report.pk:
                 return None
         else:
-            report_query = report.reportquery_set.first()
+            if dashboard_report is not None and dashboard_report.report_query is not None:
+                report_query = dashboard_report.report_query
+            else:
+                report_query = report.reportquery_set.first()
         return report_query
 
     @staticmethod

django-advanced-report-builder-0.7.0/advanced_report_builder/migrations/0014_auto_20240706_2207.py

@@ -0,0 +1,24 @@
+# Generated by Django 3.2.7 on 2024-07-06 22:07
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('advanced_report_builder', '0013_reportqueryorder'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='dashboardreport',
+            name='report_query',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, to='advanced_report_builder.reportquery'),
+        ),
+        migrations.AddField(
+            model_name='dashboardreport',
+            name='show_versions',
+            field=models.BooleanField(default=True),
+        ),
+    ]

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/models.py

@@ -215,6 +215,9 @@ class ReportQuery(TimeStampedModel):
         ordering = ['order']
         verbose_name_plural = 'Report queries'
 
+    def __str__(self):
+        return self.name
+
 
 class ReportQueryOrder(TimeStampedModel):
     report_query = models.ForeignKey(ReportQuery, on_delete=models.CASCADE)
@@ -482,6 +485,8 @@ class DashboardReport(TimeStampedModel):
     top = models.BooleanField(default=False)
     name_override = models.CharField(max_length=200, blank=True, null=True)
     display_option = models.PositiveIntegerField(choices=DISPLAY_OPTION_CHOICES, default=DISPLAY_OPTION_NONE)
+    show_versions = models.BooleanField(default=True)
+    report_query = models.ForeignKey(ReportQuery, blank=True, null=True, on_delete=models.CASCADE)
 
     def get_class(self, extra_class_name):
         if self.display_option != DISPLAY_OPTION_NONE:

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/templates/advanced_report_builder/charts/modal.html

@@ -8,11 +8,5 @@
             $('#id_date_field').val('').trigger('change');
         });
     });
-
-    function save_modal_{{ form.form_id }}() {
-        id_query_data.save_query_builder();
-        django_modal.process_commands_lock([{'function': 'post_modal'}]);
-    }
-
 </script>
 {% endblock %}

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/templates/advanced_report_builder/datatables/modal.html

@@ -9,9 +9,5 @@ $(function () {
         });
     });
 
-
-function save_modal_{{ form.form_id }}() {
-    django_modal.process_commands_lock([{'function': 'post_modal'}]);
-}
 </script>
 {% endblock %}

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/templates/advanced_report_builder/datatables/onclick_menu.html

@@ -5,6 +5,7 @@
             <a {% if value.dropdown %}id="{{ value.dropdown.id }}"{% endif %} href="#" onclick="{{ value.href }}"
                class="mr-1 mb-1 btn {{ value.css|default:"btn-primary" }}{% if value.active %} active{% endif %}" {{ value.attributes }}>
                 <span {% if value.show_caret %}class="dropdown-toggle"{% endif %}>{{ value.name }}{{ value.badge }}</span></a>
+
         {% else %}
             {{ value.render }}
         {% endif %}

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/templates/advanced_report_builder/kanban/description_modal.html

@@ -8,10 +8,5 @@
                     reset_id_description();
                 });
             });
-
-            function save_modal_{{ form.form_id }}() {
-                django_modal.process_commands_lock([{'function': 'post_modal'}]);
-            }
-
 </script>
 {% endblock %}

django-advanced-report-builder-0.7.0/advanced_report_builder/templates/advanced_report_builder/kanban/modal.html

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

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/templates/advanced_report_builder/query_builder.html

@@ -78,7 +78,6 @@
                 $(field_id).val(JSON.stringify(results, null, 2));
                 return results;
             }
-
 }( window.{{ field.auto_id }} = window.{{ field.auto_id }} || {}, jQuery ));
 
     ajax_helpers.command_functions.save_query_builder_{{ field.auto_id }} = function (command) {

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/templates/advanced_report_builder/single_values/modal.html

@@ -9,11 +9,5 @@
                 });
             });
 
-            function save_modal_{{ form.form_id }}() {
-                id_extra_query_data.save_query_builder();
-                id_query_data.save_query_builder();
-                django_modal.process_commands_lock([{'function': 'post_modal'}]);
-            }
-
 </script>
 {% endblock %}

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/urls.py

@@ -12,8 +12,8 @@ from advanced_report_builder.views.kanban import KanbanModal, KanbanLaneModal, K
 from advanced_report_builder.views.line_charts import LineChartModal, LineChartFieldModal
 from advanced_report_builder.views.pie_charts import PieChartModal, PieChartFieldModal
 from advanced_report_builder.views.reports import DuplicateReportModal
-from advanced_report_builder.views.single_values import SingleValueModal, SingleValueShowBreakdownModal,\
-    SingleValueTableFieldModal
+from advanced_report_builder.views.single_values import SingleValueModal, SingleValueShowBreakdownModal, \
+    SingleValueTableFieldModal, QueryNumeratorModal
 from advanced_report_builder.views.targets.views import TargetModal
 
 app_name = 'advanced_report_builder'
@@ -30,6 +30,8 @@ urlpatterns = [
 
     path('single-value/modal/<str:slug>/', SingleValueModal.as_view(), name='single_value_modal'),
     path('single-value/modal/field/<str:slug>/', SingleValueTableFieldModal.as_view(), name='single_value_field_modal'),
+    path('single-value/modal/numerator-field/<str:slug>/', QueryNumeratorModal.as_view(),
+         name='single_value_numerator_modal'),
     path('single-value/show-breakdown/<str:slug>/', SingleValueShowBreakdownModal.as_view(),
          name='single_value_show_breakdown_modal'),
 

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/utils.py

@@ -76,3 +76,8 @@ def get_report_builder_class(model, report_type=None, class_name=None):
     if report_builder_class is not None:
         report_builder_class = report_builder_class()
     return report_builder_class
+
+
+def get_query_js(button_name, field_id):
+    return ('django_modal.process_commands_lock([{"function": "post_modal", "button": {"button": "' +
+            button_name + '", "' + field_id + '": $(this).closest(\'tr\').attr(\'id\')}}])')

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/views/bar_charts.py

@@ -4,6 +4,7 @@ import operator
 from datetime import datetime, timedelta
 from functools import reduce
 
+from crispy_forms.bootstrap import StrictButton
 from crispy_forms.layout import Div
 from date_offset.monthdelta import MonthDelta
 from django.core.exceptions import FieldDoesNotExist
@@ -35,6 +36,7 @@ from advanced_report_builder.views.charts_base import ChartBaseView, ChartBaseFi
 from advanced_report_builder.views.datatables.modal import TableFieldModal, TableFieldForm
 from advanced_report_builder.views.datatables.utils import TableUtilsMixin
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin, QueryBuilderModalBase
+from advanced_report_builder.views.query_modal.mixin import MultiQueryModalMixin
 
 
 class BarChartView(ChartBaseView):
@@ -141,11 +143,12 @@ class BarChartView(ChartBaseView):
         return start_field_name
 
 
-class BarChartModal(QueryBuilderModalBase):
+class BarChartModal(MultiQueryModalMixin, QueryBuilderModalBase):
     template_name = 'advanced_report_builder/charts/modal.html'
     process = PROCESS_EDIT_DELETE
     permission_delete = PERMISSION_OFF
     model = BarChartReport
+    show_order_by = False
     widgets = {'positive_bar_colour': ColourPickerWidget,
                'negative_bar_colour': ColourPickerWidget,
                'stacked': RBToggle,
@@ -175,7 +178,7 @@ class BarChartModal(QueryBuilderModalBase):
                    'breakdown_fields']
 
     def form_setup(self, form, *_args, **_kwargs):
-        if 'data' in _kwargs:
+        if 'data' in _kwargs and len(_kwargs['data']) > 0:
             date_field = _kwargs['data'].get('date_field')
             end_date_field = _kwargs['data'].get('end_date_field')
             report_type_id = _kwargs['data'].get('report_type')
@@ -199,7 +202,6 @@ class BarChartModal(QueryBuilderModalBase):
 
         form.fields['notes'].widget.attrs['rows'] = 3
 
-        self.add_query_data(form)
         url = reverse('advanced_report_builder:bar_chart_field_modal',
                       kwargs={'slug': 'selector-99999-data-FIELD_INFO-report_type_id-REPORT_TYPE_ID'})
 
@@ -219,33 +221,34 @@ class BarChartModal(QueryBuilderModalBase):
                         BarChartReport.DATE_FIELD_RANGE: ('html', 'Start date field')}}
         ])
 
-        return ('name',
-                'notes',
-                'report_type',
-                'report_tags',
-                'bar_chart_orientation',
-                'axis_scale',
-                'axis_value_type',
-                'date_field_type',
-                'date_field',
-                'end_date_field',
-                FieldEx('fields',
-                        template='advanced_report_builder/select_column.html',
-                        extra_context={'select_column_url': url,
-                                       'command_prefix': ''}),
-                'x_label',
-                'y_label',
-                'stacked',
-                'show_totals',
-                'show_blank_dates',
-                'show_breakdown',
-                FieldEx('breakdown_fields',
-                        template='advanced_report_builder/select_column.html',
-                        extra_context={'select_column_url': url_breakdown,
-                                       'command_prefix': 'breakdown_'}),
-                FieldEx('query_data',
-                        template='advanced_report_builder/query_builder.html'),
-                )
+        fields = ['name',
+                  'notes',
+                  'report_type',
+                  'report_tags',
+                  'bar_chart_orientation',
+                  'axis_scale',
+                  'axis_value_type',
+                  'date_field_type',
+                  'date_field',
+                  'end_date_field',
+                  FieldEx('fields',
+                          template='advanced_report_builder/select_column.html',
+                          extra_context={'select_column_url': url,
+                                         'command_prefix': ''}),
+                  'x_label',
+                  'y_label',
+                  'stacked',
+                  'show_totals',
+                  'show_blank_dates',
+                  'show_breakdown',
+                  FieldEx('breakdown_fields',
+                          template='advanced_report_builder/select_column.html',
+                          extra_context={'select_column_url': url_breakdown,
+                                         'command_prefix': 'breakdown_'})
+                  ]
+        if self.object.id:
+            self.add_extra_queries(form=form, fields=fields)
+        return fields
 
     def select2_date_field(self, **kwargs):
         return self.get_fields_for_select2(field_type='date',
@@ -368,7 +371,7 @@ class BarChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
                           'val': _attr})
 
         self.add_command({'function': 'html', 'selector': f'#{selector} span', 'html': form.cleaned_data['title']})
-        self.add_command({'function': 'save_query_builder_id_query_data'})
+        self.add_command({'function': 'save_query_builder_id_filter'})
         self.add_command({'function': 'update_selection'})
         return self.command_response('close')
 
@@ -412,6 +415,12 @@ class BarChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
 class BarChartBreakdownFieldForm(TableFieldForm):
     cancel_class = 'btn-secondary modal-cancel'
 
+    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
+        if isinstance(self.django_field, NUMBER_FIELDS):
+            return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
+        else:
+            return super().submit_button(css_class, button_text, **kwargs)
+
 
 class BarChartBreakdownFieldModal(TableFieldModal):
     form_class = BarChartBreakdownFieldForm
@@ -426,6 +435,7 @@ class BarChartBreakdownFieldModal(TableFieldModal):
                           'val': _attr})
 
         self.add_command({'function': 'html', 'selector': f'#{selector} span', 'html': form.cleaned_data['title']})
+        self.add_command({'function': 'save_query_builder_id_filter'})
         self.add_command({'function': 'breakdown_update_selection'})
         return self.command_response('close')
 

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/views/charts_base.py

@@ -6,6 +6,7 @@ from crispy_forms.bootstrap import StrictButton
 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.models import Q
 from django.shortcuts import get_object_or_404
@@ -43,7 +44,7 @@ class ChartJSTable(DatatableTable):
             targets = []
             try:
                 data = self.get_table_array(self.kwargs.get('request'), self.get_query())
-            except DataError:
+            except (DataError, FieldError):
                 data = [['N/A']]
             if self.targets is not None:
                 targets = self.targets.all()
@@ -280,7 +281,7 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
 
         self.add_menu('button_menu', 'button_group').add_items(
             *report_menu,
-            *self.queries_menu(),
+            *self.queries_menu(report=self.report, dashboard_report=self.dashboard_report),
         )
 
     def pod_dashboard_edit_menu(self):
@@ -303,10 +304,6 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
     def edit_report_menu(request, chart_report_id, slug_str):
         return []
 
-    # noinspection PyMethodMayBeStatic
-    def queries_menu(self):
-        return []
-
     @staticmethod
     def get_period_divider(annotation_value_choice, start_date_type, end_date_type):
         variable_date = VariableDate()
@@ -346,14 +343,10 @@ class ChartBaseFieldForm(ReportBuilderFieldUtils, CrispyForm):
         super().__init__(*args, **kwargs)
 
     def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
-        if isinstance(self.django_field, NUMBER_FIELDS):
-            return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
-        else:
-            return super().submit_button(css_class, button_text, **kwargs)
+        return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
 
     def cancel_button(self, css_class=cancel_class, **kwargs):
-        commands = [{'function': 'save_query_builder_id_query_data'},
-                    {'function': 'close'}]
+        commands = [{'function': 'close'}]
         return self.button('Cancel', commands, css_class, **kwargs)
 
     def get_report_type_details(self):

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/views/custom.py

@@ -9,9 +9,10 @@ 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.views.query_modal.mixin import MultiQueryModalMixin
+from advanced_report_builder.views.report import ReportBase
 
 
-class CustomBaseView(MenuMixin, FilterQueryMixin, TemplateView):
+class CustomBaseView(ReportBase, FilterQueryMixin, TemplateView):
     report_type_slug = None
 
     def __init__(self, **kwargs):
@@ -40,18 +41,6 @@ class CustomBaseView(MenuMixin, FilterQueryMixin, TemplateView):
         context['title'] = self.get_title()
         return context
 
-    def queries_menu(self):
-        report_queries = self.report.reportquery_set.all()
-        if len(report_queries) > 1:
-            dropdown = []
-            for report_query in report_queries:
-                slug_str = make_slug_str(self.slug, overrides={f'query{self.report.id}': report_query.id})
-                dropdown.append((self.request.resolver_match.view_name,
-                                 report_query.name, {'url_kwargs': {'slug': slug_str}}))
-            return [MenuItem(menu_display='Version', no_hover=True, css_classes='btn-secondary',
-                             dropdown=dropdown)]
-        return []
-
     def setup_menu(self):
         super().setup_menu()
         if not self.show_toolbar:
@@ -66,7 +55,7 @@ class CustomBaseView(MenuMixin, FilterQueryMixin, TemplateView):
 
         self.add_menu('button_menu', 'button_group').add_items(
             *report_menu,
-            *self.queries_menu()
+            *self.queries_menu(report=self.report, dashboard_report=self.dashboard_report)
         )
 
     def pod_dashboard_edit_menu(self):
@@ -88,13 +77,10 @@ class CustomBaseView(MenuMixin, FilterQueryMixin, TemplateView):
         else:
             return self.report.name
 
-    def get_dashboard_class(self, report):
-        return None
-
     def get_report_type(self):
         if self.report_type_slug is not None:
             if self._report_type is None:
-                self._report_type =  ReportType.objects.get(slug=self.report_type_slug)
+                self._report_type = ReportType.objects.get(slug=self.report_type_slug)
             return self._report_type
         return None
 
@@ -139,14 +125,10 @@ class CustomModal(MultiQueryModalMixin, ModelFormModal):
                    'notes']
 
     def form_setup(self, form, *_args, **_kwargs):
-        fields = ['name',
-                  'report_tags',
-                  'notes']
-
+        fields = [*self.form_fields]
         if self.object.id and 'report_type' in self.slug:
-            self.add_extra_queries(form=form, fields=fields, show_order_by=True)
+            self.add_extra_queries(form=form, fields=fields)
         return fields
 
     def get_report_type(self, **_kwargs):
         return self.slug['report_type']
-

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/views/dashboard.py

@@ -9,11 +9,11 @@ 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.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
+from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF, PERMISSION_DISABLE
 from django_modals.widgets.select2 import Select2
 from django_modals.widgets.widgets import Toggle
 
-from advanced_report_builder.models import Dashboard, DashboardReport, Report
+from advanced_report_builder.models import Dashboard, DashboardReport, Report, ReportQuery
 from advanced_report_builder.utils import split_slug
 from advanced_report_builder.views.bar_charts import BarChartView
 from advanced_report_builder.views.datatables.datatables import TableView
@@ -188,17 +188,23 @@ class DashboardReportModal(ModelFormModal):
     model = DashboardReport
     process = PROCESS_EDIT_DELETE
     permission_delete = PERMISSION_OFF
+    permission_create = PERMISSION_DISABLE
 
     form_fields = ['name_override',
                    'top',
-                   'display_option']
-    widgets = {'top': Toggle(attrs={'data-onstyle': 'success', 'data-on': 'YES', 'data-off': 'NO'})}
+                   'display_option',
+                   'show_versions',
+                   'report_query']
+    widgets = {'top': Toggle(attrs={'data-onstyle': 'success', 'data-on': 'YES', 'data-off': 'NO'}),
+               'show_versions': Toggle(attrs={'data-onstyle': 'success', 'data-on': 'YES', 'data-off': 'NO'})}
 
     @staticmethod
     def form_setup(form, *_args, **_kwargs):
         form.add_trigger('top', 'onchange', [
             {'selector': '#div_id_display_option', 'values': {'checked': 'hide'}, 'default': 'show'},
         ])
+        report_queries = ReportQuery.objects.filter(report=form.instance.report)
+        form.fields['report_query'] = ModelChoiceField(queryset=report_queries, widget=Select2, required=False)
 
 
 class DashboardAddReportForm(CrispyForm):

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/views/datatables/datatables.py

@@ -106,7 +106,7 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
 
         self.add_menu('button_menu', 'button_group').add_items(
             *report_menu,
-            *self.queries_menu(),
+            *self.queries_menu(report=self.report, dashboard_report=self.dashboard_report),
         )
 
     def pod_dashboard_edit_menu(self):
@@ -134,18 +134,6 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
                 *self.duplicate_menu(request=self.request, report_id=chart_report_id)
                 ]
 
-    # noinspection PyMethodMayBeStatic
-    def queries_menu(self):
-        report_queries = self.table_report.reportquery_set.all()
-        if len(report_queries) > 1:
-            dropdown = []
-            for report_query in report_queries:
-                slug_str = make_slug_str(self.slug, overrides={f'query{self.table_report.id}': report_query.id})
-                dropdown.append((self.request.resolver_match.view_name,
-                                 report_query.name, {'url_kwargs': {'slug': slug_str}}))
-            return [MenuItem(menu_display='Version', no_hover=True, css_classes='btn-secondary',
-                             dropdown=dropdown)]
-        return []
 
     def get_dashboard_class(self, report):
         pivot_fields = report.tablereport.pivot_fields

{django-advanced-report-builder-0.6.5 → django-advanced-report-builder-0.7.0}/advanced_report_builder/views/datatables/modal.py

@@ -2,16 +2,11 @@ import base64
 import json
 
 from crispy_forms.bootstrap import StrictButton
-from crispy_forms.layout import Div, HTML
-from django.conf import settings
+from crispy_forms.layout import Div
 from django.forms import CharField, ChoiceField, BooleanField, IntegerField
 from django.urls import reverse
-from django_datatables.columns import MenuColumn
-from django_datatables.widgets import DataTableReorderWidget
-from django_menus.menu import HtmlMenu, MenuItem
 from django_modals.fields import FieldEx
 from django_modals.form_helpers import HorizontalNoEnterHelper
-from django_modals.forms import ModelCrispyForm
 from django_modals.modals import FormModal
 from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
 from django_modals.widgets.select2 import Select2Multiple
@@ -19,7 +14,7 @@ from django_modals.widgets.widgets import Toggle
 
 from advanced_report_builder.globals import DATE_FIELDS, NUMBER_FIELDS, ANNOTATION_VALUE_CHOICES, ANNOTATIONS_CHOICES, \
     DATE_FORMAT_TYPES, CURRENCY_COLUMNS, LINK_COLUMNS
-from advanced_report_builder.models import TableReport, ReportQuery, ReportType
+from advanced_report_builder.models import TableReport, ReportType
 from advanced_report_builder.toggle import RBToggle
 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
@@ -33,7 +28,6 @@ class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
     model = TableReport
     process = PROCESS_EDIT_DELETE
     permission_delete = PERMISSION_OFF
-    ajax_commands = ['datatable', 'button']
     show_order_by = False
 
     widgets = {'report_tags': Select2Multiple}
@@ -110,7 +104,7 @@ class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
                   ]
 
         if self.object.id:
-            self.add_extra_queries(form=form, fields=fields, show_order_by=False)
+            self.add_extra_queries(form=form, fields=fields)
 
         return fields
 
@@ -124,15 +118,6 @@ class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
             self.add_command('reload')
         return self.command_response()
 
-    def post_save(self, created, form):
-        if created:
-            self.modal_redirect(self.request.resolver_match.view_name, slug=f'pk-{self.object.id}-new-True')
-        else:
-            url_name = getattr(settings, 'REPORT_BUILDER_DETAIL_URL_NAME', '')
-            if url_name and self.slug.get('new'):
-                url = reverse(url_name, kwargs={'slug': self.object.slug})
-                self.command_response('redirect', url=url)
-
     def ajax_get_fields(self, **kwargs):
         report_type_id = kwargs['report_type']
         report_builder_class, base_model = self.get_report_builder_class(report_type_id=report_type_id)
@@ -161,7 +146,6 @@ class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
                                            search_string=kwargs.get('search'))
 
 
-
 class TableFieldForm(ChartBaseFieldForm):
     cancel_class = 'btn-secondary modal-cancel'
 
@@ -415,14 +399,3 @@ class TablePivotModal(QueryBuilderModalBaseMixin, FormModal):
         self.add_command({'function': 'update_pivot_selection'})
         return self.command_response('close')
 
-
-class QueryForm(ModelCrispyForm):
-    cancel_class = 'btn-secondary modal-cancel'
-
-    class Meta:
-        model = ReportQuery
-        fields = ['name',
-                  'query']
-
-    def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
-        return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)