django-advanced-report-builder 0.8.0__tar.gz → 0.8.1__tar.gz

{django-advanced-report-builder-0.8.0/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.8.0
+Version: 0.8.1
 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.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/templates/advanced_report_builder/select_column.html

@@ -88,6 +88,7 @@
                     $({{ command_prefix }}table_field_keys).empty();
                     {{ command_prefix }}available_fields_data = {};
                     $.each(data['fields'], function (key, value) {
+
                         {{ command_prefix }}available_fields_data[value.field] = value;
                         $({{ command_prefix }}available_fields_id_name).append({{ command_prefix }}get_field_html(value.field, value.label, value.colour, ''));
                     });
@@ -189,7 +190,13 @@
                         let fields = JSON.parse($({{ command_prefix }}main_field).val())
                         $.each(fields, function (key, value) {
                             let field_data = {{ command_prefix }}available_fields_data[value.field];
-                            $({{ command_prefix }}selection_fields_id_name).append({{ command_prefix }}get_field_html(value.field, value.title, field_data.colour, value.data_attr));
+                            if(field_data == undefined) {
+                                $({{ command_prefix }}selection_fields_id_name).append({{ command_prefix }}get_field_html(value.field, value.title, '#D3D3D3'));
+                            }
+                            else
+                            {
+                                $({{ command_prefix }}selection_fields_id_name).append({{ command_prefix }}get_field_html(value.field, value.title, field_data.colour, value.data_attr));
+                            }
                         });
                     }
                 }

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/bar_charts.py

@@ -74,11 +74,18 @@ class BarChartView(ChartBaseView):
             date_format = DATE_FORMAT_TYPES_DJANGO_FORMAT[default_format_type]
         return date_format
 
-    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index):
-        negative_bar_colour = data_attr.get('negative_bar_colour') or '801C70'
-        positive_bar_colour = data_attr.get('positive_bar_colour') or '801C70'
-        negative_bar_colour = self.add_colour_offset(negative_bar_colour, multiple_index=multiple_index)
-        positive_bar_colour = self.add_colour_offset(positive_bar_colour, multiple_index=multiple_index)
+    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index, additional_options):
+        negative_bar_colour = None
+        positive_bar_colour = None
+        if additional_options is not None:
+            negative_bar_colour = additional_options.get('negative_colour')
+            positive_bar_colour = additional_options.get('positive_colour')
+        if negative_bar_colour is None or negative_bar_colour == '':
+            negative_bar_colour = data_attr.get('negative_bar_colour') or '801C70'
+            negative_bar_colour = self.add_colour_offset(negative_bar_colour, multiple_index=multiple_index)
+        if positive_bar_colour is None or positive_bar_colour == '':
+            positive_bar_colour = data_attr.get('positive_bar_colour') or '801C70'
+            positive_bar_colour = self.add_colour_offset(positive_bar_colour, multiple_index=multiple_index)
 
         options.update({'colours': {'negative': negative_bar_colour,
                                     'positive': positive_bar_colour}})
@@ -309,21 +316,36 @@ class BarChartFieldForm(ChartBaseFieldForm):
                 self.fields['filter'].initial = decode_attribute(data_attr['filter'])
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
-
+        self.fields['append_column_title'] = BooleanField(required=False, widget=RBToggle())
         report_builder_class = get_report_builder_class(model=base_model,
                                                         report_type=report_type)
 
-        fields = []
+        self.setup_colour_field(form_fields=self.fields,
+                                base_model=base_model,
+                                report_builder_class=report_builder_class,
+                                name='positive_colour_field',
+                                data_attr=data_attr)
+        self.setup_colour_field(form_fields=self.fields,
+                                base_model=base_model,
+                                report_builder_class=report_builder_class,
+                                name='negative_colour_field',
+                                data_attr=data_attr)
+
+        multiple_column_field = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
                                                    report_builder_class=report_builder_class,
-                                                   fields=fields)
-
-        self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)
+                                                   fields=multiple_column_field)
+        self.fields['multiple_column_field'] = ChoiceField(choices=multiple_column_field,
+                                                           required=False,
+                                                           widget=Select2())
 
         if data_attr.get('multiple_columns') == '1':
             self.fields['multiple_columns'].initial = True
             self.fields['multiple_column_field'].initial = data_attr.get('multiple_column_field')
 
+            if data_attr.get('append_column_title') == '1':
+                self.fields['append_column_title'].initial = True
+
         super().setup_modal(*args, **kwargs)
 
     def get_additional_attributes(self):
@@ -342,7 +364,18 @@ class BarChartFieldForm(ChartBaseFieldForm):
 
             if self.cleaned_data['multiple_columns']:
                 attributes.append('multiple_columns-1')
-                attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+
+                if self.cleaned_data["multiple_column_field"]:
+                    attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+
+                if self.cleaned_data['append_column_title']:
+                    attributes.append('append_column_title-1')
+
+                if self.cleaned_data["positive_colour_field"]:
+                    attributes.append(f'positive_colour_field-{self.cleaned_data["positive_colour_field"]}')
+
+                if self.cleaned_data["negative_colour_field"]:
+                    attributes.append(f'negative_colour_field-{self.cleaned_data["negative_colour_field"]}')
 
         if attributes:
             return '-'.join(attributes)
@@ -396,7 +429,12 @@ class BarChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
                                 template='django_modals/fields/label_checkbox.html',
                                 field_class='col-6 input-group-sm'),
                         Div(
+                            FieldEx('append_column_title',
+                                    template='django_modals/fields/label_checkbox.html',
+                                    field_class='col-6 input-group-sm'),
                             FieldEx('multiple_column_field'),
+                            FieldEx('positive_colour_field'),
+                            FieldEx('negative_colour_field'),
                             css_id='multiple_columns_fields_div'),
                         css_id='filter_fields_div'),
                     css_id='annotations_fields_div')

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/charts_base.py

@@ -8,11 +8,14 @@ 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.forms import ChoiceField
 from django.shortcuts import get_object_or_404
+from django.template.defaultfilters import title
 from django.utils.safestring import mark_safe
 from django.views.generic import TemplateView
 from django_datatables.datatables import DatatableTable
 from django_menus.menu import MenuItem
+from django_modals.widgets.select2 import Select2
 
 from advanced_report_builder.columns import ReportBuilderDateColumn
 from advanced_report_builder.exceptions import ReportError
@@ -199,23 +202,53 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
                 data_attr = split_attr(table_field)
                 if data_attr.get('multiple_columns') == '1':
                     query = self.extra_filters(query=table.model.objects)
+
                     multiple_column_field = data_attr.get('multiple_column_field')
+                    if multiple_column_field is None:
+                        return
                     report_builder_class = self._get_report_builder_class(base_model=base_model,
                                                                           field_str=multiple_column_field,
                                                                           report_builder_class=report_builder_class)
-                    _fields = report_builder_class.default_multiple_column_fields
+                    try:
+                        _fields = report_builder_class.default_multiple_column_fields
+                    except AttributeError:
+                        return
                     default_multiple_column_fields = [multiple_column_field + '__' + x for x in _fields]
                     order_by = f'{multiple_column_field}__{report_builder_class.default_multiple_pk}'
+                    positive_colour_field = self.get_field_path(
+                        field_name=data_attr.get('positive_colour_field'),
+                        base_model=base_model,
+                        report_builder_class=report_builder_class,
+                        table=table)
+                    if positive_colour_field is not None:
+                        default_multiple_column_fields.append(positive_colour_field)
+
+                    negative_colour_field = self.get_field_path(
+                        field_name=data_attr.get('negative_colour_field'),
+                        base_model=base_model,
+                        report_builder_class=report_builder_class,
+                        table=table)
+                    if negative_colour_field is not None:
+                        default_multiple_column_fields.append(negative_colour_field)
+
                     results = query.order_by(order_by).distinct(multiple_column_field).\
                         values(multiple_column_field, *default_multiple_column_fields)
 
                     for multiple_index, result in enumerate(results):
+
                         suffix = self._set_multiple_title(database_values=result,
                                                           value_prefix=multiple_column_field,
                                                           fields=_fields,
                                                           text=report_builder_class.default_multiple_column_text)
                         extra_filter = Q((multiple_column_field, result[multiple_column_field]))
 
+                        additional_options = {}
+                        if positive_colour_field is not None:
+                            additional_options['positive_colour'] = result[positive_colour_field]
+
+                        if negative_colour_field is not None:
+                            additional_options['negative_colour'] = result[negative_colour_field]
+
                         self.get_number_field(annotations_type=self.chart_report.axis_value_type,
                                               index=f'{index}_{multiple_index}',
                                               data_attr=data_attr,
@@ -224,7 +257,8 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
                                               col_type_override=col_type_override,
                                               extra_filter=extra_filter,
                                               title_suffix=suffix,
-                                              multiple_index=multiple_index)
+                                              multiple_index=multiple_index,
+                                              additional_options=additional_options)
 
                 else:
                     self.get_number_field(annotations_type=self.chart_report.axis_value_type,
@@ -235,6 +269,16 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
                                           col_type_override=col_type_override)
         return fields
 
+    def get_field_path(self, field_name, base_model, report_builder_class, table):
+        if field_name:
+            _, _, _, field_path = self.get_field_details(
+                base_model=base_model,
+                field=field_name,
+                report_builder_class=report_builder_class,
+                table=table)
+            return field_path
+        return None
+
     # noinspection PyUnresolvedReferences
     @staticmethod
     def add_colour_offset(colour, multiple_index):
@@ -262,6 +306,7 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
         self.table.extra_filters = self.extra_filters
         fields = self.process_query_results(base_model=base_model, table=self.table)
         self.table.add_columns(*fields)
+
         context['show_toolbar'] = self.show_toolbar
         context['datatable'] = self.table
         context['title'] = self.get_title()
@@ -377,3 +422,17 @@ class ChartBaseFieldForm(ReportBuilderFieldUtils, QueryBuilderForm):
                                                            prefix=f"{prefix}{include_field}__",
                                                            title_prefix=f"{title_prefix}{include['title']} --> ",
                                                            previous_base_model=base_model)
+
+    def setup_colour_field(self, form_fields, base_model, report_builder_class, name, data_attr, label=None):
+        colour_fields = []
+        self._get_colour_fields(base_model=base_model,
+                                report_builder_class=report_builder_class,
+                                fields=colour_fields)
+        dropdown_colour_fields = [['', '----']]
+        for colour_field in colour_fields:
+            dropdown_colour_fields.append([colour_field['id'], colour_field['text']])
+
+        form_fields[name] = ChoiceField(choices=dropdown_colour_fields, required=False, widget=Select2(), label=label)
+        if name in data_attr:
+            form_fields[name].initial = data_attr.get(name)
+

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/datatables/modal.py

@@ -281,6 +281,9 @@ class TableFieldForm(ChartBaseFieldForm):
         if data_attr.get('multiple_columns') == '1':
             self.fields['multiple_columns'].initial = True
             self.fields['multiple_column_field'].initial = data_attr.get('multiple_column_field')
+            if data_attr.get('append_column_title') == '1':
+                self.fields['append_column_title'].initial = True
+
 
     def setup_standard_mathematical_fields(self, data, data_attr):
 

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/funnel_charts.py

@@ -37,9 +37,13 @@ class FunnelChartView(ChartBaseView):
         context['funnel_chart_report'] = self.chart_report
         return context
 
-    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index):
-        funnel_colour = data_attr.get('funnel_colour') or '801C70'
-        funnel_colour = self.add_colour_offset(funnel_colour, multiple_index=multiple_index)
+    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index, additional_options):
+        funnel_colour = None
+        if additional_options is not None:
+            funnel_colour = additional_options.get('positive_colour')
+        if funnel_colour is None or funnel_colour == '':
+            funnel_colour = data_attr.get('funnel_colour') or '801C70'
+            funnel_colour = self.add_colour_offset(funnel_colour, multiple_index=multiple_index)
         options.update({'colour': funnel_colour})
 
     def edit_report_menu(self, request, chart_report_id, slug_str):
@@ -110,20 +114,29 @@ class FunnelChartFieldForm(ChartBaseFieldForm):
                 self.fields['filter'].initial = decode_attribute(data_attr['filter'])
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
+        self.fields['append_column_title'] = BooleanField(required=False, widget=RBToggle())
 
         report_builder_class = get_report_builder_class(model=base_model,
                                                         report_type=report_type)
-
-        fields = []
+        self.setup_colour_field(form_fields=self.fields,
+                                base_model=base_model,
+                                report_builder_class=report_builder_class,
+                                name='positive_colour_field',
+                                data_attr=data_attr,
+                                label='Funnel colour field')
+
+        multiple_column_field = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
                                                    report_builder_class=report_builder_class,
-                                                   fields=fields)
+                                                   fields=multiple_column_field)
 
-        self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)
 
+        self.fields['multiple_column_field'] = ChoiceField(choices=multiple_column_field, required=False)
         if data_attr.get('multiple_columns') == '1':
             self.fields['multiple_columns'].initial = True
             self.fields['multiple_column_field'].initial = data_attr.get('multiple_column_field')
+            if data_attr.get('append_column_title') == '1':
+                self.fields['append_column_title'].initial = True
 
         super().setup_modal(*args, **kwargs)
 
@@ -141,7 +154,11 @@ class FunnelChartFieldForm(ChartBaseFieldForm):
                 attributes.append(f'filter-{b64_filter}')
             if self.cleaned_data['multiple_columns']:
                 attributes.append('multiple_columns-1')
+                if self.cleaned_data["positive_colour_field"]:
+                    attributes.append(f'positive_colour_field-{self.cleaned_data["positive_colour_field"]}')
                 attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+                if self.cleaned_data['append_column_title']:
+                    attributes.append('append_column_title-1')
 
         if attributes:
             return '-'.join(attributes)
@@ -194,7 +211,11 @@ class FunnelChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
                                 template='django_modals/fields/label_checkbox.html',
                                 field_class='col-6 input-group-sm'),
                         Div(
+                            FieldEx('append_column_title',
+                                    template='django_modals/fields/label_checkbox.html',
+                                    field_class='col-6 input-group-sm'),
                             FieldEx('multiple_column_field'),
+                            FieldEx('positive_colour_field'),
                             css_id='multiple_columns_fields_div'),
                         css_id='filter_fields_div'),
                     css_id='annotations_fields_div')

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/line_charts.py

@@ -91,9 +91,13 @@ class LineChartView(ChartBaseView):
         context['line_chart_report'] = self.chart_report
         return context
 
-    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index):
-        line_colour = data_attr.get('line_colour') or '801C70'
-        line_colour = self.add_colour_offset(line_colour, multiple_index=multiple_index)
+    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index, additional_options):
+        line_colour = None
+        if additional_options is not None:
+            line_colour = additional_options.get('positive_colour')
+        if line_colour is None or line_colour == '':
+            line_colour = data_attr.get('line_colour') or '801C70'
+            line_colour = self.add_colour_offset(line_colour, multiple_index=multiple_index)
         options.update({'colour': line_colour})
 
     def edit_report_menu(self, request,  chart_report_id, slug_str):
@@ -207,26 +211,36 @@ class LineChartFieldForm(ChartBaseFieldForm):
 
         self.fields['has_filter'] = BooleanField(required=False, widget=RBToggle())
         self.fields['filter'] = CharField(required=False)
-
         if data_attr.get('has_filter') == '1':
             self.fields['has_filter'].initial = True
             if 'filter' in data_attr:
                 self.fields['filter'].initial = decode_attribute(data_attr['filter'])
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
+        self.fields['append_column_title'] = BooleanField(required=False, widget=RBToggle())
         report_builder_class = get_report_builder_class(model=base_model,
                                                         report_type=report_type)
-        fields = []
+
+        self.setup_colour_field(form_fields=self.fields,
+                                base_model=base_model,
+                                report_builder_class=report_builder_class,
+                                name='positive_colour_field',
+                                data_attr=data_attr,
+                                label='Line colour field')
+        multiple_column_field = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
                                                    report_builder_class=report_builder_class,
-                                                   fields=fields)
+                                                   fields=multiple_column_field)
 
-        self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)
+        self.fields['multiple_column_field'] = ChoiceField(choices=multiple_column_field, required=False)
 
         if data_attr.get('multiple_columns') == '1':
             self.fields['multiple_columns'].initial = True
             self.fields['multiple_column_field'].initial = data_attr.get('multiple_column_field')
 
+            if data_attr.get('append_column_title') == '1':
+                self.fields['append_column_title'].initial = True
+
         super().setup_modal(*args, **kwargs)
 
     def get_additional_attributes(self):
@@ -243,7 +257,11 @@ class LineChartFieldForm(ChartBaseFieldForm):
                 attributes.append(f'filter-{b64_filter}')
             if self.cleaned_data['multiple_columns']:
                 attributes.append('multiple_columns-1')
+                if self.cleaned_data["positive_colour_field"]:
+                    attributes.append(f'positive_colour_field-{self.cleaned_data["positive_colour_field"]}')
                 attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+                if self.cleaned_data['append_column_title']:
+                    attributes.append('append_column_title-1')
 
         if attributes:
             return '-'.join(attributes)
@@ -296,7 +314,11 @@ class LineChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
                                 template='django_modals/fields/label_checkbox.html',
                                 field_class='col-6 input-group-sm'),
                         Div(
+                            FieldEx('append_column_title',
+                                    template='django_modals/fields/label_checkbox.html',
+                                    field_class='col-6 input-group-sm'),
                             FieldEx('multiple_column_field'),
+                            FieldEx('positive_colour_field'),
                             css_id='multiple_columns_fields_div'),
                         css_id='filter_fields_div'),
                     css_id='annotations_fields_div')

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/pie_charts.py

@@ -35,9 +35,13 @@ class PieChartView(ChartBaseView):
         context['pie_chart_report'] = self.chart_report
         return context
 
-    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index):
-        pie_colour = data_attr.get('pie_colour') or '801C70'
-        pie_colour = self.add_colour_offset(pie_colour, multiple_index=multiple_index)
+    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index, additional_options):
+        pie_colour = None
+        if additional_options is not None:
+            pie_colour = additional_options.get('positive_colour')
+        if pie_colour is None or pie_colour == '':
+            pie_colour = data_attr.get('pie_colour') or '801C70'
+            pie_colour = self.add_colour_offset(pie_colour, multiple_index=multiple_index)
         options.update({'colour': pie_colour})
 
     def edit_report_menu(self, request, chart_report_id, slug_str):
@@ -109,18 +113,29 @@ class PieChartFieldForm(ChartBaseFieldForm):
                 self.fields['filter'].initial = decode_attribute(data_attr['filter'])
 
         self.fields['multiple_columns'] = BooleanField(required=False, widget=RBToggle())
+        self.fields['append_column_title'] = BooleanField(required=False, widget=RBToggle())
         report_builder_class = get_report_builder_class(model=base_model,
                                                         report_type=report_type)
-        fields = []
+
+        self.setup_colour_field(form_fields=self.fields,
+                                base_model=base_model,
+                                report_builder_class=report_builder_class,
+                                name='positive_colour_field',
+                                data_attr=data_attr,
+                                label='Pie colour field')
+
+        multiple_column_field = []
         self._get_query_builder_foreign_key_fields(base_model=base_model,
                                                    report_builder_class=report_builder_class,
-                                                   fields=fields)
+                                                   fields=multiple_column_field)
 
-        self.fields['multiple_column_field'] = ChoiceField(choices=fields, required=False)
+        self.fields['multiple_column_field'] = ChoiceField(choices=multiple_column_field, required=False)
 
         if data_attr.get('multiple_columns') == '1':
             self.fields['multiple_columns'].initial = True
             self.fields['multiple_column_field'].initial = data_attr.get('multiple_column_field')
+            if data_attr.get('append_column_title') == '1':
+                self.fields['append_column_title'].initial = True
 
         super().setup_modal(*args, **kwargs)
 
@@ -138,7 +153,11 @@ class PieChartFieldForm(ChartBaseFieldForm):
                 attributes.append(f'filter-{b64_filter}')
             if self.cleaned_data['multiple_columns']:
                 attributes.append('multiple_columns-1')
+                if self.cleaned_data["positive_colour_field"]:
+                    attributes.append(f'positive_colour_field-{self.cleaned_data["positive_colour_field"]}')
                 attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+                if self.cleaned_data['append_column_title']:
+                    attributes.append('append_column_title-1')
 
         if attributes:
             return '-'.join(attributes)
@@ -191,7 +210,11 @@ class PieChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
                                 template='django_modals/fields/label_checkbox.html',
                                 field_class='col-6 input-group-sm'),
                         Div(
+                            FieldEx('append_column_title',
+                                    template='django_modals/fields/label_checkbox.html',
+                                    field_class='col-6 input-group-sm'),
                             FieldEx('multiple_column_field'),
+                            FieldEx('positive_colour_field'),
                             css_id='multiple_columns_fields_div'),
                         css_id='filter_fields_div'),
                     css_id='annotations_fields_div')

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1}/advanced_report_builder/views/report_utils_mixin.py

@@ -21,7 +21,7 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
 
     def get_number_field(self, annotations_type, index, table_field, data_attr, fields, col_type_override,
                          extra_filter=None, title_suffix='', multiple_index=0, decimal_places=None,
-                         convert_currency_fields=False, totals=None, divider=None):
+                         convert_currency_fields=False, totals=None, divider=None, additional_options=None):
         field_name = table_field['field']
         alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', 0)))
         new_field_name = field_name
@@ -38,6 +38,8 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
 
         if int(data_attr.get('display_heading', 1)) == 0:
             title = ''
+        elif int(data_attr.get('append_column_title', 0)) == 0:
+            title = title_suffix
         else:
             title = title_suffix + ' ' + table_field.get('title')
         if col_type_override:
@@ -63,7 +65,8 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                     field.title = title
                 self.set_extra_number_field_kwargs(data_attr=data_attr,
                                                    options=field.options,
-                                                   multiple_index=multiple_index)
+                                                   multiple_index=multiple_index,
+                                                   additional_options=additional_options)
 
             elif annotations_type == ANNOTATION_CHOICE_COUNT:
                 new_field_name = self.get_new_annotation_field_name(annotations_type=annotations_type,
@@ -83,7 +86,8 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                 number_function_kwargs['options'] = {}
                 self.set_extra_number_field_kwargs(data_attr=data_attr,
                                                    options=number_function_kwargs['options'],
-                                                   multiple_index=multiple_index)
+                                                   multiple_index=multiple_index,
+                                                   additional_options=additional_options)
                 if annotation_filter:
                     function = function_type(raw_field_name, filter=annotation_filter)
                 else:
@@ -132,7 +136,8 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                     field.field = new_field_name
                     self.set_extra_number_field_kwargs(data_attr=data_attr,
                                                        options=field.options,
-                                                       multiple_index=multiple_index)
+                                                       multiple_index=multiple_index,
+                                                       additional_options=additional_options)
             fields.append(field)
         else:
             number_function_kwargs = {'title': title}
@@ -143,7 +148,8 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                 number_function_kwargs['options'] = {}
                 self.set_extra_number_field_kwargs(data_attr=data_attr,
                                                    options=number_function_kwargs['options'],
-                                                   multiple_index=multiple_index)
+                                                   multiple_index=multiple_index,
+                                                   additional_options=additional_options)
 
                 new_field_name = self.get_new_annotation_field_name(annotations_type=annotations_type,
                                                                     field_name=field_name,
@@ -185,7 +191,7 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
             return decode_attribute(annotation_column_id)
         return f'{annotations_type}_{field_name}_{index}'
 
-    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index):
+    def set_extra_number_field_kwargs(self, data_attr, options, multiple_index, additional_options):
         pass
 
     # noinspection PyUnusedLocal,PyMethodMayBeStatic

{django-advanced-report-builder-0.8.0 → django-advanced-report-builder-0.8.1/django_advanced_report_builder.egg-info}/PKG-INFO

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

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