django-advanced-report-builder 0.9.2__tar.gz → 0.9.4__tar.gz

{django-advanced-report-builder-0.9.2/django_advanced_report_builder.egg-info → django_advanced_report_builder-0.9.4}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.2
+Version: 0.9.4
 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
@@ -10,6 +10,21 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+Requires-Dist: django-filtered-datatables>=0.0.21
+Requires-Dist: django-ajax-helpers>=0.0.20
+Requires-Dist: django-nested-modals>=0.0.21
+Requires-Dist: time-stamped-model>=0.2.3
+Requires-Dist: date-offset>=0.0.2
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![PyPI version](https://badge.fury.io/py/django-advanced-report-builder.svg)](https://badge.fury.io/py/django-advanced-report-builder)
 

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4}/advanced_report_builder/models.py

@@ -1,11 +1,12 @@
-from django.contrib.auth import get_user_model
 from django.contrib.contenttypes.models import ContentType
 from django.db import models
 from django.utils.dates import MONTHS
 from django_datatables.columns import DatatableColumn, NoHeadingColumn, ManyToManyColumn
 from django_datatables.model_def import DatatableModel
-from time_stamped_model.models import TimeStampedModel
 from django_modals.model_fields.colour import ColourField
+from time_stamped_model.models import TimeStampedModel
+
+from django.conf import settings
 
 from advanced_report_builder.globals import (
     DISPLAY_OPTION_CHOICES,
@@ -133,14 +134,14 @@ class Report(TimeStampedModel):
     notes = models.TextField(null=True, blank=True)
     version = models.PositiveSmallIntegerField(default=0)
     user_created = models.ForeignKey(
-        get_user_model(),
+        settings.AUTH_USER_MODEL,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,
         related_name='report_user_created_set'
     )
     user_updated = models.ForeignKey(
-        get_user_model(),
+        settings.AUTH_USER_MODEL,
         on_delete=models.SET_NULL,
         null=True,
         blank=True,

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4}/advanced_report_builder/views/datatables/modal.py

@@ -31,7 +31,7 @@ from advanced_report_builder.globals import (
     REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_CHOICES,
     REVERSE_FOREIGN_KEY_DELIMITER_CHOICES,
     REVERSE_FOREIGN_KEY_ANNOTATION_DATE_CHOICES,
-    REVERSE_FOREIGN_KEY_ANNOTATION_DATE_ARRAY,
+    REVERSE_FOREIGN_KEY_ANNOTATION_DATE_ARRAY, ALIGNMENT_CHOICE_RIGHT,
 )
 from advanced_report_builder.models import TableReport, ReportType
 from advanced_report_builder.toggle import RBToggle
@@ -311,6 +311,8 @@ class TableFieldForm(ChartBaseFieldForm):
             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']
+            else:
+                self.fields['alignment'].initial = ALIGNMENT_CHOICE_RIGHT
 
         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)
@@ -324,6 +326,8 @@ class TableFieldForm(ChartBaseFieldForm):
         self.fields['alignment'] = ChoiceField(choices=ALIGNMENT_CHOICES, required=False)
         if 'alignment' in data_attr:
             self.fields['alignment'].initial = data_attr['alignment']
+        else:
+            self.fields['alignment'].initial = ALIGNMENT_CHOICE_RIGHT
         self.fields['has_filter'] = BooleanField(required=False, widget=RBToggle())
 
         self.fields['filter'] = CharField(required=False)
@@ -454,6 +458,8 @@ class TableFieldForm(ChartBaseFieldForm):
         self.fields['alignment'] = ChoiceField(choices=ALIGNMENT_CHOICES, required=False)
         if 'alignment' in data_attr:
             self.fields['alignment'].initial = data_attr['alignment']
+        else:
+            self.fields['alignment'].initial = ALIGNMENT_CHOICE_RIGHT
 
         self.fields['decimal_places'] = IntegerField()
         self.fields['decimal_places'].initial = int(data_attr.get('decimal_places', 0))
@@ -522,14 +528,15 @@ class TableFieldForm(ChartBaseFieldForm):
         self.fields['alignment'] = ChoiceField(choices=ALIGNMENT_CHOICES, required=False)
         if 'alignment' in data_attr:
             self.fields['alignment'].initial = data_attr['alignment']
+        else:
+            self.fields['alignment'].initial = ALIGNMENT_CHOICE_RIGHT
 
     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}')
+        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}')
@@ -561,8 +568,7 @@ class TableFieldForm(ChartBaseFieldForm):
 
     def save_number_fields(self, attributes):
         alignment = self.cleaned_data.get('alignment')
-        if alignment:
-            attributes.append(f'alignment-{alignment}')
+        attributes.append(f'alignment-{alignment}')
         if 'annotations_type' in self.cleaned_data and int(self.cleaned_data['annotations_type']) != 0:
             attributes.append(f'annotations_type-{self.cleaned_data["annotations_type"]}')
         elif 'append_annotation_query' in self.cleaned_data and self.cleaned_data['append_annotation_query']:
@@ -584,8 +590,7 @@ class TableFieldForm(ChartBaseFieldForm):
 
     def save_currency_fields(self, attributes):
         alignment = self.cleaned_data.get('alignment')
-        if alignment:
-            attributes.append(f'alignment-{alignment}')
+        attributes.append(f'alignment-{alignment}')
         if 'annotations_type' in self.cleaned_data and int(self.cleaned_data['annotations_type']) != 0:
             attributes.append(f'annotations_type-{self.cleaned_data["annotations_type"]}')
         elif 'append_annotation_query' in self.cleaned_data and self.cleaned_data['append_annotation_query']:

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4}/advanced_report_builder/views/datatables/utils.py

@@ -21,7 +21,7 @@ from advanced_report_builder.globals import (
     ALIGNMENT_CLASS,
     REVERSE_FOREIGN_KEY_DELIMITER_COMMA,
     REVERSE_FOREIGN_KEY_ANNOTATION_BOOLEAN_XOR,
-    DATE_FORMAT_TYPE_DD_MM_YY_SLASH, ANNOTATION_CHOICE_NA,
+    DATE_FORMAT_TYPE_DD_MM_YY_SLASH, ANNOTATION_CHOICE_NA, ALIGNMENT_CHOICE_RIGHT,
 )
 from advanced_report_builder.globals import (
     DATE_FORMAT_TYPES_DJANGO_FORMAT,
@@ -509,7 +509,7 @@ class TableUtilsMixin(ReportUtilsMixin):
         expression = ExpressionWrapper(NullIf(F(values[0]) * 100.00, 0) / F(values[1]), output_field=FloatField())
         decimal_places = data_attr.get('decimal_places', 2)
         field_attr['decimal_places'] = int(decimal_places)
-        alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', 0)))
+        alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', ALIGNMENT_CHOICE_RIGHT)))
         field_attr['options'] = {}
         field = table_field['field']
 
@@ -558,7 +558,7 @@ class TableUtilsMixin(ReportUtilsMixin):
         expression,
     ):
         decimal_places = data_attr.get('decimal_places', 2)
-        alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', 0)))
+        alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', ALIGNMENT_CHOICE_RIGHT)))
         field_attr['decimal_places'] = int(decimal_places)
         field_attr['options'] = {}
         field = table_field['field']

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4}/advanced_report_builder/views/query_modal/modal.py

@@ -207,9 +207,6 @@ class QueryModal(QueryBuilderModalBaseMixin, ModelFormModal):
         return self.command_response()
 
 
-
-
-
 class OrderByFieldForm(ModelCrispyForm):
     class Meta:
         model = ReportQueryOrder

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4}/advanced_report_builder/views/report_utils_mixin.py

@@ -12,12 +12,13 @@ from advanced_report_builder.columns import (
     ReportBuilderCurrencyColumn,
     ReportBuilderNumberColumn,
 )
+from advanced_report_builder.exceptions import ReportError
 from advanced_report_builder.field_utils import ReportBuilderFieldUtils
 from advanced_report_builder.filter_query import FilterQueryMixin
 from advanced_report_builder.globals import (
     ANNOTATION_FUNCTIONS,
     ANNOTATION_CHOICE_COUNT,
-    ALIGNMENT_CLASS, ANNOTATION_CHOICE_NA,
+    ALIGNMENT_CLASS, ANNOTATION_CHOICE_NA, ALIGNMENT_CHOICE_RIGHT,
 )
 from advanced_report_builder.utils import decode_attribute
 
@@ -46,11 +47,11 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
     ):
 
         field_name = table_field['field']
-        alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', 0)))
+        alignment_class = ALIGNMENT_CLASS.get(int(data_attr.get('alignment', ALIGNMENT_CHOICE_RIGHT)))
         new_field_name = field_name
         css_class = None
         annotation_filter = None
-        if annotations_type != 0 or append_annotation_query:
+        if annotations_type != ANNOTATION_CHOICE_NA or append_annotation_query:
             b64_filter = data_attr.get('filter')
             if b64_filter:
                 _filter = decode_attribute(b64_filter)
@@ -90,8 +91,13 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                     field.title = title
 
                 field = copy.deepcopy(field)
-                current_annotations = field.annotations[field_name].filter
-                if annotation_filter is not None and len(annotation_filter) > 0:
+
+                current_annotations = getattr(field.annotations[field_name], 'filter', None)
+                # assert False, field.annotations[field_name]
+                if current_annotations is None:
+                    raise ReportError(f'Sorry unable to annotate {field_name}. The query is to complex to modify.')
+                    # field.annotations[field_name].expression is where the query is!
+                elif annotation_filter is not None and len(annotation_filter) > 0:
                     new_annotations = current_annotations & annotation_filter
                     field.annotations[field_name].filter = new_annotations
                 new_field_name = f'{field_name}_{index}'
@@ -99,21 +105,7 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                 field.field = new_field_name
                 field_name = new_field_name
 
-            elif field.annotations and annotations_type == ANNOTATION_CHOICE_NA:
-                if not self.use_annotations:
-                    field.options['calculated'] = True
-                    field.aggregations = col_type_override.annotations
-                    field.annotations = []
-                if title:
-                    field.title = title
-                self.set_extra_number_field_kwargs(
-                    data_attr=data_attr,
-                    options=field.options,
-                    multiple_index=multiple_index,
-                    additional_options=additional_options,
-                )
-
-            elif annotations_type == ANNOTATION_CHOICE_COUNT:
+            if annotations_type == ANNOTATION_CHOICE_COUNT:
                 new_field_name = self.get_new_annotation_field_name(
                     annotations_type=annotations_type,
                     field_name=field_name,
@@ -150,17 +142,29 @@ class ReportUtilsMixin(ReportBuilderFieldUtils, FilterQueryMixin):
                 number_function_kwargs.update({'field': new_field_name, 'column_name': new_field_name})
                 field = self.number_field(**number_function_kwargs)
             else:
-
                 css_class = field.column_defs.get('className')
                 if css_class is None:
                     css_class = alignment_class
                 else:
                     css_class += ' ' + alignment_class
                 field.column_defs['className'] = css_class
-
                 if title:
                     field.title = title
-                if annotations_type != 0:
+                if field.annotations:
+                    if not self.use_annotations:
+                        field.options['calculated'] = True
+                        field.aggregations = col_type_override.annotations
+                        field.annotations = []
+                    if title:
+                        field.title = title
+
+                    self.set_extra_number_field_kwargs(
+                        data_attr=data_attr,
+                        options=field.options,
+                        multiple_index=multiple_index,
+                        additional_options=additional_options,
+                    )
+                elif annotations_type != ANNOTATION_CHOICE_NA:
                     new_field_name = self.get_new_annotation_field_name(
                         annotations_type=annotations_type,
                         field_name=field_name,

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4/django_advanced_report_builder.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: django-advanced-report-builder
-Version: 0.9.2
+Version: 0.9.4
 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
@@ -10,6 +10,21 @@ Classifier: Operating System :: OS Independent
 Requires-Python: >=3.6
 Description-Content-Type: text/markdown
 License-File: LICENSE
+Requires-Dist: Django>=3.2
+Requires-Dist: django-filtered-datatables>=0.0.21
+Requires-Dist: django-ajax-helpers>=0.0.20
+Requires-Dist: django-nested-modals>=0.0.21
+Requires-Dist: time-stamped-model>=0.2.3
+Requires-Dist: date-offset>=0.0.2
+Dynamic: author
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 [![PyPI version](https://badge.fury.io/py/django-advanced-report-builder.svg)](https://badge.fury.io/py/django-advanced-report-builder)
 

{django-advanced-report-builder-0.9.2 → django_advanced_report_builder-0.9.4}/setup.py

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