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

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

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

@@ -3,8 +3,10 @@ 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,
@@ -131,6 +133,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(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='report_user_created_set'
+    )
+    user_updated = models.ForeignKey(
+        settings.AUTH_USER_MODEL,
+        on_delete=models.SET_NULL,
+        null=True,
+        blank=True,
+        related_name='report_user_updated_set'
+    )
 
     def __str__(self):
         return self.name
@@ -145,6 +161,12 @@ 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
@@ -155,7 +177,7 @@ class Report(TimeStampedModel):
         if self.instance_type is None:
             self.instance_type = self._meta.label_lower.split('.')[1]
         result = super().save(*args, **kwargs)
-        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        model_report_save.send(sender=self.__class__, instance=self, created=is_new, user=current_user)
         return result
 
     def get_base_model(self):
@@ -221,10 +243,10 @@ 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})
         result = super().save(*args, **kwargs)
-        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        self.report._current_user = getattr(self, '_current_user', None)  # this is to update the users
+        self.report.save()
         return result
 
     class Meta:
@@ -423,10 +445,10 @@ 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})
         result = super().save(*args, **kwargs)
-        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        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):
@@ -484,10 +506,10 @@ 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})
         result = super().save(*args, **kwargs)
-        model_report_save.send(sender=self.__class__, instance=self, created=is_new)
+        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):

{django-advanced-report-builder-0.9.1 → django-advanced-report-builder-0.9.3}/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.1 → django-advanced-report-builder-0.9.3}/advanced_report_builder/views/datatables/modal.py

@@ -181,9 +181,9 @@ class TableModal(MultiQueryModalMixin, QueryBuilderModalBase):
 
     def form_valid(self, form):
         org_id = self.object.pk if hasattr(self, 'object') else None
-        save_function = getattr(form, 'save', None)
-        if save_function:
-            save_function()
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
         self.post_save(created=org_id is None, form=form)
         if not self.response_commands:
             self.add_command('reload')
@@ -261,10 +261,6 @@ class TableFieldForm(ChartBaseFieldForm):
         if int(data_attr.get('display_heading', 1)) == 1:
             self.fields['display_heading'].initial = True
 
-        print('-------==========-')
-        print(self.django_field)
-        print(self.col_type_override)
-
         has_existing_annotations = self.col_type_override is not None and self.col_type_override.annotations is not None
 
         if self.django_field is not None and isinstance(self.django_field, DATE_FIELDS):

{django-advanced-report-builder-0.9.1 → django-advanced-report-builder-0.9.3}/advanced_report_builder/views/kanban.py

@@ -514,7 +514,12 @@ class KanbanModal(ModelFormModal):
                 o.save()
         return self.command_response('')
 
-    def post_save(self, created, form):
+    def form_valid(self, form):
+        org_id = self.object.pk if hasattr(self, 'object') else None
+        created=org_id is None
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
         if created:
             self.modal_redirect(
                 self.request.resolver_match.view_name,
@@ -524,7 +529,10 @@ class KanbanModal(ModelFormModal):
             url_name = getattr(settings, 'REPORT_BUILDER_DETAIL_URL_NAME', '')
             if url_name and self.slug.get('new'):
                 url = reverse(url_name, kwargs={'slug': self.object.slug})
-                self.command_response('redirect', url=url)
+                self.add_command('redirect', url=url)
+        if not self.response_commands:
+            self.add_command('reload')
+        return self.command_response()
 
 
 class KanbanLaneModal(QueryBuilderModalBase):
@@ -762,7 +770,9 @@ class KanbanLaneModal(QueryBuilderModalBase):
         return JsonResponse({'results': descriptions})
 
     def form_valid(self, form):
-        form.save()
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
         return self.command_response('reload')
 
 
@@ -781,6 +791,7 @@ class KanbanLaneDuplicateModal(Modal):
         kanban_report_lane.pk = None
         kanban_report_lane.name = f'Copy of {kanban_report_lane.name}'
         kanban_report_lane.order = None
+        kanban_report_lane._current_user = self.request.user
         kanban_report_lane.save()
         return self.command_response('reload')
 
@@ -818,7 +829,9 @@ class KanbanDescriptionModal(DataMergeUtils, QueryBuilderModalBase):
         return self.command_response(f'build_data_merge_menu_{field_auto_id}', data=json.dumps(menus))
 
     def form_valid(self, form):
-        form.save()
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
         return self.command_response('reload')
 
 
@@ -836,5 +849,6 @@ class KanbanDescriptionDuplicateModal(Modal):
         kanban_report_description = get_object_or_404(KanbanReportDescription, id=self.slug['pk'])
         kanban_report_description.pk = None
         kanban_report_description.name = f'Copy of {kanban_report_description.name}'
+        kanban_report_description._current_user = self.request.user
         kanban_report_description.save()
         return self.command_response('reload')

{django-advanced-report-builder-0.9.1 → django-advanced-report-builder-0.9.3}/advanced_report_builder/views/modals_base.py

@@ -195,6 +195,7 @@ class QueryBuilderModalBaseMixin(ReportBuilderFieldUtils):
         form.fields[field_name].widget.select_data = _fields
 
 
+
 class QueryBuilderModalBase(QueryBuilderModalBaseMixin, ModelFormModal):
     size = 'xl'
 
@@ -227,7 +228,10 @@ class QueryBuilderModalBase(QueryBuilderModalBaseMixin, ModelFormModal):
 
     def form_valid(self, form):
         org_id = self.object.id if hasattr(self, 'object') else None
-        chart_report = form.save()
+        chart_report = form.save(commit=False)
+        chart_report._current_user = self.request.user
+        chart_report.save()
+
         self.post_save(created=org_id is None, form=form)
         if not self.response_commands:
             url_name = getattr(settings, 'REPORT_BUILDER_DETAIL_URL_NAME', '')

{django-advanced-report-builder-0.9.1 → django-advanced-report-builder-0.9.3}/advanced_report_builder/views/query_modal/modal.py

@@ -196,6 +196,16 @@ class QueryModal(QueryBuilderModalBaseMixin, ModelFormModal):
                 o.save()
         return self.command_response('')
 
+    def form_valid(self, form):
+        org_id = self.object.pk if hasattr(self, 'object') else None
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
+        self.post_save(created=org_id is None, form=form)
+        if not self.response_commands:
+            self.add_command('reload')
+        return self.command_response()
+
 
 class OrderByFieldForm(ModelCrispyForm):
     class Meta:

{django-advanced-report-builder-0.9.1 → django-advanced-report-builder-0.9.3}/advanced_report_builder/views/single_values.py

@@ -366,22 +366,6 @@ class SingleValueModal(MultiQueryModalMixin, QueryBuilderModalBase):
                     'values': {SingleValueReport.SINGLE_VALUE_TYPE_PERCENT: 'show'},
                     'default': 'hide',
                 },
-                {
-                    'selector': '.btn-query-edit',
-                    'values': {
-                        SingleValueReport.SINGLE_VALUE_TYPE_PERCENT: 'hide',
-                        SingleValueReport.SINGLE_VALUE_TYPE_PERCENT_FROM_COUNT: 'hide',
-                    },
-                    'default': 'show',
-                },
-                {
-                    'selector': '.btn-query-numerator-edit',
-                    'values': {
-                        SingleValueReport.SINGLE_VALUE_TYPE_PERCENT: 'show',
-                        SingleValueReport.SINGLE_VALUE_TYPE_PERCENT_FROM_COUNT: 'show',
-                    },
-                    'default': 'hide',
-                },
                 {
                     'selector': 'label[for=id_field]',
                     'values': {
@@ -542,29 +526,43 @@ class SingleValueModal(MultiQueryModalMixin, QueryBuilderModalBase):
         )
         return self.command_response('report_fields', data=json.dumps({'fields': fields, 'tables': tables}))
 
-    def query_menu(self):
-        edit_numerator_query_js = get_query_js('edit_numerator_query', 'query_id')
-        description_edit_menu_items = super().query_menu()
-        description_edit_menu_items.append(
-            MenuItem(
-                edit_numerator_query_js.replace('"', '"'),
-                menu_display='Edit',
-                css_classes='btn btn-sm btn-outline-dark btn-query-numerator-edit',
-                font_awesome='fas fa-pencil',
-                link_type=MenuItem.HREF,
-                hide=True,
+    def button_add_query(self, **_kwargs):
+        single_value_type = _kwargs['single_value_type']
+        if (single_value_type == '' or
+                int(single_value_type) not in [SingleValueReport.SINGLE_VALUE_TYPE_COUNT,
+                                               SingleValueReport.SINGLE_VALUE_TYPE_PERCENT_FROM_COUNT, ]):
+            return super().button_add_query(**_kwargs)
+        else:
+            report_type = self.get_report_type(**_kwargs)
+            show_order_by = 1 if self.show_order_by else 0
+            url = reverse(
+                'advanced_report_builder:single_value_numerator_modal',
+                kwargs={'slug': f'report_id-{self.object.id}-report_type-{report_type}-show_order_by-{show_order_by}'},
             )
-        )
-        return description_edit_menu_items
+            return self.command_response('show_modal', modal=url)
+
+
+    def button_edit_query(self, **_kwargs):
+        single_value_type = _kwargs['single_value_type']
+        if (single_value_type == '' or
+                int(single_value_type) not in [SingleValueReport.SINGLE_VALUE_TYPE_COUNT,
+                                                SingleValueReport.SINGLE_VALUE_TYPE_PERCENT_FROM_COUNT,]):
+            return super().button_edit_query(**_kwargs)
+        else:
+            query_id = _kwargs['query_id'][1:]
+            report_type = self.get_report_type(**_kwargs)
+            url = reverse(
+                'advanced_report_builder:single_value_numerator_modal',
+                kwargs={'slug': f'pk-{query_id}-report_type-{report_type}'},
+            )
+            return self.command_response('show_modal', modal=url)
 
-    def button_edit_numerator_query(self, **_kwargs):
-        query_id = _kwargs['query_id'][1:]
-        report_type = self.get_report_type(**_kwargs)
-        url = reverse(
-            'advanced_report_builder:single_value_numerator_modal',
-            kwargs={'slug': f'pk-{query_id}-report_type-{report_type}'},
-        )
-        return self.command_response('show_modal', modal=url)
+
+    def form_valid(self, form):
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
+        return self.command_response('reload')
 
 
 class SingleValueShowBreakdownModal(TableUtilsMixin, Modal):
@@ -668,3 +666,14 @@ class QueryNumeratorModal(QueryBuilderModalBaseMixin, ModelFormModal):
 
     def get_report_type(self):
         return self.slug['report_type']
+
+    def form_valid(self, form):
+        org_id = self.object.pk if hasattr(self, 'object') else None
+        instance = form.save(commit=False)
+        instance._current_user = self.request.user
+        instance.save()
+        self.post_save(created=org_id is None, form=form)
+        if not self.response_commands:
+            self.add_command('reload')
+        return self.command_response()
+

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: django-advanced-report-builder
-Version: 0.9.1
+Version: 0.9.3
 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.1 → django-advanced-report-builder-0.9.3}/django_advanced_report_builder.egg-info/SOURCES.txt

@@ -41,6 +41,7 @@ advanced_report_builder/migrations/0011_auto_20230620_1449.py
 advanced_report_builder/migrations/0012_auto_20230718_1642.py
 advanced_report_builder/migrations/0013_reportqueryorder.py
 advanced_report_builder/migrations/0014_auto_20240706_2207.py
+advanced_report_builder/migrations/0015_report_user_created_report_user_updated.py
 advanced_report_builder/migrations/__init__.py
 advanced_report_builder/static/.DS_Store
 advanced_report_builder/static/advanced_report_builder/.DS_Store

{django-advanced-report-builder-0.9.1 → django-advanced-report-builder-0.9.3}/setup.py

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