mirror of
https://github.com/eitchtee/WYGIWYH.git
synced 2026-08-26 13:24:31 +02:00
feat(transactions): add htmx filter presets
This commit is contained in:
@@ -14,7 +14,7 @@ from apps.monthly_overview.utils.daily_spending_allowance import (
|
||||
calculate_daily_allowance_currency,
|
||||
)
|
||||
from apps.transactions.filters import TransactionsFilter
|
||||
from apps.transactions.models import Transaction
|
||||
from apps.transactions.models import FilterPreset, Transaction
|
||||
from apps.transactions.utils.calculations import (
|
||||
calculate_currency_totals,
|
||||
calculate_percentage_distribution,
|
||||
@@ -58,6 +58,8 @@ def monthly_overview(request, month: int, year: int):
|
||||
"previous_month": previous_month,
|
||||
"previous_year": previous_year,
|
||||
"filter": f,
|
||||
"filter_is_active": f.has_active_filters,
|
||||
"filter_presets": FilterPreset.objects.filter(owner=request.user),
|
||||
"order": order,
|
||||
"summary_tab": summary_tab,
|
||||
},
|
||||
|
||||
@@ -41,6 +41,12 @@ class MonthYearFilter(Filter):
|
||||
|
||||
|
||||
class TransactionsFilter(django_filters.FilterSet):
|
||||
default_filter_values = {
|
||||
"type": {"IN", "EX"},
|
||||
"is_paid": {"1", "0"},
|
||||
"mute_status": {"active", "muted"},
|
||||
}
|
||||
|
||||
description = django_filters.CharFilter(
|
||||
label=_("Content"),
|
||||
method=content_filter,
|
||||
@@ -217,6 +223,23 @@ class TransactionsFilter(django_filters.FilterSet):
|
||||
]
|
||||
self.form.fields["entities"].choices = custom_entity_choices + entity_choices
|
||||
|
||||
@property
|
||||
def has_active_filters(self):
|
||||
for name in self.base_filters:
|
||||
if hasattr(self.form.data, "getlist"):
|
||||
values = self.form.data.getlist(name)
|
||||
else:
|
||||
value = self.form.data.get(name)
|
||||
values = value if isinstance(value, (list, tuple)) else [value]
|
||||
|
||||
values = [str(value) for value in values if value not in (None, "")]
|
||||
if not values:
|
||||
continue
|
||||
if set(values) == self.default_filter_values.get(name):
|
||||
continue
|
||||
return True
|
||||
return False
|
||||
|
||||
@staticmethod
|
||||
def filter_category(queryset, name, value):
|
||||
if not value:
|
||||
|
||||
@@ -0,0 +1,183 @@
|
||||
from django.contrib.auth import get_user_model
|
||||
from django.test import TestCase, override_settings
|
||||
from django.urls import reverse
|
||||
|
||||
from apps.transactions.models import FilterPreset
|
||||
|
||||
|
||||
@override_settings(
|
||||
STORAGES={
|
||||
"default": {"BACKEND": "django.core.files.storage.FileSystemStorage"},
|
||||
"staticfiles": {
|
||||
"BACKEND": "django.contrib.staticfiles.storage.StaticFilesStorage"
|
||||
},
|
||||
},
|
||||
WHITENOISE_AUTOREFRESH=True,
|
||||
)
|
||||
class FilterPresetViewTests(TestCase):
|
||||
def setUp(self):
|
||||
user_model = get_user_model()
|
||||
self.user = user_model.objects.create_user(
|
||||
email="preset-owner@example.com", password="testpass123"
|
||||
)
|
||||
self.other_user = user_model.objects.create_user(
|
||||
email="other-user@example.com", password="testpass123"
|
||||
)
|
||||
self.client.force_login(self.user)
|
||||
self.preset = FilterPreset.objects.create(
|
||||
owner=self.user,
|
||||
name="Unpaid",
|
||||
parameters={"is_paid": ["0"], "type": ["IN", "EX"]},
|
||||
)
|
||||
|
||||
def test_create_stores_only_transaction_filter_fields(self):
|
||||
response = self.client.post(
|
||||
reverse("filter_preset_create"),
|
||||
{
|
||||
"name": "Account X Unpaid",
|
||||
"account": ["Account X"],
|
||||
"is_paid": ["0"],
|
||||
"order": "newer",
|
||||
},
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
|
||||
preset = FilterPreset.objects.get(
|
||||
owner=self.user, name="Account X Unpaid"
|
||||
)
|
||||
self.assertEqual(
|
||||
preset.parameters,
|
||||
{"account": ["Account X"], "is_paid": ["0"]},
|
||||
)
|
||||
self.assertContains(response, "Account X Unpaid")
|
||||
|
||||
def test_create_rejects_a_blank_name(self):
|
||||
response = self.client.post(
|
||||
reverse("filter_preset_create"),
|
||||
{"name": " ", "is_paid": ["0"]},
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 400)
|
||||
self.assertEqual(FilterPreset.objects.filter(owner=self.user).count(), 1)
|
||||
|
||||
def test_apply_returns_the_saved_filter_form_without_changing_the_url(self):
|
||||
response = self.client.get(
|
||||
reverse("filter_preset_apply", args=[self.preset.pk]),
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response, 'id="filter"')
|
||||
self.assertEqual(response.context["filter"].data.getlist("is_paid"), ["0"])
|
||||
self.assertEqual(
|
||||
response.context["filter"].data.getlist("type"), ["IN", "EX"]
|
||||
)
|
||||
self.assertNotIn("HX-Push-Url", response.headers)
|
||||
self.assertNotIn("HX-Replace-Url", response.headers)
|
||||
self.assertIs(response.context.get("filter_is_active"), True)
|
||||
self.assertContains(response, 'hx-swap-oob="outerHTML"')
|
||||
self.assertEqual(
|
||||
response.headers["HX-Trigger-After-Settle"],
|
||||
"updated",
|
||||
)
|
||||
|
||||
def test_clear_returns_the_default_filter_form_without_changing_the_url(self):
|
||||
response = self.client.get(
|
||||
"/transactions/filter/clear/",
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertContains(response, 'id="filter"')
|
||||
self.assertEqual(
|
||||
response.context["filter"].data.getlist("type"), ["IN", "EX"]
|
||||
)
|
||||
self.assertEqual(
|
||||
response.context["filter"].data.getlist("is_paid"), ["1", "0"]
|
||||
)
|
||||
self.assertNotIn("HX-Push-Url", response.headers)
|
||||
self.assertNotIn("HX-Replace-Url", response.headers)
|
||||
self.assertIs(response.context.get("filter_is_active"), False)
|
||||
self.assertContains(response, 'hx-swap-oob="outerHTML"')
|
||||
self.assertEqual(
|
||||
response.headers["HX-Trigger-After-Settle"],
|
||||
"updated",
|
||||
)
|
||||
|
||||
def test_other_users_cannot_apply_or_delete_a_preset(self):
|
||||
self.client.force_login(self.other_user)
|
||||
|
||||
apply_response = self.client.get(
|
||||
reverse("filter_preset_apply", args=[self.preset.pk]),
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
delete_response = self.client.post(
|
||||
reverse("filter_preset_delete", args=[self.preset.pk]),
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
|
||||
self.assertEqual(apply_response.status_code, 404)
|
||||
self.assertEqual(delete_response.status_code, 404)
|
||||
self.assertTrue(FilterPreset.objects.filter(pk=self.preset.pk).exists())
|
||||
|
||||
def test_delete_removes_the_current_users_preset(self):
|
||||
response = self.client.post(
|
||||
reverse("filter_preset_delete", args=[self.preset.pk]),
|
||||
HTTP_HX_REQUEST="true",
|
||||
)
|
||||
|
||||
self.assertEqual(response.status_code, 200)
|
||||
self.assertFalse(FilterPreset.objects.filter(pk=self.preset.pk).exists())
|
||||
self.assertNotContains(response, self.preset.name)
|
||||
|
||||
def test_all_transactions_page_only_offers_the_current_users_presets(self):
|
||||
FilterPreset.objects.create(
|
||||
owner=self.other_user,
|
||||
name="Other User Preset",
|
||||
parameters={"type": ["IN"]},
|
||||
)
|
||||
|
||||
response = self.client.get(reverse("transactions_all_index"))
|
||||
|
||||
self.assertContains(response, self.preset.name)
|
||||
self.assertNotContains(response, "Other User Preset")
|
||||
self.assertContains(response, 'id="filter-presets"')
|
||||
self.assertNotContains(response, 'href="./?')
|
||||
self.assertContains(
|
||||
response,
|
||||
reverse("filter_preset_apply", args=[self.preset.pk]),
|
||||
)
|
||||
|
||||
def test_all_transactions_page_marks_a_filtered_query_active(self):
|
||||
response = self.client.get(
|
||||
reverse("transactions_all_index"),
|
||||
{"type": ["IN", "EX"], "is_paid": ["0"]},
|
||||
)
|
||||
|
||||
self.assertIs(response.context["filter_is_active"], True)
|
||||
|
||||
def test_all_transactions_page_does_not_mark_default_query_active(self):
|
||||
response = self.client.get(
|
||||
reverse("transactions_all_index"),
|
||||
{
|
||||
"type": ["IN", "EX"],
|
||||
"is_paid": ["1", "0"],
|
||||
"mute_status": ["active", "muted"],
|
||||
},
|
||||
)
|
||||
|
||||
self.assertIs(response.context["filter_is_active"], False)
|
||||
|
||||
def test_monthly_page_renders_preset_controls(self):
|
||||
other_preset = FilterPreset.objects.create(
|
||||
owner=self.other_user,
|
||||
name="Other Monthly Preset",
|
||||
parameters={"type": ["IN"]},
|
||||
)
|
||||
response = self.client.get(reverse("monthly_overview", args=[8, 2026]))
|
||||
|
||||
self.assertContains(response, 'id="filter-presets"')
|
||||
self.assertNotContains(response, 'href="./?')
|
||||
self.assertContains(response, reverse("filter_preset_create"))
|
||||
self.assertNotContains(response, other_preset.name)
|
||||
@@ -6,6 +6,26 @@ urlpatterns = [
|
||||
path(
|
||||
"transactions/list/", views.transaction_all_list, name="transactions_all_list"
|
||||
),
|
||||
path(
|
||||
"transactions/filter-presets/create/",
|
||||
views.filter_preset_create,
|
||||
name="filter_preset_create",
|
||||
),
|
||||
path(
|
||||
"transactions/filter-presets/<int:preset_id>/apply/",
|
||||
views.filter_preset_apply,
|
||||
name="filter_preset_apply",
|
||||
),
|
||||
path(
|
||||
"transactions/filter-presets/<int:preset_id>/delete/",
|
||||
views.filter_preset_delete,
|
||||
name="filter_preset_delete",
|
||||
),
|
||||
path(
|
||||
"transactions/filter/clear/",
|
||||
views.transaction_filter_clear,
|
||||
name="transaction_filter_clear",
|
||||
),
|
||||
path(
|
||||
"transactions/trash/",
|
||||
views.transactions_trash_can_index,
|
||||
|
||||
@@ -11,7 +11,7 @@ from apps.transactions.forms import (
|
||||
TransactionForm,
|
||||
TransferForm,
|
||||
)
|
||||
from apps.transactions.models import Transaction, TransactionAttachment
|
||||
from apps.transactions.models import FilterPreset, Transaction, TransactionAttachment
|
||||
from apps.transactions.utils.calculations import (
|
||||
calculate_account_totals,
|
||||
calculate_currency_totals,
|
||||
@@ -23,7 +23,7 @@ from django.contrib import messages
|
||||
from django.contrib.auth.decorators import login_required
|
||||
from django.core.paginator import Paginator
|
||||
from django.db.models import Case, IntegerField, Q, Value, When
|
||||
from django.http import FileResponse, Http404, HttpResponse, JsonResponse
|
||||
from django.http import FileResponse, Http404, HttpResponse, JsonResponse, QueryDict
|
||||
from django.shortcuts import get_object_or_404, render
|
||||
from django.utils import timezone
|
||||
from django.utils.translation import gettext_lazy as _
|
||||
@@ -635,7 +635,92 @@ def transaction_all_index(request):
|
||||
return render(
|
||||
request,
|
||||
"transactions/pages/transactions.html",
|
||||
{"filter": f, "order": order, "summary_tab": summary_tab},
|
||||
{
|
||||
"filter": f,
|
||||
"filter_is_active": f.has_active_filters,
|
||||
"filter_presets": FilterPreset.objects.filter(owner=request.user),
|
||||
"order": order,
|
||||
"summary_tab": summary_tab,
|
||||
},
|
||||
)
|
||||
|
||||
|
||||
@only_htmx
|
||||
@login_required
|
||||
@require_http_methods(["POST"])
|
||||
def filter_preset_create(request):
|
||||
name = request.POST.get("name", "").strip()
|
||||
if not name or len(name) > 100:
|
||||
return HttpResponse(status=400)
|
||||
|
||||
parameters = {
|
||||
key: request.POST.getlist(key)
|
||||
for key in TransactionsFilter.base_filters
|
||||
if key in request.POST
|
||||
}
|
||||
FilterPreset.objects.create(
|
||||
owner=request.user,
|
||||
name=name,
|
||||
parameters=parameters,
|
||||
)
|
||||
return render(
|
||||
request,
|
||||
"transactions/fragments/filter_presets.html",
|
||||
{"filter_presets": FilterPreset.objects.filter(owner=request.user)},
|
||||
)
|
||||
|
||||
|
||||
@only_htmx
|
||||
@login_required
|
||||
@require_http_methods(["GET"])
|
||||
def filter_preset_apply(request, preset_id):
|
||||
preset = get_object_or_404(FilterPreset, pk=preset_id, owner=request.user)
|
||||
data = QueryDict(mutable=True)
|
||||
for key, values in preset.parameters.items():
|
||||
if key in TransactionsFilter.base_filters:
|
||||
data.setlist(key, values)
|
||||
|
||||
transaction_filter = TransactionsFilter(data)
|
||||
response = render(
|
||||
request,
|
||||
"transactions/fragments/filter_form.html",
|
||||
{
|
||||
"filter": transaction_filter,
|
||||
"filter_is_active": transaction_filter.has_active_filters,
|
||||
"swap_filter_indicator": True,
|
||||
},
|
||||
)
|
||||
response.headers["HX-Trigger-After-Settle"] = "updated"
|
||||
return response
|
||||
|
||||
|
||||
@only_htmx
|
||||
@login_required
|
||||
@require_http_methods(["GET"])
|
||||
def transaction_filter_clear(request):
|
||||
transaction_filter = TransactionsFilter(QueryDict())
|
||||
response = render(
|
||||
request,
|
||||
"transactions/fragments/filter_form.html",
|
||||
{
|
||||
"filter": transaction_filter,
|
||||
"filter_is_active": False,
|
||||
"swap_filter_indicator": True,
|
||||
},
|
||||
)
|
||||
response.headers["HX-Trigger-After-Settle"] = "updated"
|
||||
return response
|
||||
|
||||
|
||||
@only_htmx
|
||||
@login_required
|
||||
@require_http_methods(["POST"])
|
||||
def filter_preset_delete(request, preset_id):
|
||||
get_object_or_404(FilterPreset, pk=preset_id, owner=request.user).delete()
|
||||
return render(
|
||||
request,
|
||||
"transactions/fragments/filter_presets.html",
|
||||
{"filter_presets": FilterPreset.objects.filter(owner=request.user)},
|
||||
)
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user