django-advanced-report-builder 1.0.5__tar.gz → 1.0.7__tar.gz

{django_advanced_report_builder-1.0.5/django_advanced_report_builder.egg-info → django_advanced_report_builder-1.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 1.0.5
+Version: 1.0.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

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7}/advanced_report_builder/data_merge/utils.py

@@ -17,6 +17,7 @@ class DataMergeUtils(ReportBuilderFieldUtils):
         next_code_prefix='__',
         previous_base_model=None,
         table=None,
+        show_includes=True,
     ):
         for report_builder_field in report_builder_class.fields:
             django_field, col_type_override, columns, _ = self.get_field_details(
@@ -27,36 +28,38 @@ class DataMergeUtils(ReportBuilderFieldUtils):
             )
             for column in columns:
                 full_id = code_prefix + column.column_name
-                if menus is not None:
-                    menus.append({'code': full_id, 'text': column.title})
-                if codes is not None:
-                    codes.add(full_id)
+                if column.title != '':
+                    if menus is not None:
+                        menus.append({'code': full_id, 'text': column.title})
+                    if codes is not None:
+                        codes.add(full_id)
+        if show_includes:
+            for include_field, include in report_builder_class.includes.items():
+                app_label, model, report_builder_fields_str = include['model'].split('.')
 
-        for include_field, include in report_builder_class.includes.items():
-            app_label, model, report_builder_fields_str = include['model'].split('.')
+                new_model = apps.get_model(app_label, model)
+                if new_model != previous_base_model:
+                    new_report_builder_class = get_report_builder_class(
+                        model=new_model, class_name=report_builder_fields_str
+                    )
 
-            new_model = apps.get_model(app_label, model)
-            if new_model != previous_base_model:
-                new_report_builder_class = get_report_builder_class(
-                    model=new_model, class_name=report_builder_fields_str
-                )
-
-                title = include.get('title')
-                if title is None or title == '':
-                    title = new_report_builder_class.title
-                menu = [] if menus is not None else None
-                self.get_menu_fields(
-                    base_model=new_model,
-                    report_builder_class=new_report_builder_class,
-                    menus=menu,
-                    codes=codes,
-                    code_prefix=f'{code_prefix}{include_field}{next_code_prefix}',
-                    next_code_prefix=next_code_prefix,
-                    previous_base_model=base_model,
-                    table=table,
-                )
-                if menus is not None:
-                    menus.append({'text': title, 'menu': menu})
+                    title = include.get('title')
+                    if title is None or title == '':
+                        title = new_report_builder_class.title
+                    menu = [] if menus is not None else None
+                    self.get_menu_fields(
+                        base_model=new_model,
+                        report_builder_class=new_report_builder_class,
+                        menus=menu,
+                        codes=codes,
+                        code_prefix=f'{code_prefix}{include_field}{next_code_prefix}',
+                        next_code_prefix=next_code_prefix,
+                        previous_base_model=base_model,
+                        table=table,
+                        show_includes=include.get('show_includes', True),
+                    )
+                    if menus is not None:
+                        menus.append({'text': title, 'menu': menu})
 
     @staticmethod
     def get_data_merge_variables(html):

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7}/advanced_report_builder/field_utils.py

@@ -219,6 +219,7 @@ class ReportBuilderFieldUtils:
         must_have_django_field=False,
         allow_pivots=True,
         include_mathematical_columns=False,
+        show_includes=True,
     ):
         if title is None:
             title = report_builder_class.title
@@ -283,38 +284,39 @@ class ReportBuilderFieldUtils:
                             'colour': colour,
                         }
                     )
+        if show_includes:
+            for include_field, include in report_builder_class.includes.items():
+                app_label, model, report_builder_fields_str = include['model'].split('.')
+                local_allow_pivots = allow_pivots
+                if local_allow_pivots and not include.get('allow_pivots', True):
+                    local_allow_pivots = False
 
-        for include_field, include in report_builder_class.includes.items():
-            app_label, model, report_builder_fields_str = include['model'].split('.')
-            local_allow_pivots = allow_pivots
-            if local_allow_pivots and not include.get('allow_pivots', True):
-                local_allow_pivots = False
-
-            new_model = apps.get_model(app_label, model)
-            if new_model != previous_base_model:
-                new_report_builder_class = get_report_builder_class(
-                    model=new_model, class_name=report_builder_fields_str
-                )
-                self._get_fields(
-                    base_model=new_model,
-                    fields=fields,
-                    report_builder_class=new_report_builder_class,
-                    tables=tables,
-                    prefix=f'{prefix}{include_field}__',
-                    title_prefix=f'{title_prefix}{include["title"]} -> ',
-                    title=include.get('title'),
-                    colour=include.get('colour'),
-                    previous_base_model=base_model,
-                    selected_field_id=selected_field_id,
-                    for_select2=for_select2,
-                    pivot_fields=pivot_fields,
-                    allow_annotations_fields=allow_annotations_fields,
-                    field_types=field_types,
-                    column_types=column_types,
-                    search_string=search_string,
-                    show_order_by_fields=show_order_by_fields,
-                    allow_pivots=local_allow_pivots,
-                )
+                new_model = apps.get_model(app_label, model)
+                if new_model != previous_base_model:
+                    new_report_builder_class = get_report_builder_class(
+                        model=new_model, class_name=report_builder_fields_str
+                    )
+                    self._get_fields(
+                        base_model=new_model,
+                        fields=fields,
+                        report_builder_class=new_report_builder_class,
+                        tables=tables,
+                        prefix=f'{prefix}{include_field}__',
+                        title_prefix=f'{title_prefix}{include["title"]} -> ',
+                        title=include.get('title'),
+                        colour=include.get('colour'),
+                        previous_base_model=base_model,
+                        selected_field_id=selected_field_id,
+                        for_select2=for_select2,
+                        pivot_fields=pivot_fields,
+                        allow_annotations_fields=allow_annotations_fields,
+                        field_types=field_types,
+                        column_types=column_types,
+                        search_string=search_string,
+                        show_order_by_fields=show_order_by_fields,
+                        allow_pivots=local_allow_pivots,
+                        show_includes=include.get('show_includes', True)
+                    )
 
         if include_mathematical_columns:
             fields.extend(

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7}/advanced_report_builder/views/dashboard.py

@@ -235,6 +235,9 @@ class DashboardReportModal(ModelFormModal):
                 },
             ],
         )
+        form.fields['name_override'].help_text = (f'Original report name "{self.object.report.name}".'
+                                                  f' Leave blank to keep this name.')
+
         if self.object.report.instance_type == 'calendarreport':
             view_type = self.object.report.calendarreport.get_view_type_display()
             choices = [(0, f'Default ({view_type})'), *CALENDAR_VIEW_TYPE_CHOICES]

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7}/advanced_report_builder/views/modals_base.py

@@ -50,6 +50,7 @@ class QueryBuilderModalBaseMixin(ReportBuilderFieldUtils):
         prefix='',
         title_prefix='',
         previous_base_model=None,
+        show_includes=True
     ):
         field_types = FieldTypes()
 
@@ -72,37 +73,40 @@ class QueryBuilderModalBaseMixin(ReportBuilderFieldUtils):
                         column=column,
                         prefix=prefix,
                     )
-        for include_field, include in report_builder_class.includes.items():
-            app_label, model, report_builder_fields_str = include['model'].split('.')
-            new_model = apps.get_model(app_label, model)
-            new_report_builder_class = get_report_builder_class(model=new_model, class_name=report_builder_fields_str)
-
-            if new_model != previous_base_model:
-                _foreign_key = getattr(base_model, include_field, None)
-
-                add_null_field = _foreign_key.field.null if hasattr(_foreign_key, 'field') else True
-
-                if add_null_field:
-                    field_types.get_foreign_key_null_field(
+        if show_includes:
+            for include_field, include in report_builder_class.includes.items():
+                app_label, model, report_builder_fields_str = include['model'].split('.')
+                new_model = apps.get_model(app_label, model)
+                new_report_builder_class = get_report_builder_class(model=new_model,
+                                                                    class_name=report_builder_fields_str)
+
+                if new_model != previous_base_model:
+                    _foreign_key = getattr(base_model, include_field, None)
+
+                    add_null_field = _foreign_key.field.null if hasattr(_foreign_key, 'field') else True
+
+                    if add_null_field:
+                        field_types.get_foreign_key_null_field(
+                            query_builder_filters=query_builder_filters,
+                            field=prefix + include_field,
+                            title=title_prefix + include['title'],
+                        )
+                    if isinstance(new_model(), AbstractUser):
+                        field_types.get_abstract_user_field(
+                            query_builder_filters=query_builder_filters,
+                            field=prefix + include_field,
+                            title=title_prefix + include['title'],
+                        )
+
+                    self._get_query_builder_fields(
+                        base_model=new_model,
                         query_builder_filters=query_builder_filters,
-                        field=prefix + include_field,
-                        title=title_prefix + include['title'],
+                        report_builder_class=new_report_builder_class,
+                        prefix=f'{prefix}{include_field}__',
+                        title_prefix=f'{include["title"]} --> ',
+                        previous_base_model=base_model,
+                        show_includes=include.get('show_includes', True),
                     )
-                if isinstance(new_model(), AbstractUser):
-                    field_types.get_abstract_user_field(
-                        query_builder_filters=query_builder_filters,
-                        field=prefix + include_field,
-                        title=title_prefix + include['title'],
-                    )
-
-                self._get_query_builder_fields(
-                    base_model=new_model,
-                    query_builder_filters=query_builder_filters,
-                    report_builder_class=new_report_builder_class,
-                    prefix=f'{prefix}{include_field}__',
-                    title_prefix=f'{include["title"]} --> ',
-                    previous_base_model=base_model,
-                )
 
     def ajax_get_fields(self, **kwargs):
         report_type_id = kwargs['report_type']

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7}/advanced_report_builder/views/report_utils_mixin.py

@@ -63,6 +63,8 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
 
         if int(data_attr.get('display_heading', 1)) == 0:
             title = ''
+        elif title_suffix == '':
+            title = table_field.get('title')
         elif int(data_attr.get('append_column_title', 0)) == 0:
             title = title_suffix
         else:

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 1.0.5
+Version: 1.0.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

{django_advanced_report_builder-1.0.5 → django_advanced_report_builder-1.0.7}/setup.py

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