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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.7.9
+Version: 0.8.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.7.9 → django-advanced-report-builder-0.8.0}/advanced_report_builder/columns.py

@@ -26,19 +26,20 @@ class ReportBuilderDateColumn(ColumnBase):
 
 class ReportBuilderNumberColumn(ColumnBase):
 
-    def __init__(self, *,  decimal_places=0, **kwargs):
+    def __init__(self, *,  decimal_places=0, trim_zeros=True, **kwargs):
         if not self.initialise(locals()):
             return
         super().__init__(**kwargs)
         self.decimal_places = f'{{:.{decimal_places}f}}'
+        self.trim_zeros = trim_zeros
 
     def row_result(self, data, _page_data):
         number = data.get(self.field)
         if number is None:
             return ''
         else:
-            number = self.decimal_places.format(data[self.field])
-        if '.' in number:
+            number = self.decimal_places.format(number)
+        if self.trim_zeros and '.' in number:
             return number.rstrip('0').rstrip('.')
         else:
             return number

{django-advanced-report-builder-0.7.9 → django-advanced-report-builder-0.8.0}/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, allow_pivots=True):
+                    must_have_django_field=False, allow_pivots=True, include_mathematical_columns=False):
         if title is None:
             title = report_builder_class.title
         if colour is None:
@@ -236,6 +236,14 @@ class ReportBuilderFieldUtils:
                                  show_order_by_fields=show_order_by_fields,
                                  allow_pivots=local_allow_pivots)
 
+        if include_mathematical_columns:
+            fields.extend([{'colour': '#D4AF37', 'field': 'rb_addition', 'label': 'Maths: Addition Field'},
+                          {'colour': '#D4AF37', 'field': 'rb_subtraction', 'label': 'Maths: Subtraction Field'},
+                          {'colour': '#D4AF37', 'field': 'rb_times', 'label': 'Maths: Times Field'},
+                          {'colour': '#D4AF37', 'field': 'rb_division', 'label': 'Maths: Division Field'},
+                          {'colour': '#D4AF37', 'field': 'rb_percentage', 'label': 'Maths: Percentage Field'}]
+                          )
+
     @staticmethod
     def _is_search_match(search_string, title):
         if search_string is None:

{django-advanced-report-builder-0.7.9 → django-advanced-report-builder-0.8.0}/advanced_report_builder/globals.py

@@ -51,7 +51,6 @@ ANNOTATION_CHOICE_MINIMUM = 3
 ANNOTATION_CHOICE_COUNT = 4
 ANNOTATION_CHOICE_AVERAGE_SUM_FROM_COUNT = 5
 
-
 ANNOTATIONS_CHOICES = [(ANNOTATION_CHOICE_SUM, 'Sum'),
                        (ANNOTATION_CHOICE_MAXIMUM, 'Maximum'),
                        (ANNOTATION_CHOICE_MINIMUM, 'Minimum'),
@@ -64,6 +63,18 @@ ANNOTATION_FUNCTIONS = {ANNOTATION_CHOICE_SUM: Sum,
                         ANNOTATION_CHOICE_COUNT: Count,
                         ANNOTATION_CHOICE_AVERAGE_SUM_FROM_COUNT: Avg}
 
+ALIGNMENT_CHOICE_LEFT = 0
+ALIGNMENT_CHOICE_CENTRE = 1
+ALIGNMENT_CHOICE_RIGHT = 2
+
+ALIGNMENT_CHOICES = [(ALIGNMENT_CHOICE_LEFT, 'Left'),
+                     (ALIGNMENT_CHOICE_CENTRE, 'Centre'),
+                     (ALIGNMENT_CHOICE_RIGHT, 'Right')]
+
+ALIGNMENT_CLASS = {ALIGNMENT_CHOICE_LEFT: '',
+                   ALIGNMENT_CHOICE_CENTRE: 'dt-center',
+                   ALIGNMENT_CHOICE_RIGHT: 'dt-right'}
+
 DATE_FORMAT_TYPE_DD_MM_YY_SLASH = 1
 DATE_FORMAT_TYPE_DD_MM_YYYY_SLASH = 2
 DATE_FORMAT_TYPE_MM_DD_YY_SLASH = 3

{django-advanced-report-builder-0.7.9 → django-advanced-report-builder-0.8.0}/advanced_report_builder/templates/advanced_report_builder/charts/modal_field.html

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

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

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

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

@@ -371,7 +371,6 @@ class BarChartFieldModal(QueryBuilderModalBaseMixin, FormModal):
                           'val': _attr})
 
         self.add_command({'function': 'html', 'selector': f'#{selector} span', 'html': form.cleaned_data['title']})
-        self.add_command({'function': 'save_query_builder_id_filter'})
         self.add_command({'function': 'update_selection'})
         return self.command_response('close')
 
@@ -424,20 +423,7 @@ class BarChartBreakdownFieldForm(TableFieldForm):
 
 class BarChartBreakdownFieldModal(TableFieldModal):
     form_class = BarChartBreakdownFieldForm
-
-    def form_valid(self, form):
-        selector = self.slug['selector']
-
-        _attr = form.get_additional_attributes()
-        self.add_command({'function': 'set_attr',
-                          'selector': f'#{selector}',
-                          'attr': 'data-attr',
-                          'val': _attr})
-
-        self.add_command({'function': 'html', 'selector': f'#{selector} span', 'html': form.cleaned_data['title']})
-        self.add_command({'function': 'save_query_builder_id_filter'})
-        self.add_command({'function': 'breakdown_update_selection'})
-        return self.command_response('close')
+    update_selection_command = 'breakdown_update_selection'
 
 
 class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
@@ -481,10 +467,12 @@ class BarChartShowBreakdownModal(TableUtilsMixin, Modal):
 
         table_fields = bar_chart_report.breakdown_fields
         fields_used = set()
+        fields_map = {}
         self.process_query_results(report_builder_class=report_builder_class,
                                    table=table,
                                    base_model=base_model,
                                    fields_used=fields_used,
+                                   fields_map=fields_map,
                                    table_fields=table_fields)
         data_index = int(self.slug['data'])
         table_field = chart_fields[data_index]

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

@@ -2,7 +2,6 @@ import base64
 import json
 from datetime import timedelta, datetime
 
-from crispy_forms.bootstrap import StrictButton
 from date_offset.date_offset import DateOffset
 from dateutil.relativedelta import relativedelta
 from django.apps import apps
@@ -14,7 +13,6 @@ 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.forms import CrispyForm
 
 from advanced_report_builder.columns import ReportBuilderDateColumn
 from advanced_report_builder.exceptions import ReportError

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

@@ -5,7 +5,7 @@ from django_menus.menu import MenuItem
 
 from advanced_report_builder.columns import ArrowColumn
 from advanced_report_builder.exceptions import ReportError
-from advanced_report_builder.utils import make_slug_str, get_report_builder_class
+from advanced_report_builder.utils import get_report_builder_class
 from advanced_report_builder.utils import split_slug
 from advanced_report_builder.views.datatables.utils import TableUtilsMixin
 from advanced_report_builder.views.report import ReportBase
@@ -35,6 +35,7 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
 
         self.base_model = self.table_report.get_base_model()
         self.add_table(self.table_id, model=self.base_model)
+
         try:
             return super().dispatch(request, *args, **kwargs)
         except DatatableError as de:
@@ -48,12 +49,14 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
         table_fields = self.table_report.table_fields
         pivot_fields = self.table_report.pivot_fields
         fields_used = set()
+        fields_map = {}
         report_builder_class = get_report_builder_class(model=base_model,
                                                         report_type=self.table_report.report_type)
         self.process_query_results(report_builder_class=report_builder_class,
                                    table=table,
                                    base_model=base_model,
                                    fields_used=fields_used,
+                                   fields_map=fields_map,
                                    table_fields=table_fields,
                                    pivot_fields=pivot_fields)
 
@@ -61,6 +64,8 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
             order_by_field = self.table_report.order_by_field
             if order_by_field not in fields_used:
                 table.add_columns(f'.{order_by_field}')
+            elif order_by_field in fields_map:
+                order_by_field = fields_map[order_by_field]
             if self.table_report.order_by_ascending:
                 table.sort(order_by_field)
             else:
@@ -134,7 +139,6 @@ class TableView(ReportBase, TableUtilsMixin, DatatableView):
                 *self.duplicate_menu(request=self.request, report_id=chart_report_id)
                 ]
 
-
     def get_dashboard_class(self, report):
         pivot_fields = report.tablereport.pivot_fields
         if pivot_fields is not None and len(pivot_fields) > 0:

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

@@ -13,7 +13,7 @@ from django_modals.widgets.select2 import Select2Multiple
 from django_modals.widgets.widgets import Toggle
 
 from advanced_report_builder.globals import DATE_FIELDS, NUMBER_FIELDS, ANNOTATION_VALUE_CHOICES, ANNOTATIONS_CHOICES, \
-    DATE_FORMAT_TYPES, CURRENCY_COLUMNS, LINK_COLUMNS
+    DATE_FORMAT_TYPES, CURRENCY_COLUMNS, LINK_COLUMNS, ALIGNMENT_CHOICES
 from advanced_report_builder.models import TableReport, ReportType
 from advanced_report_builder.toggle import RBToggle
 from advanced_report_builder.utils import split_attr, encode_attribute, decode_attribute, get_report_builder_class
@@ -128,7 +128,8 @@ class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
                          fields=fields,
                          tables=tables,
                          report_builder_class=report_builder_class,
-                         pivot_fields=pivot_fields)
+                         pivot_fields=pivot_fields,
+                         include_mathematical_columns=True)
 
         self.add_command('report_fields', data=json.dumps({'fields': fields, 'tables': tables}))
         self.add_command('report_pivots', data=json.dumps({'pivot_fields': pivot_fields}))
@@ -159,6 +160,13 @@ class TableFieldForm(ChartBaseFieldForm):
         else:
             return super().submit_button(css_class, button_text, **kwargs)
 
+    def is_mathematical_field(self, data):
+        return self.django_field is None and data['field'] in ['rb_addition',
+                                                               'rb_subtraction',
+                                                               'rb_times',
+                                                               'rb_division',
+                                                               'rb_percentage']
+
     def setup_modal(self, *args, **kwargs):
         data = json.loads(base64.b64decode(self.slug['data']))
         report_type, base_model = self.get_report_type_details()
@@ -172,79 +180,235 @@ class TableFieldForm(ChartBaseFieldForm):
             self.fields['display_heading'].initial = True
 
         if self.django_field is not None and isinstance(self.django_field, DATE_FIELDS):
-            self.fields['annotations_value'] = ChoiceField(choices=[(0, '-----')] + ANNOTATION_VALUE_CHOICES,
-                                                           required=False)
-            if 'annotations_value' in data_attr:
-                self.fields['annotations_value'].initial = data_attr['annotations_value']
-            self.fields['date_format'] = ChoiceField(choices=[(0, '-----')] + DATE_FORMAT_TYPES, required=False)
-            if 'date_format' in data_attr:
-                self.fields['date_format'].initial = data_attr['date_format']
+            self.setup_date_fields(data_attr)
         elif self.django_field is not None and isinstance(self.django_field, NUMBER_FIELDS):
-            self.fields['annotations_type'] = ChoiceField(choices=[(0, '-----')] + ANNOTATIONS_CHOICES,
-                                                          required=False)
-            if 'annotations_type' in data_attr:
-                self.fields['annotations_type'].initial = data_attr['annotations_type']
-            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
-            self.fields['decimal_places'] = IntegerField()
-            self.fields['decimal_places'].initial = int(data_attr.get('decimal_places', 0))
-            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())
-
-            report_builder_class = get_report_builder_class(model=base_model,
-                                                            report_type=report_type)
-            fields = []
-            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)
-
-            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')
+            self.setup_number_fields(data_attr=data_attr,
+                                     base_model=base_model,
+                                     report_type=report_type)
         elif isinstance(self.col_type_override, CURRENCY_COLUMNS):
-            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
+            self.setup_currency_fields(data_attr=data_attr)
         elif isinstance(self.col_type_override, LINK_COLUMNS):
-            self.fields['link_html'] = CharField(required=False)
-            if 'link_html' in data_attr:
-                self.fields['link_html'].initial = decode_attribute(data_attr['link_html'])
-            self.fields['link_css'] = CharField(required=False)
-            if 'link_css' in data_attr:
-                self.fields['link_css'].initial = decode_attribute(data_attr['link_css'])
-            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
+            self.setup_link_fields(data_attr=data_attr)
         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
+            self.setup_annotation_fields(data_attr=data_attr)
+        elif self.is_mathematical_field(data=data):
+            self.setup_standard_mathematical_fields(data=data,
+                                                    data_attr=data_attr)
         else:
             self.fields['annotation_label'] = BooleanField(required=False, widget=RBToggle())
             if 'annotation_label' in data_attr and data_attr['annotation_label'] == '1':
                 self.fields['annotation_label'].initial = True
-
         super().setup_modal(*args, **kwargs)
 
+    def setup_annotation_fields(self, data_attr):
+        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
+
+    def setup_currency_fields(self, data_attr):
+        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
+
+    def setup_link_fields(self, data_attr):
+        self.fields['link_html'] = CharField(required=False)
+        if 'link_html' in data_attr:
+            self.fields['link_html'].initial = decode_attribute(data_attr['link_html'])
+        self.fields['link_css'] = CharField(required=False)
+        if 'link_css' in data_attr:
+            self.fields['link_css'].initial = decode_attribute(data_attr['link_css'])
+        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
+
+    def setup_date_fields(self, data_attr):
+        self.fields['annotations_value'] = ChoiceField(choices=[(0, '-----')] + ANNOTATION_VALUE_CHOICES,
+                                                       required=False)
+        if 'annotations_value' in data_attr:
+            self.fields['annotations_value'].initial = data_attr['annotations_value']
+        self.fields['date_format'] = ChoiceField(choices=[(0, '-----')] + DATE_FORMAT_TYPES, required=False)
+        if 'date_format' in data_attr:
+            self.fields['date_format'].initial = data_attr['date_format']
+
+    def setup_number_fields(self, data_attr, base_model, report_type):
+        self.fields['annotations_type'] = ChoiceField(choices=[(0, '-----')] + ANNOTATIONS_CHOICES,
+                                                      required=False)
+        if 'annotations_type' in data_attr:
+            self.fields['annotations_type'].initial = data_attr['annotations_type']
+
+        annotation_column_help_text = 'Not required however useful for mathematical columns.'
+        self.fields['annotation_column_id'] = CharField(required=False,
+                                                        help_text=annotation_column_help_text)
+        if 'annotation_column_id' in data_attr:
+            self.fields['annotation_column_id'].initial = decode_attribute(data_attr['annotation_column_id'])
+
+        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
+
+        self.fields['alignment'] = ChoiceField(choices=ALIGNMENT_CHOICES, required=False)
+        if 'alignment' in data_attr:
+            self.fields['alignment'].initial = data_attr['alignment']
+
+        self.fields['decimal_places'] = IntegerField()
+        self.fields['decimal_places'].initial = int(data_attr.get('decimal_places', 0))
+        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())
+
+        report_builder_class = get_report_builder_class(model=base_model,
+                                                        report_type=report_type)
+        fields = []
+        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)
+
+        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')
+
+    def setup_standard_mathematical_fields(self, data, data_attr):
+
+        self.fields['hidden'] = BooleanField(required=False, widget=RBToggle(), label='Hidden')
+        if int(data_attr.get('hidden', 0)) == 1:
+            self.fields['hidden'].initial = True
+
+        self.fields['column_id'] = CharField(required=False)
+        if 'column_id' in data_attr:
+            self.fields['column_id'].initial = decode_attribute(data_attr['column_id'])
+        if data['field'] in ['rb_division', 'rb_percentage']:
+            self.fields['numerator_column'] = CharField(required=False)
+            if 'numerator_column' in data_attr:
+                self.fields['numerator_column'].initial = decode_attribute(data_attr['numerator_column'])
+            self.fields['denominator_column'] = CharField(required=False)
+            if 'denominator_column' in data_attr:
+                self.fields['denominator_column'].initial = decode_attribute(data_attr['denominator_column'])
+        elif data['field'] == 'rb_times':
+            self.fields['multiplicand_column'] = CharField(required=False)
+            if 'multiplicand_column' in data_attr:
+                self.fields['multiplicand_column'].initial = decode_attribute(data_attr['multiplicand_column'])
+            self.fields['multiplier_column'] = CharField(required=False)
+            if 'multiplier_column' in data_attr:
+                self.fields['multiplier_column'].initial = decode_attribute(data_attr['multiplier_column'])
+        else:  # add and sub
+            self.fields['first_value_column'] = CharField(required=False)
+            if 'first_value_column' in data_attr:
+                self.fields['first_value_column'].initial = decode_attribute(data_attr['first_value_column'])
+            self.fields['second_value_column'] = CharField(required=False)
+            if 'second_value_column' in data_attr:
+                self.fields['second_value_column'].initial = decode_attribute(data_attr['second_value_column'])
+        self.fields['decimal_places'] = IntegerField()
+        self.fields['decimal_places'].initial = int(data_attr.get('decimal_places', 0))
+        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
+
+        self.fields['alignment'] = ChoiceField(choices=ALIGNMENT_CHOICES, required=False)
+        if 'alignment' in data_attr:
+            self.fields['alignment'].initial = data_attr['alignment']
+
+    def save_mathematical_fields(self, data, attributes):
+        if self.cleaned_data['hidden']:
+            attributes.append('hidden-1')
+
+        alignment = self.cleaned_data.get('alignment')
+        if alignment:
+            attributes.append(f'alignment-{alignment}')
+        if self.cleaned_data['column_id']:
+            b64_column_id = encode_attribute(self.cleaned_data['column_id'])
+            attributes.append(f'column_id-{b64_column_id}')
+        if data['field'] in ['rb_division', 'rb_percentage']:
+            if self.cleaned_data['numerator_column']:
+                b64_numerator_column = encode_attribute(self.cleaned_data['numerator_column'])
+                attributes.append(f'numerator_column-{b64_numerator_column}')
+            if self.cleaned_data['denominator_column']:
+                b64_denominator_column = encode_attribute(self.cleaned_data['denominator_column'])
+                attributes.append(f'denominator_column-{b64_denominator_column}')
+        elif data['field'] == 'rb_times':
+            if self.cleaned_data['multiplicand_column']:
+                b64_multiplicand_column = encode_attribute(self.cleaned_data['multiplicand_column'])
+                attributes.append(f'multiplicand_column-{b64_multiplicand_column}')
+            if self.cleaned_data['multiplier_column']:
+                b64_multiplier_column = encode_attribute(self.cleaned_data['multiplier_column'])
+                attributes.append(f'multiplier_column-{b64_multiplier_column}')
+        else:
+            if self.cleaned_data['first_value_column']:
+                b64_first_value_column = encode_attribute(self.cleaned_data['first_value_column'])
+                attributes.append(f'first_value_column-{b64_first_value_column}')
+            if self.cleaned_data['second_value_column']:
+                b64_second_value_column = encode_attribute(self.cleaned_data['second_value_column'])
+                attributes.append(f'second_value_column-{b64_second_value_column}')
+
+        attributes.append(f'decimal_places-{self.cleaned_data.get("decimal_places", 0)}')
+        if self.cleaned_data['show_table_totals']:
+            attributes.append('show_totals-1')
+
+    def save_number_fields(self, attributes):
+        alignment = self.cleaned_data.get('alignment')
+        if alignment:
+            attributes.append(f'alignment-{alignment}')
+        if int(self.cleaned_data['annotations_type']) != 0:
+            attributes.append(f'annotations_type-{self.cleaned_data["annotations_type"]}')
+        if self.cleaned_data['annotation_column_id']:
+            b64_annotation_column_id = encode_attribute(self.cleaned_data['annotation_column_id'])
+            attributes.append(f'annotation_column_id-{b64_annotation_column_id}')
+        if self.cleaned_data['show_table_totals']:
+            attributes.append('show_totals-1')
+        if self.cleaned_data['decimal_places'] > 0:
+            attributes.append(f'decimal_places-{self.cleaned_data["decimal_places"]}')
+        if self.cleaned_data['has_filter']:
+            attributes.append(f'has_filter-1')
+            if self.cleaned_data['filter']:
+                b64_filter = encode_attribute(self.cleaned_data['filter'])
+                attributes.append(f'filter-{b64_filter}')
+            if self.cleaned_data['multiple_columns']:
+                attributes.append('multiple_columns-1')
+                attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+
+    def save_date_fields(self, attributes):
+        if self.cleaned_data['annotations_value']:
+            attributes.append(f'annotations_value-{self.cleaned_data["annotations_value"]}')
+        if self.cleaned_data['date_format']:
+            attributes.append(f'date_format-{self.cleaned_data["date_format"]}')
+
+    def save_currency_fields(self, attributes):
+        if self.cleaned_data['show_table_totals']:
+            attributes.append('show_totals-1')
+
+    def save_link_fields(self, attributes):
+        if self.cleaned_data['link_css']:
+            b64_link_css = encode_attribute(self.cleaned_data['link_css'])
+            attributes.append(f'link_css-{b64_link_css}')
+        if self.cleaned_data['link_html']:
+            b64_link_html = encode_attribute(self.cleaned_data['link_html'])
+            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')
+
+    def save_annotations_fields(self, attributes):
+        if self.cleaned_data['show_table_totals']:
+            attributes.append('show_totals-1')
+
     def get_additional_attributes(self):
         attributes = []
+        data = json.loads(base64.b64decode(self.slug['data']))
         self.get_report_type_details()
 
         if self.cleaned_data['display_heading']:
@@ -253,41 +417,17 @@ class TableFieldForm(ChartBaseFieldForm):
             attributes.append('display_heading-0')
 
         if self.django_field is not None and isinstance(self.django_field, DATE_FIELDS):
-            if self.cleaned_data['annotations_value']:
-                attributes.append(f'annotations_value-{self.cleaned_data["annotations_value"]}')
-            if self.cleaned_data['date_format']:
-                attributes.append(f'date_format-{self.cleaned_data["date_format"]}')
+            self.save_date_fields(attributes=attributes)
         elif self.django_field is not None and isinstance(self.django_field, NUMBER_FIELDS):
-            if int(self.cleaned_data['annotations_type']) != 0:
-                attributes.append(f'annotations_type-{self.cleaned_data["annotations_type"]}')
-            if self.cleaned_data['show_table_totals']:
-                attributes.append('show_totals-1')
-            if self.cleaned_data['decimal_places'] > 0:
-                attributes.append(f'decimal_places-{self.cleaned_data["decimal_places"]}')
-            if self.cleaned_data['has_filter']:
-                attributes.append(f'has_filter-1')
-                if self.cleaned_data['filter']:
-                    b64_filter = encode_attribute(self.cleaned_data['filter'])
-                    attributes.append(f'filter-{b64_filter}')
-                if self.cleaned_data['multiple_columns']:
-                    attributes.append('multiple_columns-1')
-                    attributes.append(f'multiple_column_field-{self.cleaned_data["multiple_column_field"]}')
+            self.save_number_fields(attributes=attributes)
         elif isinstance(self.col_type_override, CURRENCY_COLUMNS):
-            if self.cleaned_data['show_table_totals']:
-                attributes.append('show_totals-1')
+            self.save_currency_fields(attributes=attributes)
         elif isinstance(self.col_type_override, LINK_COLUMNS):
-            if self.cleaned_data['link_css']:
-                b64_link_css = encode_attribute(self.cleaned_data['link_css'])
-                attributes.append(f'link_css-{b64_link_css}')
-            if self.cleaned_data['link_html']:
-                b64_link_html = encode_attribute(self.cleaned_data['link_html'])
-                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')
-
+            self.save_link_fields(attributes=attributes)
         elif self.col_type_override.annotations is not None:
-            if self.cleaned_data['show_table_totals']:
-                attributes.append('show_totals-1')
+            self.save_annotations_fields(attributes=attributes)
+        elif self.is_mathematical_field(data=data):
+            self.save_mathematical_fields(data=data, attributes=attributes)
         else:
             if self.cleaned_data['annotation_label'] and self.cleaned_data["annotation_label"]:
                 attributes.append('annotation_label-1')
@@ -303,6 +443,7 @@ class TableFieldModal(QueryBuilderModalBaseMixin, FormModal):
     template_name = 'advanced_report_builder/datatables/fields/modal.html'
     no_header_x = True
     helper_class = HorizontalNoEnterHelper
+    update_selection_command = 'update_selection'
 
     @property
     def modal_title(self):
@@ -319,7 +460,7 @@ class TableFieldModal(QueryBuilderModalBaseMixin, FormModal):
                           'val': _attr})
 
         self.add_command({'function': 'html', 'selector': f'#{selector} span', 'html': form.cleaned_data['title']})
-        self.add_command({'function': 'update_selection'})
+        self.add_command({'function': self.update_selection_command})
         return self.command_response('close')
 
     def form_setup(self, form, *_args, **_kwargs):
@@ -331,7 +472,7 @@ class TableFieldModal(QueryBuilderModalBaseMixin, FormModal):
                                                                        report_builder_class=report_builder_class)
         if django_field is not None and isinstance(django_field, NUMBER_FIELDS):
             form.add_trigger('annotations_type', 'onchange', [
-                {'selector': '#annotations_fields_div', 'values': {'': 'hide'}, 'default': 'show'}])
+                {'selector': '#annotations_fields_div', 'values': {'0': 'hide'}, 'default': 'show'}])
 
             form.add_trigger('has_filter', 'onchange', [
                 {'selector': '#filter_fields_div', 'values': {'checked': 'show'}, 'default': 'hide'}])
@@ -342,10 +483,12 @@ class TableFieldModal(QueryBuilderModalBaseMixin, FormModal):
 
             return ['title',
                     'display_heading',
-                    'annotations_type',
                     'show_table_totals',
                     'decimal_places',
-                    Div(FieldEx('has_filter',
+                    'alignment',
+                    'annotations_type',
+                    Div('annotation_column_id',
+                        FieldEx('has_filter',
                                 template='django_modals/fields/label_checkbox.html',
                                 field_class='col-6 input-group-sm'),
                         Div(
@@ -408,4 +551,3 @@ class TablePivotModal(QueryBuilderModalBaseMixin, FormModal):
 
         self.add_command({'function': 'update_pivot_selection'})
         return self.command_response('close')
-