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

{django-advanced-report-builder-0.7.8/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.8
+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.8 → 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.8 → django-advanced-report-builder-0.8.0}/advanced_report_builder/data_merge/utils.py

@@ -52,7 +52,7 @@ class DataMergeUtils(ReportBuilderFieldUtils):
 
     @staticmethod
     def get_data_merge_variables(html):
-        variables = re.findall('{{\s*([^*\s*}}]+)\s*}}', html)
+        variables = re.findall(r'{{\s*([^*\s*}}]+)\s*}}', html)
 
         all_fields = set()
         for variable in variables:
@@ -64,7 +64,7 @@ class DataMergeUtils(ReportBuilderFieldUtils):
                 field = variable
             all_fields.add(field)
 
-        variables = re.findall('{%\s*(if|elif|with)\s([^%}]+)\s*%}', html)
+        variables = re.findall(r'{%\s*(if|elif|with)\s([^%}]+)\s*%}', html)
 
         for variable in variables:
             for field in variable[1].split(' '):

{django-advanced-report-builder-0.7.8 → 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.8 → 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.8 → 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.8 → 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.8 → 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.8 → 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.8 → 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: