django-advanced-report-builder 0.7.5__tar.gz → 0.7.7__tar.gz

{django-advanced-report-builder-0.7.5/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.7.7}/PKG-INFO

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

@@ -151,7 +151,7 @@ class ReportBuilderFieldUtils:
                     previous_base_model=None, selected_field_id=None, for_select2=False,
                     pivot_fields=None, allow_annotations_fields=True, field_types=None,
                     column_types=None, search_string=None, show_order_by_fields=False, extra_fields=None,
-                    must_have_django_field=False):
+                    must_have_django_field=False, allow_pivots=True):
         if title is None:
             title = report_builder_class.title
         if colour is None:
@@ -198,7 +198,7 @@ class ReportBuilderFieldUtils:
                                                    'label': full_title,
                                                    'colour': colour})
 
-        if not for_select2 and pivot_fields is not None:
+        if allow_pivots and not for_select2 and pivot_fields is not None:
             for pivot_code, pivot_field in report_builder_class.pivot_fields.items():
                 full_id = prefix + pivot_code
                 full_title = title_prefix + pivot_field['title']
@@ -209,6 +209,9 @@ class ReportBuilderFieldUtils:
 
         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:
@@ -230,7 +233,8 @@ class ReportBuilderFieldUtils:
                                  field_types=field_types,
                                  column_types=column_types,
                                  search_string=search_string,
-                                 show_order_by_fields=show_order_by_fields)
+                                 show_order_by_fields=show_order_by_fields,
+                                 allow_pivots=local_allow_pivots)
 
     @staticmethod
     def _is_search_match(search_string, title):

{django-advanced-report-builder-0.7.5 → django-advanced-report-builder-0.7.7}/advanced_report_builder/templates/advanced_report_builder/datatables/fields/modal.html

@@ -3,7 +3,6 @@
 {% block javascript %}
 <script>
 function save_modal_{{ form.form_id }}() {
-    id_filter.save_query_builder();
     django_modal.process_commands_lock([{'function': 'post_modal'}]);
 }
 </script>

{django-advanced-report-builder-0.7.5 → django-advanced-report-builder-0.7.7}/advanced_report_builder/views/datatables/modal.py

@@ -230,6 +230,12 @@ class TableFieldForm(ChartBaseFieldForm):
             self.fields['is_icon'] = BooleanField(required=False, widget=RBToggle())
             if 'is_icon' in data_attr and data_attr['is_icon'] == '1':
                 self.fields['is_icon'].initial = True
+        elif self.col_type_override.annotations is not None:
+            self.fields['show_table_totals'] = BooleanField(required=False,
+                                                            widget=RBToggle(),
+                                                            label='Show totals')
+            if 'show_totals' in data_attr and data_attr['show_totals'] == '1':
+                self.fields['show_table_totals'].initial = True
         else:
             self.fields['annotation_label'] = BooleanField(required=False, widget=RBToggle())
             if 'annotation_label' in data_attr and data_attr['annotation_label'] == '1':
@@ -278,6 +284,10 @@ class TableFieldForm(ChartBaseFieldForm):
                 attributes.append(f'link_html-{b64_link_html}')
             if self.cleaned_data['is_icon'] and self.cleaned_data["is_icon"]:
                 attributes.append('is_icon-1')
+
+        elif self.col_type_override.annotations is not None:
+            if self.cleaned_data['show_table_totals']:
+                attributes.append('show_totals-1')
         else:
             if self.cleaned_data['annotation_label'] and self.cleaned_data["annotation_label"]:
                 attributes.append('annotation_label-1')

{django-advanced-report-builder-0.7.5 → django-advanced-report-builder-0.7.7}/advanced_report_builder/views/datatables/utils.py

@@ -62,6 +62,7 @@ class TableUtilsMixin(ReportUtilsMixin):
 
     @staticmethod
     def get_link_field(table_field, fields, col_type_override):
+        field_name = table_field['field']
         col_type_override.table = None
         field = copy.deepcopy(col_type_override)
         data_attr = split_attr(table_field)
@@ -87,6 +88,8 @@ class TableUtilsMixin(ReportUtilsMixin):
             field.title = table_field['title']
         fields.append(field)
 
+        return field_name
+
     def process_query_results(self, report_builder_class, table, base_model,
                               fields_used, table_fields, pivot_fields=None):
         first_field_name = None
@@ -170,9 +173,9 @@ class TableUtilsMixin(ReportUtilsMixin):
                                                        decimal_places=decimal_places)
 
             elif isinstance(col_type_override, LINK_COLUMNS):
-                self.get_link_field(table_field=table_field,
-                                    col_type_override=col_type_override,
-                                    fields=fields)
+                field_name = self.get_link_field(table_field=table_field,
+                                                 col_type_override=col_type_override,
+                                                 fields=fields)
             else:
                 if col_type_override is not None:
                     if data_attr.get('annotation_label') == '1':
@@ -189,6 +192,15 @@ class TableUtilsMixin(ReportUtilsMixin):
                     if show_total == '1':
                         totals[field_name] = {'sum': 'to_fixed', 'decimal_places': 2,
                                               'css_class': css_class}
+                elif col_type_override.annotations is not None:
+                    css_class = col_type_override.column_defs.get('className')
+                    show_total = data_attr.get('show_totals')
+                    if show_total == '1':
+                        self.set_annotation_total(totals=totals,
+                                                  field_name=field_name,
+                                                  col_type_override=col_type_override,
+                                                  decimal_places=2,
+                                                  css_class=css_class)
                 if field_attr:
                     field = (field, field_attr)
                 fields.append(field)
@@ -217,7 +229,6 @@ class TableUtilsMixin(ReportUtilsMixin):
                                      filter_title=pivot_field_details['title'],
                                      **pivot_field_details['kwargs'])
                 table.show_pivot_table = True
-
         if totals:
             totals[first_field_name] = {'text': 'Totals'}
             table.add_plugin(self.column_totals_class, totals)

{django-advanced-report-builder-0.7.5 → django-advanced-report-builder-0.7.7}/advanced_report_builder/views/report_utils_mixin.py

@@ -162,3 +162,6 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
     # noinspection PyUnusedLocal,PyMethodMayBeStatic
     def set_number_total(self, totals, field_name, col_type_override, decimal_places, css_class):
         totals[field_name] = {'sum': 'to_fixed', 'decimal_places': decimal_places, 'css_class': css_class}
+
+    def set_annotation_total(self, totals, field_name, col_type_override, decimal_places, css_class):
+        return self.set_number_total(totals, field_name, col_type_override, decimal_places, css_class)

{django-advanced-report-builder-0.7.5 → django-advanced-report-builder-0.7.7/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.7.5
+Version: 0.7.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-0.7.5 → django-advanced-report-builder-0.7.7}/setup.py

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