diff --git a/app/apps/transactions/urls.py b/app/apps/transactions/urls.py index f0402ea..844adad 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/", @@ -66,6 +68,16 @@ urlpatterns = [ ), path("entities/", views.entities_index, name="entities_index"), path("entities/list/", views.entities_list, name="entities_list"), + path( + "entities/table/active/", + views.entities_table_active, + name="entities_table_active", + ), + path( + "entities/table/archived/", + views.entities_table_archived, + name="entities_table_archived", + ), path("entities/add/", views.entity_add, name="entity_add"), path( "entities//edit/", @@ -79,6 +91,16 @@ urlpatterns = [ ), path("categories/", views.categories_index, name="categories_index"), path("categories/list/", views.categories_list, name="categories_list"), + path( + "categories/table/active/", + views.categories_table_active, + name="categories_table_active", + ), + path( + "categories/table/archived/", + views.categories_table_archived, + name="categories_table_archived", + ), path("categories/add/", views.category_add, name="category_add"), path( "categories//edit/", diff --git a/app/apps/transactions/views/categories.py b/app/apps/transactions/views/categories.py index 4c6975a..1f6fea5 100644 --- a/app/apps/transactions/views/categories.py +++ b/app/apps/transactions/views/categories.py @@ -25,11 +25,33 @@ def categories_index(request): @login_required @require_http_methods(["GET"]) def categories_list(request): - categories = TransactionCategory.objects.all().order_by("id") return render( request, "categories/fragments/list.html", - {"categories": categories}, + ) + + +@only_htmx +@login_required +@require_http_methods(["GET"]) +def categories_table_active(request): + categories = TransactionCategory.objects.filter(active=True).order_by("id") + return render( + request, + "categories/fragments/table.html", + {"categories": categories, "active": True}, + ) + + +@only_htmx +@login_required +@require_http_methods(["GET"]) +def categories_table_archived(request): + categories = TransactionCategory.objects.filter(active=False).order_by("id") + return render( + request, + "categories/fragments/table.html", + {"categories": categories, "active": False}, ) diff --git a/app/apps/transactions/views/entities.py b/app/apps/transactions/views/entities.py index 2faed7a..8252642 100644 --- a/app/apps/transactions/views/entities.py +++ b/app/apps/transactions/views/entities.py @@ -24,11 +24,33 @@ def entities_index(request): @login_required @require_http_methods(["GET"]) def entities_list(request): - entities = TransactionEntity.objects.all().order_by("id") return render( request, "entities/fragments/list.html", - {"entities": entities}, + ) + + +@only_htmx +@login_required +@require_http_methods(["GET"]) +def entities_table_active(request): + entities = TransactionEntity.objects.filter(active=True).order_by("id") + return render( + request, + "entities/fragments/table.html", + {"entities": entities, "active": True}, + ) + + +@only_htmx +@login_required +@require_http_methods(["GET"]) +def entities_table_archived(request): + entities = TransactionEntity.objects.filter(active=False).order_by("id") + return render( + request, + "entities/fragments/table.html", + {"entities": entities, "active": False}, ) diff --git a/app/apps/transactions/views/tags.py b/app/apps/transactions/views/tags.py index 9ba06ba..fdc66da 100644 --- a/app/apps/transactions/views/tags.py +++ b/app/apps/transactions/views/tags.py @@ -24,11 +24,33 @@ def tags_index(request): @login_required @require_http_methods(["GET"]) def tags_list(request): - tags = TransactionTag.objects.all().order_by("id") return render( request, "tags/fragments/list.html", - {"tags": tags}, + ) + + +@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}, ) diff --git a/app/templates/categories/fragments/list.html b/app/templates/categories/fragments/list.html index f14ba09..0318259 100644 --- a/app/templates/categories/fragments/list.html +++ b/app/templates/categories/fragments/list.html @@ -15,53 +15,18 @@
-
- {% if categories %} - - - - - - - - - - - {% for category in categories %} - - - - - - {% endfor %} - -
{% translate 'Name' %}{% translate 'Muted' %}
-
- - - -
- 		{{ category.name }} - {% if category.mute %}{% endif %} -
- {% else %} - - {% endif %} +
+ +
+
+
diff --git a/app/templates/categories/fragments/table.html b/app/templates/categories/fragments/table.html new file mode 100644 index 0000000..675fabd --- /dev/null +++ b/app/templates/categories/fragments/table.html @@ -0,0 +1,59 @@ +{% load i18n %} +{% if active %} +
+{% else %} +
+{% endif %} + {% if categories %} +
+ + + + + + + + + + + {% for category in categories %} + + + + + + {% endfor %} + +
{% translate 'Name' %}{% translate 'Muted' %}
+
+ + + +
+ 		{{ category.name }} + {% if category.mute %}{% endif %} +
+
+ {% else %} + + {% endif %} +
diff --git a/app/templates/categories/pages/index.html b/app/templates/categories/pages/index.html index 4714017..218b7bc 100644 --- a/app/templates/categories/pages/index.html +++ b/app/templates/categories/pages/index.html @@ -4,5 +4,5 @@ {% block title %}{% translate 'Categories' %}{% endblock %} {% block content %} -
+
{% endblock %} diff --git a/app/templates/entities/fragments/list.html b/app/templates/entities/fragments/list.html index 0c0c5ca..6ad2c76 100644 --- a/app/templates/entities/fragments/list.html +++ b/app/templates/entities/fragments/list.html @@ -15,49 +15,18 @@
-
- {% if entities %} - - - - - - - - - - {% for entity in entities %} - - - - - {% endfor %} - -
{% translate 'Name' %}
-
- - - -
- 		{{ entity.name }}
- {% else %} - - {% endif %} +
+ +
+
+
diff --git a/app/templates/entities/fragments/table.html b/app/templates/entities/fragments/table.html new file mode 100644 index 0000000..ea43d30 --- /dev/null +++ b/app/templates/entities/fragments/table.html @@ -0,0 +1,55 @@ +{% load i18n %} +{% if active %} +
+{% else %} +
+{% endif %} + {% if entities %} +
+ + + + + + + + + + {% for entity in entities %} + + + + + {% endfor %} + +
{% translate 'Name' %}
+
+ + + +
+ 		{{ entity.name }}
+
+ {% else %} + + {% endif %} +
diff --git a/app/templates/entities/pages/index.html b/app/templates/entities/pages/index.html index cff23d2..9db5088 100644 --- a/app/templates/entities/pages/index.html +++ b/app/templates/entities/pages/index.html @@ -4,5 +4,5 @@ {% block title %}{% translate 'Entities' %}{% endblock %} {% block content %} -
+
{% endblock %} 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..9a104c1 --- /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 %}