From ced7f3826e1357b052497f269220717ce12a0354 Mon Sep 17 00:00:00 2001 From: Asish Kumar Date: Thu, 12 Nov 2026 22:59:59 +0530 Subject: [PATCH 1/5] feat(transactions): keep filter preset dates relative to today Filter presets save the exact dates they were created with, so a preset for "from today" or "this month" goes stale the next day or month. The save dialog now offers "Keep dates relative to today". When ticked, the preset remembers the day it was saved (`FilterPreset.relative_to`) and, when applied, moves its dates forward by the time elapsed since: "Date from"/"Until" by days and the reference months by months. A preset saved with today as the start date always starts today, and one saved for the current reference month always shows the current month. - The option is only stored when the preset has a date filter. - Presets with relative dates show a clock icon in the presets menu. - Presets saved before this change, or without the option, keep their fixed dates. --- app/apps/transactions/filters.py | 31 +++++ .../0053_filterpreset_relative_to.py | 15 +++ app/apps/transactions/models.py | 3 + .../transactions/tests/test_filter_presets.py | 123 ++++++++++++++++++ app/apps/transactions/views/transactions.py | 13 ++ .../fragments/filter_actions.html | 14 ++ .../fragments/filter_presets.html | 4 + 7 files changed, 203 insertions(+) create mode 100644 app/apps/transactions/migrations/0053_filterpreset_relative_to.py diff --git a/app/apps/transactions/filters.py b/app/apps/transactions/filters.py index f25a5dd0..3237c120 100644 --- a/app/apps/transactions/filters.py +++ b/app/apps/transactions/filters.py @@ -1,3 +1,5 @@ +import datetime + import django_filters from apps.accounts.models import Account from apps.common.fields.month_year import MonthYearFormField @@ -13,6 +15,7 @@ from apps.transactions.models import ( ) from crispy_forms.helper import FormHelper from crispy_forms.layout import Column, Field, Layout, Row +from dateutil.relativedelta import relativedelta from django import forms from django.db.models import Q from django.utils.translation import gettext_lazy as _ @@ -46,6 +49,13 @@ class TransactionsFilter(django_filters.FilterSet): "is_paid": {"1", "0"}, "mute_status": {"active", "muted"}, } + # How each date filter moves when a preset keeps its dates relative to today + relative_date_units = { + "date_start": "days", + "date_end": "days", + "reference_date_start": "months", + "reference_date_end": "months", + } description = django_filters.CharFilter( label=_("Content"), @@ -240,6 +250,27 @@ class TransactionsFilter(django_filters.FilterSet): return True return False + def shift_dates(self, since, until): + """ + Move the date filters forward by the time elapsed between two dates. + + Dates move by days and reference months by months, so a preset saved + from today, or for the current month, keeps meaning that later on. + """ + elapsed = { + "days": (until - since).days, + "months": (until.year - since.year) * 12 + until.month - since.month, + } + + for name, unit in self.relative_date_units.items(): + try: + value = datetime.date.fromisoformat(self.form[name].data) + except (TypeError, ValueError): + continue + + shifted = value + relativedelta(**{unit: elapsed[unit]}) + self.data[name] = self.form.fields[name].widget.format_value(shifted) + @staticmethod def filter_category(queryset, name, value): if not value: diff --git a/app/apps/transactions/migrations/0053_filterpreset_relative_to.py b/app/apps/transactions/migrations/0053_filterpreset_relative_to.py new file mode 100644 index 00000000..352a8183 --- /dev/null +++ b/app/apps/transactions/migrations/0053_filterpreset_relative_to.py @@ -0,0 +1,15 @@ +from django.db import migrations, models + + +class Migration(migrations.Migration): + dependencies = [ + ("transactions", "0052_transfer_templates"), + ] + + operations = [ + migrations.AddField( + model_name="filterpreset", + name="relative_to", + field=models.DateField(blank=True, null=True), + ), + ] diff --git a/app/apps/transactions/models.py b/app/apps/transactions/models.py index e928b062..d1dc8a96 100644 --- a/app/apps/transactions/models.py +++ b/app/apps/transactions/models.py @@ -45,6 +45,9 @@ class FilterPreset(models.Model): ) name = models.CharField(max_length=100) parameters = models.JSONField(default=dict) + # When set, the saved dates are moved along with today when the preset is + # applied, keeping the distance they had to this date + relative_to = models.DateField(null=True, blank=True) class Meta: ordering = ["name", "id"] diff --git a/app/apps/transactions/tests/test_filter_presets.py b/app/apps/transactions/tests/test_filter_presets.py index 5742d851..451ff8b1 100644 --- a/app/apps/transactions/tests/test_filter_presets.py +++ b/app/apps/transactions/tests/test_filter_presets.py @@ -1,3 +1,6 @@ +import datetime +from unittest import mock + from django.contrib.auth import get_user_model from django.test import TestCase, override_settings from django.urls import reverse @@ -51,6 +54,53 @@ class FilterPresetViewTests(TestCase): ) self.assertContains(response, "Account X Unpaid") + def test_create_keeps_dates_relative_to_today_when_asked(self): + today = datetime.date(2026, 8, 20) + + with mock.patch("django.utils.timezone.localdate", return_value=today): + self.client.post( + reverse("filter_preset_create"), + { + "name": "Today", + "date_start": "20/08/2026", + "relative_dates": "true", + }, + HTTP_HX_REQUEST="true", + ) + + preset = FilterPreset.objects.get(owner=self.user, name="Today") + self.assertEqual(preset.relative_to, today) + self.assertEqual(preset.parameters, {"date_start": ["20/08/2026"]}) + + def test_create_keeps_dates_fixed_by_default(self): + self.client.post( + reverse("filter_preset_create"), + { + "name": "August", + "reference_date_start": "August 2026", + "relative_dates": "false", + }, + HTTP_HX_REQUEST="true", + ) + + preset = FilterPreset.objects.get(owner=self.user, name="August") + self.assertIsNone(preset.relative_to) + + def test_create_ignores_relative_dates_without_a_date_filter(self): + self.client.post( + reverse("filter_preset_create"), + { + "name": "Unpaid without dates", + "is_paid": ["0"], + "date_start": "", + "relative_dates": "true", + }, + HTTP_HX_REQUEST="true", + ) + + preset = FilterPreset.objects.get(owner=self.user, name="Unpaid without dates") + self.assertIsNone(preset.relative_to) + def test_create_rejects_a_blank_name(self): response = self.client.post( reverse("filter_preset_create"), @@ -82,6 +132,79 @@ class FilterPresetViewTests(TestCase): "updated", ) + def test_apply_moves_relative_dates_along_with_today(self): + self.user.settings.date_format = "d/m/Y" + self.user.settings.save() + preset = FilterPreset.objects.create( + owner=self.user, + name="Next days", + parameters={ + "date_start": ["20/08/2026"], + "date_end": ["31/08/2026"], + "reference_date_start": ["August 2026"], + "reference_date_end": ["September 2026"], + }, + relative_to=datetime.date(2026, 8, 20), + ) + + with mock.patch( + "django.utils.timezone.localdate", + return_value=datetime.date(2027, 1, 5), + ): + response = self.client.get( + reverse("filter_preset_apply", args=[preset.pk]), + HTTP_HX_REQUEST="true", + ) + + data = response.context["filter"].data + self.assertEqual(data["date_start"], "05/01/2027") + self.assertEqual(data["date_end"], "16/01/2027") + self.assertEqual(data["reference_date_start"], "January 2027") + self.assertEqual(data["reference_date_end"], "February 2027") + self.assertContains(response, 'data-value="2027-01-05"') + self.assertContains(response, 'data-value="2027-01-16"') + self.assertContains(response, 'data-value="2027-01-01"') + self.assertContains(response, 'data-value="2027-02-01"') + + def test_apply_keeps_fixed_dates_unchanged(self): + self.user.settings.date_format = "d/m/Y" + self.user.settings.save() + preset = FilterPreset.objects.create( + owner=self.user, + name="August", + parameters={ + "date_start": ["20/08/2026"], + "reference_date_start": ["August 2026"], + }, + ) + + with mock.patch( + "django.utils.timezone.localdate", + return_value=datetime.date(2027, 1, 5), + ): + response = self.client.get( + reverse("filter_preset_apply", args=[preset.pk]), + HTTP_HX_REQUEST="true", + ) + + data = response.context["filter"].data + self.assertEqual(data["date_start"], "20/08/2026") + self.assertEqual(data["reference_date_start"], "August 2026") + self.assertContains(response, 'data-value="2026-08-20"') + self.assertContains(response, 'data-value="2026-08-01"') + + def test_presets_with_relative_dates_are_marked_in_the_list(self): + FilterPreset.objects.create( + owner=self.user, + name="Today", + parameters={"date_start": ["20/08/2026"]}, + relative_to=datetime.date(2026, 8, 20), + ) + + response = self.client.get(reverse("transactions_all_index")) + + self.assertContains(response, "Dates relative to today", count=1) + def test_clear_returns_the_default_filter_form_without_changing_the_url(self): response = self.client.get( "/transactions/filter/clear/", diff --git a/app/apps/transactions/views/transactions.py b/app/apps/transactions/views/transactions.py index 9ca4e68d..55cc7cc5 100644 --- a/app/apps/transactions/views/transactions.py +++ b/app/apps/transactions/views/transactions.py @@ -713,10 +713,18 @@ def filter_preset_create(request): for key in TransactionsFilter.base_filters if key in request.POST } + has_dates = any( + any(parameters.get(key, [])) for key in TransactionsFilter.relative_date_units + ) + relative_to = None + if has_dates and request.POST.get("relative_dates") == "true": + relative_to = timezone.localdate(timezone.now()) + FilterPreset.objects.create( owner=request.user, name=name, parameters=parameters, + relative_to=relative_to, ) return render( request, @@ -736,6 +744,11 @@ def filter_preset_apply(request, preset_id): data.setlist(key, values) transaction_filter = TransactionsFilter(data) + if preset.relative_to: + transaction_filter.shift_dates( + since=preset.relative_to, until=timezone.localdate(timezone.now()) + ) + response = render( request, "transactions/fragments/filter_form.html", diff --git a/app/templates/transactions/fragments/filter_actions.html b/app/templates/transactions/fragments/filter_actions.html index b8463a92..53cae7f3 100644 --- a/app/templates/transactions/fragments/filter_actions.html +++ b/app/templates/transactions/fragments/filter_actions.html @@ -11,20 +11,32 @@ hx-target="#filter-presets" hx-swap="outerHTML"> + +