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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.9.0
+Version: 0.9.2
 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.2}/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.2/advanced_report_builder/migrations/0015_report_user_created_report_user_updated.py

@@ -0,0 +1,26 @@
+# Generated by Django 5.0.7 on 2025-05-07 11:13
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('advanced_report_builder', '0014_auto_20240706_2207'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='report',
+            name='user_created',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='report_user_created_set', to=settings.AUTH_USER_MODEL),
+        ),
+        migrations.AddField(
+            model_name='report',
+            name='user_updated',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='report_user_updated_set', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

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

@@ -1,3 +1,4 @@
+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
@@ -16,6 +17,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):
@@ -130,6 +132,20 @@ class Report(TimeStampedModel):
     report_tags = models.ManyToManyField(ReportTag, blank=True)
     notes = models.TextField(null=True, blank=True)
     version = models.PositiveSmallIntegerField(default=0)
+    user_created = models.ForeignKey(
+        get_user_model(),
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='report_user_created_set'
+    )
+    user_updated = models.ForeignKey(
+        get_user_model(),
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='report_user_updated_set'
+    )
 
     def __str__(self):
         return self.name
@@ -144,17 +160,24 @@ class Report(TimeStampedModel):
         return self.name
 
     def save(self, *args, **kwargs):
+
+        current_user = getattr(self, '_current_user', None)
+        if current_user is not None and current_user.is_authenticated:
+            self.user_updated = current_user
+            if self.user_created is None:
+                self.user_created = current_user
+        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, user=current_user)
+        return result
 
     def get_base_model(self):
         return self.report_type.content_type.model_class()
@@ -220,7 +243,10 @@ class ReportQuery(TimeStampedModel):
 
     def save(self, *args, **kwargs):
         self.set_order_field(extra_filters={'report': self.report})
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        self.report._current_user = getattr(self, '_current_user', None)  # this is to update the users
+        self.report.save()
+        return result
 
     class Meta:
         ordering = ['order']
@@ -419,7 +445,10 @@ class KanbanReportDescription(TimeStampedModel):
 
     def save(self, *args, **kwargs):
         self.set_order_field(extra_filters={'kanban_report': self.kanban_report})
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        self.kanban_report._current_user = getattr(self, '_current_user', None)  # this is to update the users
+        self.kanban_report.save()
+        return result
 
     def get_base_model(self):
         return self.report_type.content_type.model_class()
@@ -477,7 +506,10 @@ class KanbanReportLane(TimeStampedModel):
 
     def save(self, *args, **kwargs):
         self.set_order_field(extra_filters={'kanban_report': self.kanban_report})
-        return super().save(*args, **kwargs)
+        result = super().save(*args, **kwargs)
+        self.kanban_report._current_user = getattr(self, '_current_user', None)  # this is to update the users
+        self.kanban_report.save()
+        return result
 
     def get_base_model(self):
         return self.report_type.content_type.model_class()

django-advanced-report-builder-0.9.2/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.2}/advanced_report_builder/variable_date.py

@@ -46,6 +46,13 @@ class VariableDate:
     RANGE_TYPE_NEXT_24_MONTHS = 41
     RANGE_TYPE_LAST_36_MONTHS = 42
     RANGE_TYPE_NEXT_36_MONTHS = 43
+
+    RANGE_TYPE_2_WEEKS_AGO = 44
+    RANGE_TYPE_3_WEEKS_AGO = 45
+    RANGE_TYPE_4_WEEKS_AGO = 46
+    RANGE_TYPE_5_WEEKS_AGO = 47
+    RANGE_TYPE_6_WEEKS_AGO = 48
+
     RANGE_TYPE_CHOICES = (
         (RANGE_TYPE_LAST_36_MONTHS, 'Last 36 months'),
         (RANGE_TYPE_LAST_24_MONTHS, 'Last 24 months'),
@@ -60,6 +67,12 @@ class VariableDate:
         (RANGE_TYPE_LAST_28_DAYS, 'Last 28 days'),
         (RANGE_TYPE_LAST_14_DAYS, 'Last 14 days'),
         (RANGE_TYPE_LAST_7_DAYS, 'Last 7 days'),
+        (RANGE_TYPE_6_WEEKS_AGO, '6 weeks ago'),
+        (RANGE_TYPE_5_WEEKS_AGO, '5 weeks ago'),
+        (RANGE_TYPE_4_WEEKS_AGO, '4 weeks ago'),
+        (RANGE_TYPE_3_WEEKS_AGO, '3 weeks ago'),
+        (RANGE_TYPE_2_WEEKS_AGO, '2 weeks ago'),
+
         (RANGE_TYPE_LAST_WEEK, 'Last week'),
         (RANGE_TYPE_YESTERDAY, 'Yesterday'),
         (RANGE_TYPE_TODAY, 'Today'),
@@ -90,6 +103,7 @@ class VariableDate:
 
     def get_variable_dates(self, range_type):
         today = date.today()
+        start_of_this_week = today - timedelta(days=today.weekday())
         if range_type == self.RANGE_TYPE_TODAY:
             start_date = today
             end_date = today + timedelta(days=1)
@@ -103,35 +117,55 @@ class VariableDate:
             end_date = start_date + timedelta(days=1)
             number_of_days = 1
         elif range_type == self.RANGE_TYPE_THIS_WEEK:  # This Week
-            start_date = today - timedelta(days=today.weekday())
+            start_date = start_of_this_week
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
         elif range_type == self.RANGE_TYPE_NEXT_WEEK:  # Next Week
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=7)
+            start_date = start_of_this_week + timedelta(days=7)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
         elif range_type == self.RANGE_TYPE_LAST_WEEK:  # Last Week
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=14)
+            start_date = start_of_this_week - timedelta(days=7)
+            end_date = start_date + timedelta(days=7)
+            number_of_days = 7
+        elif range_type == self.RANGE_TYPE_2_WEEKS_TIME:  # 2 Weeks Time
+            start_date = start_of_this_week + timedelta(days=14)
+            end_date = start_date + timedelta(days=7)
+            number_of_days = 7
+        elif range_type == self.RANGE_TYPE_2_WEEKS_AGO:  # 2 Weeks Ago
+            start_date = start_of_this_week - timedelta(days=14)
+            end_date = start_date + timedelta(days=7)
+            number_of_days = 7
+        elif range_type == self.RANGE_TYPE_3_WEEKS_TIME:  # 3 Weeks Time
+            start_date = start_of_this_week + timedelta(days=21)
+            end_date = start_date + timedelta(days=7)
+            number_of_days = 7
+        elif range_type == self.RANGE_TYPE_3_WEEKS_AGO:  # 3 Weeks Ago
+            start_date = start_of_this_week - timedelta(days=21)
+            end_date = start_date + timedelta(days=7)
+            number_of_days = 7
+        elif range_type == self.RANGE_TYPE_4_WEEKS_TIME:  # 4 Weeks Time
+            start_date = start_of_this_week + timedelta(days=28)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
-        elif range_type == self.RANGE_TYPE_2_WEEKS_TIME:  # 2 Week Time
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=14)
+        elif range_type == self.RANGE_TYPE_4_WEEKS_AGO:  # 4 Weeks Ago
+            start_date = start_of_this_week - timedelta(days=28)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
-        elif range_type == self.RANGE_TYPE_3_WEEKS_TIME:  # 3 Week Time
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=21)
+        elif range_type == self.RANGE_TYPE_5_WEEKS_TIME:  # 5 Weeks Time
+            start_date = start_of_this_week + timedelta(days=35)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
-        elif range_type == self.RANGE_TYPE_4_WEEKS_TIME:  # 4 Week Time
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=28)
+        elif range_type == self.RANGE_TYPE_5_WEEKS_AGO:  # 5 Weeks Ago
+            start_date = start_of_this_week - timedelta(days=35)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
-        elif range_type == self.RANGE_TYPE_5_WEEKS_TIME:  # 5 Week Time
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=35)
+        elif range_type == self.RANGE_TYPE_6_WEEKS_TIME:  # 6 Weeks Time
+            start_date = start_of_this_week + timedelta(days=42)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
-        elif range_type == self.RANGE_TYPE_6_WEEKS_TIME:  # 6 Week Time
-            start_date = today - timedelta(days=today.weekday()) + timedelta(days=42)
+        elif range_type == self.RANGE_TYPE_6_WEEKS_AGO:  # 6 Weeks Ago
+            start_date = start_of_this_week - timedelta(days=42)
             end_date = start_date + timedelta(days=7)
             number_of_days = 7
         elif range_type == self.RANGE_TYPE_THIS_MONTH:  # This Month
@@ -160,11 +194,7 @@ class VariableDate:
             start_date = today
             end_date = start_date + timedelta(days=14)
             number_of_days = 14
-        elif range_type == self.RANGE_TYPE_LAST_14_DAYS:  # Next 14 Days
-            start_date = today - timedelta(days=14)
-            end_date = today
-            number_of_days = 14
-        elif range_type == 13:  # Last 14 Days
+        elif range_type == self.RANGE_TYPE_LAST_14_DAYS:  # Last 14 Days
             start_date = today - timedelta(days=14)
             end_date = today
             number_of_days = 14

{django-advanced-report-builder-0.9.0 → django-advanced-report-builder-0.9.2}/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,