django-advanced-report-builder 0.9.0__tar.gz → 0.9.1__tar.gz

{django-advanced-report-builder-0.9.0/django_advanced_report_builder.egg-info → django-advanced-report-builder-0.9.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.9.0
+Version: 0.9.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.9.0 → django-advanced-report-builder-0.9.1}/advanced_report_builder/globals.py

@@ -88,6 +88,7 @@ GENERATE_SERIES_INTERVALS = {
     ANNOTATION_VALUE_DAY: '1 day',
 }
 
+ANNOTATION_CHOICE_NA = 0
 ANNOTATION_CHOICE_SUM = 1
 ANNOTATION_CHOICE_MAXIMUM = 2
 ANNOTATION_CHOICE_MINIMUM = 3

{django-advanced-report-builder-0.9.0 → django-advanced-report-builder-0.9.1}/advanced_report_builder/models.py

@@ -16,6 +16,7 @@ from advanced_report_builder.globals import (
     ANNOTATION_CHOICE_COUNT,
     ANNOTATION_CHART_SCALE,
 )
+from advanced_report_builder.signals import model_report_save
 
 
 class Target(TimeStampedModel):
@@ -144,17 +145,18 @@ class Report(TimeStampedModel):
         return self.name
 
     def save(self, *args, **kwargs):
+        is_new = self.pk is None
         if self.version is not None:
             self.version += 1
-
         slug_alias = self.slug
         self.make_new_slug(obj=Report, allow_dashes=False, on_edit=True)
         if slug_alias != self.slug:
             self.slug_alias = slug_alias
-
         if self.instance_type is None:
             self.instance_type = self._meta.label_lower.split('.')[1]
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        return result
 
     def get_base_model(self):
         return self.report_type.content_type.model_class()
@@ -219,8 +221,11 @@ class ReportQuery(TimeStampedModel):
     order = models.PositiveSmallIntegerField()
 
     def save(self, *args, **kwargs):
+        is_new = self.pk is None
         self.set_order_field(extra_filters={'report': self.report})
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        return result
 
     class Meta:
         ordering = ['order']
@@ -418,8 +423,11 @@ class KanbanReportDescription(TimeStampedModel):
     order = models.PositiveSmallIntegerField()
 
     def save(self, *args, **kwargs):
+        is_new = self.pk is None
         self.set_order_field(extra_filters={'kanban_report': self.kanban_report})
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        return result
 
     def get_base_model(self):
         return self.report_type.content_type.model_class()
@@ -476,8 +484,11 @@ class KanbanReportLane(TimeStampedModel):
     query_data = models.JSONField(null=True, blank=True)
 
     def save(self, *args, **kwargs):
+        is_new = self.pk is None
         self.set_order_field(extra_filters={'kanban_report': self.kanban_report})
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        return result
 
     def get_base_model(self):
         return self.report_type.content_type.model_class()

django-advanced-report-builder-0.9.1/advanced_report_builder/signals.py

@@ -0,0 +1,3 @@
+from django.dispatch import Signal
+
+model_report_save = Signal()

{django-advanced-report-builder-0.9.0 → django-advanced-report-builder-0.9.1}/advanced_report_builder/views/charts_base.py

@@ -278,6 +278,7 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
 
                         self.get_number_field(
                             annotations_type=self.chart_report.axis_value_type,
+                            append_annotation_query=False,
                             index=f'{index}_{multiple_index}',
                             data_attr=data_attr,
                             table_field=table_field,
@@ -292,6 +293,7 @@ class ChartBaseView(ReportBase, ReportUtilsMixin, TemplateView):
                 else:
                     self.get_number_field(
                         annotations_type=self.chart_report.axis_value_type,
+                        append_annotation_query=False,
                         index=index,
                         data_attr=data_attr,
                         table_field=table_field,