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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.5.7
+Version: 0.6.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.5.7 → django-advanced-report-builder-0.6.0}/advanced_report_builder/columns.py

@@ -111,8 +111,13 @@ class RecordCountColumn(ColumnBase):
 
 
 class ReportBuilderManyToManyColumn(ManyToManyColumn):
+
+    def __init__(self, *arg, **kwargs):
+        if not self.initialise(locals()):
+            return
+        super().__init__(*arg, **kwargs)
+        if self.model_path is not None:
+            self.field = 'id'
+
     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)
+        return page_results['m2m' + self.column_name].get(data_dict[self.model_path + 'id'], self.blank)

{django-advanced-report-builder-0.5.7 → django-advanced-report-builder-0.6.0}/advanced_report_builder/urls.py

@@ -4,7 +4,8 @@ from advanced_report_builder.views.bar_charts import BarChartModal, BarChartFiel
     BarChartBreakdownFieldModal
 from advanced_report_builder.views.custom import CustomModal
 from advanced_report_builder.views.dashboard import DashboardReportModal, DashboardModal, DashboardAddReportModal
-from advanced_report_builder.views.datatables.modal import TableModal, TableFieldModal, TablePivotModal, TableQueryModal
+from advanced_report_builder.views.datatables.modal import TableModal, TableFieldModal, TablePivotModal
+from advanced_report_builder.views.query_modal.modal import QueryModal
 from advanced_report_builder.views.funnel_charts import FunnelChartModal, FunnelChartFieldModal
 from advanced_report_builder.views.kanban import KanbanModal, KanbanLaneModal, KanbanLaneDuplicateModal, \
     KanbanDescriptionModal, KanbanDescriptionDuplicateModal
@@ -19,10 +20,12 @@ app_name = 'advanced_report_builder'
 
 
 urlpatterns = [
+
+    path('query/modal/query/<str:slug>', QueryModal.as_view(), name='query_modal'),
+
     path('table/modal/<str:slug>/', TableModal.as_view(), name='table_modal'),
     path('table/modal/field/<str:slug>/', TableFieldModal.as_view(), name='table_field_modal'),
     path('table/modal/pivot/<str:slug>/', TablePivotModal.as_view(), name='table_pivot_modal'),
-    path('table/modal/query/<str:slug>', TableQueryModal.as_view(), name='table_query_modal'),
 
     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'),

{django-advanced-report-builder-0.5.7 → django-advanced-report-builder-0.6.0}/advanced_report_builder/views/custom.py

@@ -1,14 +1,18 @@
 from django.views.generic import TemplateView
-from django_menus.menu import MenuMixin, MenuItem
+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.widgets.select2 import Select2Multiple
 
+from advanced_report_builder.filter_query import FilterQueryMixin
 from advanced_report_builder.models import CustomReport
-from advanced_report_builder.utils import split_slug
+from advanced_report_builder.utils import split_slug, make_slug_str
+from advanced_report_builder.views.query_modal.mixin import MultiQueryModalMixin
 
 
-class CustomBaseView(MenuMixin, TemplateView):
+class CustomBaseView(MenuMixin, FilterQueryMixin, TemplateView):
 
     def __init__(self, **kwargs):
         self.report = None
@@ -16,6 +20,7 @@ class CustomBaseView(MenuMixin, TemplateView):
         self.enable_edit = None
         self.dashboard_report = None
         self.show_toolbar = False
+        self.enable_queries = True
         super().__init__(**kwargs)
 
     def dispatch(self, request, *args, **kwargs):
@@ -34,6 +39,18 @@ class CustomBaseView(MenuMixin, 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:
@@ -70,15 +87,31 @@ class CustomBaseView(MenuMixin, TemplateView):
         else:
             return self.report.name
 
-    # noinspection PyMethodMayBeStatic
-    def queries_menu(self):
-        return []
-
     def get_dashboard_class(self, report):
         return None
 
+    def get_report_type(self):
+        return None
+
+    def get_default_query(self):
+        return None
 
-class CustomModal(ModelFormModal):
+    def get_default_filter(self, query):
+        return query
+
+    def get_query_results(self):
+        query = self.get_default_query()
+        if query is None:
+            return None
+
+        report_query = self.get_report_query(report=self.report)
+        if report_query:
+            result = self.process_query_filters(query=query, search_filter_data=report_query.query)
+            return result
+        return self.get_default_filter(query)
+
+
+class CustomModal(MultiQueryModalMixin, ModelFormModal):
     process = PROCESS_EDIT_DELETE
     permission_delete = PERMISSION_OFF
     model = CustomReport
@@ -88,3 +121,17 @@ class CustomModal(ModelFormModal):
     form_fields = ['name',
                    'report_tags',
                    'notes']
+
+    ajax_commands = ['datatable', 'button']
+
+    def form_setup(self, form, *_args, **_kwargs):
+        fields = ['name',
+                   'report_tags',
+                   'notes']
+
+        if self.object.id and 'report_type' in self.slug:
+            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.5.7 → django-advanced-report-builder-0.6.0}/advanced_report_builder/views/datatables/modal.py

@@ -12,7 +12,7 @@ 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, ModelFormModal
+from django_modals.modals import FormModal
 from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
 from django_modals.widgets.select2 import Select2Multiple
 from django_modals.widgets.widgets import Toggle
@@ -24,9 +24,10 @@ 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
 from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin, QueryBuilderModalBase
+from advanced_report_builder.views.query_modal.mixin import MultiQueryModalMixin
 
 
-class TableModal(QueryBuilderModalBase):
+class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
     template_name = 'advanced_report_builder/datatables/modal.html'
     size = 'xl'
     model = TableReport
@@ -108,61 +109,8 @@ class TableModal(QueryBuilderModalBase):
                   ]
 
         if self.object.id:
+            self.add_extra_queries(form=form, fields=fields)
 
-            add_query_js = 'django_modal.process_commands_lock([{"function": "post_modal", ' \
-                            '"button": {"button": "add_query"}}])'
-
-            description_add_menu_items = [
-
-                MenuItem(add_query_js.replace('"', """),
-                         menu_display='Add Query Version',
-                         css_classes='btn btn-primary',
-                         font_awesome='fas fa-pencil',
-                         link_type=MenuItem.HREF)]
-
-            menu = HtmlMenu(self.request,
-                            'advanced_report_builder/datatables/onclick_menu.html').add_items(
-                            *description_add_menu_items)
-
-            fields.append(Div(HTML(menu.render()), css_class='form-buttons'))
-            edit_query_js = 'django_modal.process_commands_lock([{"function": "post_modal", ' \
-                            '"button": {"button": "edit_query", "query_id": $(this).closest(\'tr\').attr(\'id\')}}])'
-
-            duplicate_query_js = 'django_modal.process_commands_lock([{"function": "post_modal", ' \
-                                 '"button": {"button": "duplicate_query", ' \
-                                 '"query_id": $(this).closest(\'tr\').attr(\'id\')}}])'
-
-            description_edit_menu_items = [
-                MenuItem(duplicate_query_js.replace('"', """),
-                         menu_display='Duplicate',
-                         css_classes='btn btn-sm btn-outline-dark',
-                         font_awesome='fas fa-clone',
-                         link_type=MenuItem.HREF),
-
-                MenuItem(edit_query_js.replace('"', """),
-                         menu_display='Edit',
-                         css_classes='btn btn-sm btn-outline-dark',
-                         font_awesome='fas fa-pencil',
-                         link_type=MenuItem.HREF)]
-
-            form.fields['queries'] = CharField(
-                required=False,
-                label='Queries Versions',
-                widget=DataTableReorderWidget(
-                    model=ReportQuery,
-                    order_field='order',
-                    fields=['_.index',
-                            '.id',
-                            'name',
-
-                            MenuColumn(column_name='menu', field='id',
-                                       column_defs={'orderable': False, 'className': 'dt-right'},
-                                       menu=HtmlMenu(self.request,
-                                                     'advanced_report_builder/datatables/onclick_menu.html').add_items(
-                                           *description_edit_menu_items)),
-                            ],
-                    attrs={'filter': {'report__id': self.object.id}}))
-            fields.append('queries')
         return fields
 
     def form_valid(self, form):
@@ -211,45 +159,6 @@ class TableModal(QueryBuilderModalBase):
                                            report_type=kwargs['report_type'],
                                            search_string=kwargs.get('search'))
 
-    def datatable_sort(self, **kwargs):
-
-        form = self.get_form()
-        widget = form.fields[kwargs['table_id'][3:]].widget
-        _model = widget.attrs['table_model']
-        current_sort = dict(_model.objects.filter(report=self.object.id).values_list('id', 'order'))
-        for s in kwargs['sort']:
-            if current_sort[s[1]] != s[0]:
-                o = _model.objects.get(id=s[1])
-                o.order = s[0]
-                o.save()
-        return self.command_response('')
-
-    def button_duplicate_query(self, **_kwargs):
-        query_id = _kwargs['query_id'][1:]
-        report_query = ReportQuery.objects.get(pk=query_id)
-        report_query.slug = None
-        report_query.pk = None
-        report_query.order = None
-        report_query.save()
-
-        report_type = _kwargs['report_type']
-        url = reverse('advanced_report_builder:table_query_modal',
-                      kwargs={'slug': f'pk-{report_query.id}-report_type-{report_type}'})
-        return self.command_response('show_modal', modal=url)
-
-    def button_add_query(self, **_kwargs):
-        report_type = _kwargs['report_type']
-        url = reverse('advanced_report_builder:table_query_modal',
-                      kwargs={'slug': f'report_id-{self.object.id}-report_type-{report_type}'})
-        return self.command_response('show_modal', modal=url)
-
-    def button_edit_query(self, **_kwargs):
-        query_id = _kwargs['query_id'][1:]
-        report_type = _kwargs['report_type']
-        url = reverse('advanced_report_builder:table_query_modal',
-                      kwargs={'slug': f'pk-{query_id}-report_type-{report_type}'})
-        return self.command_response('show_modal', modal=url)
-
 
 class TableFieldForm(ChartBaseFieldForm):
     cancel_class = 'btn-secondary modal-cancel'
@@ -515,31 +424,3 @@ class TableQueryForm(ModelCrispyForm):
 
     def submit_button(self, css_class='btn-success modal-submit', button_text='Submit', **kwargs):
         return StrictButton(button_text, onclick=f'save_modal_{self.form_id}()', css_class=css_class, **kwargs)
-
-
-class TableQueryModal(QueryBuilderModalBaseMixin, ModelFormModal):
-    model = ReportQuery
-    process = PROCESS_EDIT_DELETE
-    permission_delete = PERMISSION_OFF
-    form_class = TableQueryForm
-    helper_class = HorizontalNoEnterHelper
-
-    template_name = 'advanced_report_builder/datatables/query_modal.html'
-    no_header_x = True
-
-    def post_save(self, created, form):
-        self.add_command({'function': 'save_query_builder_id_query'})
-        return self.command_response('close')
-
-    def form_setup(self, form, *_args, **_kwargs):
-        fields = ['name',
-                  FieldEx('query', template='advanced_report_builder/query_builder.html')]
-        return fields
-
-    def ajax_get_query_builder_fields(self, **kwargs):
-        field_auto_id = kwargs['field_auto_id']
-
-        report_type_id = self.slug['report_type']
-        query_builder_filters = self.get_query_builder_report_type_field(report_type_id=report_type_id)
-
-        return self.command_response(f'query_builder_{field_auto_id}', data=json.dumps(query_builder_filters))

django-advanced-report-builder-0.6.0/advanced_report_builder/views/query_modal/mixin.py

@@ -0,0 +1,105 @@
+from crispy_forms.layout import Div, HTML
+from django.forms import CharField
+from django.urls import reverse
+from django_datatables.columns import MenuColumn
+from django_datatables.widgets import DataTableReorderWidget
+from django_menus.menu import MenuItem, HtmlMenu
+
+from advanced_report_builder.models import ReportQuery
+
+
+class MultiQueryModalMixin:
+    def datatable_sort(self, **kwargs):
+        form = self.get_form()
+        widget = form.fields[kwargs['table_id'][3:]].widget
+        _model = widget.attrs['table_model']
+        current_sort = dict(_model.objects.filter(report=self.object.id).values_list('id', 'order'))
+        for s in kwargs['sort']:
+            if current_sort[s[1]] != s[0]:
+                o = _model.objects.get(id=s[1])
+                o.order = s[0]
+                o.save()
+        return self.command_response('')
+    def get_report_type(self, **_kwargs):
+        return _kwargs['report_type']
+    def button_duplicate_query(self, **_kwargs):
+        query_id = _kwargs['query_id'][1:]
+        report_query = ReportQuery.objects.get(pk=query_id)
+        report_query.slug = None
+        report_query.pk = None
+        report_query.order = None
+        report_query.save()
+
+        report_type = self.get_report_type(**_kwargs)
+        url = reverse('advanced_report_builder:query_modal',
+                      kwargs={'slug': f'pk-{report_query.id}-report_type-{report_type}'})
+        return self.command_response('show_modal', modal=url)
+
+    def button_add_query(self, **_kwargs):
+        report_type = self.get_report_type(**_kwargs)
+        url = reverse('advanced_report_builder:query_modal',
+                      kwargs={'slug': f'report_id-{self.object.id}-report_type-{report_type}'})
+        return self.command_response('show_modal', modal=url)
+
+    def button_edit_query(self, **_kwargs):
+        query_id = _kwargs['query_id'][1:]
+        report_type = self.get_report_type(**_kwargs)
+        url = reverse('advanced_report_builder:query_modal',
+                      kwargs={'slug': f'pk-{query_id}-report_type-{report_type}'})
+        return self.command_response('show_modal', modal=url)
+
+    def add_extra_queries(self, form, fields):
+        add_query_js = 'django_modal.process_commands_lock([{"function": "post_modal", ' \
+                       '"button": {"button": "add_query"}}])'
+
+        description_add_menu_items = [
+
+            MenuItem(add_query_js.replace('"', """),
+                     menu_display='Add Query Version',
+                     css_classes='btn btn-primary',
+                     font_awesome='fas fa-pencil',
+                     link_type=MenuItem.HREF)]
+
+        menu = HtmlMenu(self.request,
+                        'advanced_report_builder/datatables/onclick_menu.html').add_items(
+            *description_add_menu_items)
+
+        fields.append(Div(HTML(menu.render()), css_class='form-buttons'))
+        edit_query_js = 'django_modal.process_commands_lock([{"function": "post_modal", ' \
+                        '"button": {"button": "edit_query", "query_id": $(this).closest(\'tr\').attr(\'id\')}}])'
+
+        duplicate_query_js = 'django_modal.process_commands_lock([{"function": "post_modal", ' \
+                             '"button": {"button": "duplicate_query", ' \
+                             '"query_id": $(this).closest(\'tr\').attr(\'id\')}}])'
+
+        description_edit_menu_items = [
+            MenuItem(duplicate_query_js.replace('"', """),
+                     menu_display='Duplicate',
+                     css_classes='btn btn-sm btn-outline-dark',
+                     font_awesome='fas fa-clone',
+                     link_type=MenuItem.HREF),
+
+            MenuItem(edit_query_js.replace('"', """),
+                     menu_display='Edit',
+                     css_classes='btn btn-sm btn-outline-dark',
+                     font_awesome='fas fa-pencil',
+                     link_type=MenuItem.HREF)]
+
+        form.fields['queries'] = CharField(
+            required=False,
+            label='Queries Versions',
+            widget=DataTableReorderWidget(
+                model=ReportQuery,
+                order_field='order',
+                fields=['_.index',
+                        '.id',
+                        'name',
+
+                        MenuColumn(column_name='menu', field='id',
+                                   column_defs={'orderable': False, 'className': 'dt-right'},
+                                   menu=HtmlMenu(self.request,
+                                                 'advanced_report_builder/datatables/onclick_menu.html').add_items(
+                                       *description_edit_menu_items)),
+                        ],
+                attrs={'filter': {'report__id': self.object.id}}))
+        fields.append('queries')

django-advanced-report-builder-0.6.0/advanced_report_builder/views/query_modal/modal.py

@@ -0,0 +1,38 @@
+import json
+
+from django_modals.fields import FieldEx
+from django_modals.form_helpers import HorizontalNoEnterHelper
+from django_modals.modals import ModelFormModal
+from django_modals.processes import PROCESS_EDIT_DELETE, PERMISSION_OFF
+
+from advanced_report_builder.models import ReportQuery
+from advanced_report_builder.views.datatables.modal import TableQueryForm
+from advanced_report_builder.views.modals_base import QueryBuilderModalBaseMixin
+
+
+class QueryModal(QueryBuilderModalBaseMixin, ModelFormModal):
+    model = ReportQuery
+    process = PROCESS_EDIT_DELETE
+    permission_delete = PERMISSION_OFF
+    form_class = TableQueryForm
+    helper_class = HorizontalNoEnterHelper
+
+    template_name = 'advanced_report_builder/query_modal.html'
+    no_header_x = True
+
+    def post_save(self, created, form):
+        self.add_command({'function': 'save_query_builder_id_query'})
+        return self.command_response('close')
+
+    def form_setup(self, form, *_args, **_kwargs):
+        fields = ['name',
+                  FieldEx('query', template='advanced_report_builder/query_builder.html')]
+        return fields
+
+    def ajax_get_query_builder_fields(self, **kwargs):
+        field_auto_id = kwargs['field_auto_id']
+
+        report_type_id = self.slug['report_type']
+        query_builder_filters = self.get_query_builder_report_type_field(report_type_id=report_type_id)
+
+        return self.command_response(f'query_builder_{field_auto_id}', data=json.dumps(query_builder_filters))

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

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

@@ -107,6 +107,7 @@ advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugin
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/invert.scss
 advanced_report_builder/static/advanced_report_builder/query_builder/scss/plugins/sortable.scss
 advanced_report_builder/templates/advanced_report_builder/query_builder.html
+advanced_report_builder/templates/advanced_report_builder/query_modal.html
 advanced_report_builder/templates/advanced_report_builder/select_column.html
 advanced_report_builder/templates/advanced_report_builder/charts/modal.html
 advanced_report_builder/templates/advanced_report_builder/charts/modal_field.html
@@ -119,7 +120,6 @@ advanced_report_builder/templates/advanced_report_builder/charts/pie/middle.html
 advanced_report_builder/templates/advanced_report_builder/data_merge/data_merge.html
 advanced_report_builder/templates/advanced_report_builder/datatables/modal.html
 advanced_report_builder/templates/advanced_report_builder/datatables/onclick_menu.html
-advanced_report_builder/templates/advanced_report_builder/datatables/query_modal.html
 advanced_report_builder/templates/advanced_report_builder/datatables/report.html
 advanced_report_builder/templates/advanced_report_builder/datatables/select_pivot.html
 advanced_report_builder/templates/advanced_report_builder/datatables/fields/modal.html
@@ -149,6 +149,9 @@ advanced_report_builder/views/datatables/__init__.py
 advanced_report_builder/views/datatables/datatables.py
 advanced_report_builder/views/datatables/modal.py
 advanced_report_builder/views/datatables/utils.py
+advanced_report_builder/views/query_modal/__init__.py
+advanced_report_builder/views/query_modal/mixin.py
+advanced_report_builder/views/query_modal/modal.py
 advanced_report_builder/views/targets/__init__.py
 advanced_report_builder/views/targets/utils.py
 advanced_report_builder/views/targets/views.py

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

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