django-advanced-report-builder 0.1.6__tar.gz → 0.1.8__tar.gz

{django-advanced-report-builder-0.1.6/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.1.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.1.6
+Version: 0.1.8
 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.1.6 → django-advanced-report-builder-0.1.8}/advanced_report_builder/data_merge/utils.py

@@ -6,7 +6,8 @@ from advanced_report_builder.utils import get_field_details
 
 
 def get_menu_fields(base_model, report_builder_class,
-                    menus=None, codes=None, code_prefix='', previous_base_model=None, table=None):
+                    menus=None, codes=None, code_prefix='', next_code_prefix='__',
+                    previous_base_model=None, table=None):
 
     for report_builder_field in report_builder_class.fields:
         django_field, col_type_override, columns, _ = get_field_details(base_model=base_model,
@@ -35,23 +36,18 @@ def get_menu_fields(base_model, report_builder_class,
                             report_builder_class=new_report_builder_class,
                             menus=menu,
                             codes=codes,
-                            code_prefix=f"{code_prefix}{include_field}__",
+                            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})
 
 
-def get_data_merge_columns(base_model, report_builder_class, html, table):
-    display_fields = set()
-    all_fields = set()
-
-    get_menu_fields(base_model=base_model,
-                    report_builder_class=report_builder_class,
-                    codes=display_fields)
-
+def get_data_merge_variables(html):
     variables = re.findall('{{\s*([^*\s*}}]+)\s*}}', html)
-    columns = set()
+
+    all_fields = set()
     for variable in variables:
         if '|' in variable:
             field = variable.split('|')[0]
@@ -69,7 +65,12 @@ def get_data_merge_columns(base_model, report_builder_class, html, table):
                 break
             if field not in ['', 'not', 'and' 'or'] and field[0] not in ['(', ')', '"', "'"]:
                 all_fields.add(field)
+    return all_fields
+
 
+def get_data_merge_columns(base_model, report_builder_class, html, table):
+    all_fields = get_data_merge_variables(html)
+    columns = set()
     column_map = {}
     for field in all_fields:
         django_field, col_type_override, _, _ = get_field_details(base_model=base_model,

{django-advanced-report-builder-0.1.6 → django-advanced-report-builder-0.1.8/django_advanced_report_builder.egg-info}/PKG-INFO

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

@@ -2,7 +2,6 @@ LICENSE
 MANIFEST.in
 README.md
 setup.py
-advanced_report_builder/.DS_Store
 advanced_report_builder/__init__.py
 advanced_report_builder/admin.py
 advanced_report_builder/apps.py

{django-advanced-report-builder-0.1.6 → django-advanced-report-builder-0.1.8}/setup.py

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