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

{django-advanced-report-builder-0.7.9/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.7.9
+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.7.9 → django-advanced-report-builder-0.8.1}/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.1}/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.1}/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.1}/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.1}/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.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.7.9 → 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)
@@ -371,7 +404,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')
 
@@ -397,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')
@@ -424,20 +461,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 +505,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.1}/advanced_report_builder/views/charts_base.py

@@ -2,19 +2,20 @@ 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
 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.forms import CrispyForm
+from django_modals.widgets.select2 import Select2
 
 from advanced_report_builder.columns import ReportBuilderDateColumn
 from advanced_report_builder.exceptions import ReportError
@@ -201,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,
@@ -226,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,
@@ -237,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):
@@ -264,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()
@@ -379,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.7.9 → django-advanced-report-builder-0.8.1}/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: