From 0fc8b0ee4977ef00f004e3990ce8621ac63dec1d Mon Sep 17 00:00:00 2001 From: Herculino Trotta Date: Sun, 5 Jan 2025 01:35:25 -0300 Subject: [PATCH] feat(tags): add tab to show archived tags --- app/apps/transactions/urls.py | 2 + app/apps/transactions/views/tags.py | 24 +++++++++++ app/templates/tags/fragments/list.html | 55 ++++++------------------- app/templates/tags/fragments/table.html | 55 +++++++++++++++++++++++++ app/templates/tags/pages/index.html | 2 +- 5 files changed, 94 insertions(+), 44 deletions(-) create mode 100644 app/templates/tags/fragments/table.html diff --git a/app/apps/transactions/urls.py b/app/apps/transactions/urls.py index 09ec2a5..6c1c4b8 100644 --- a/app/apps/transactions/urls.py +++ b/app/apps/transactions/urls.py @@ -53,6 +53,8 @@ urlpatterns = [ ), path("tags/", views.tags_index, name="tags_index"), path("tags/list/", views.tags_list, name="tags_list"), + path("tags/table/active/", views.tags_table_active, name="tags_table_active"), + path("tags/table/archived/", views.tags_table_archived, name="tags_table_archived"), path("tags/add/", views.tag_add, name="tag_add"), path( "tags//edit/", diff --git a/app/apps/transactions/views/tags.py b/app/apps/transactions/views/tags.py index 9ba06ba..354208b 100644 --- a/app/apps/transactions/views/tags.py +++ b/app/apps/transactions/views/tags.py @@ -32,6 +32,30 @@ def tags_list(request): ) +@only_htmx +@login_required +@require_http_methods(["GET"]) +def tags_table_active(request): + tags = TransactionTag.objects.filter(active=True).order_by("id") + return render( + request, + "tags/fragments/table.html", + {"tags": tags, "active": True}, + ) + + +@only_htmx +@login_required +@require_http_methods(["GET"]) +def tags_table_archived(request): + tags = TransactionTag.objects.filter(active=False).order_by("id") + return render( + request, + "tags/fragments/table.html", + {"tags": tags, "active": False}, + ) + + @only_htmx @login_required @require_http_methods(["GET", "POST"]) diff --git a/app/templates/tags/fragments/list.html b/app/templates/tags/fragments/list.html index 61355e9..82850ed 100644 --- a/app/templates/tags/fragments/list.html +++ b/app/templates/tags/fragments/list.html @@ -15,49 +15,18 @@
-
- {% if tags %} - - - - - - - - - - {% for tag in tags %} - - - - - {% endfor %} - -
{% translate 'Name' %}
-
- - - -
-
{{ tag.name }}
- {% else %} - - {% endif %} +
+ +
+
+
diff --git a/app/templates/tags/fragments/table.html b/app/templates/tags/fragments/table.html new file mode 100644 index 0000000..cc874ee --- /dev/null +++ b/app/templates/tags/fragments/table.html @@ -0,0 +1,55 @@ +{% load i18n %} +{% if active %} +
+{% else %} +
+{% endif %} +
+ {% if tags %} + + + + + + + + + + {% for tag in tags %} + + + + + {% endfor %} + +
{% translate 'Name' %}
+
+ + + +
+
{{ tag.name }}
+ {% else %} + + {% endif %} +
+
diff --git a/app/templates/tags/pages/index.html b/app/templates/tags/pages/index.html index a8fce6b..1729636 100644 --- a/app/templates/tags/pages/index.html +++ b/app/templates/tags/pages/index.html @@ -4,5 +4,5 @@ {% block title %}{% translate 'Tags' %}{% endblock %} {% block content %} -
+
{% endblock %}