edpibu/nummi
1
Fork 0
Code Issues 4 Releases Activity

Implemented frontend for category

Browse source
This commit is contained in:
Edgar P. Burkhart 2023-04-22 12:15:48 +02:00
parent 719436f9ad
commit f6e8b583cc
Signed by: edpibu
GPG key ID: 9833D3C5A25BD227
4 changed files with 19 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nummi/category/models.py
View file

@ -22,10 +22,10 @@ class Category(UserModel):
return str(self.name)
def get_absolute_url(self):
return reverse("category", kwargs={"pk": self.pk})
return reverse("category", args=(self.pk,))
def get_delete_url(self):
return reverse("del_category", kwargs={"pk": self.pk})
return reverse("del_category", args=(self.pk,))
class Meta:
ordering = ["name"]

4
nummi/main/templates/main/form/category.html → nummi/category/templates/category/category_form.html
View file

@ -9,9 +9,11 @@
{% endblock %}
{% block h2 %}{{ form.instance.icon|remix }}{{ form.instance }}{% endblock %}
{% block tables %}
{% if form.instance.transactions %}
{% if transactions %}
<h3>{% translate "Transactions" %}</h3>
{% include "main/table/transaction.html" %}
{% endif %}
{% if history.data %}
<h3>{% translate "History" %}</h3>
{% include "main/plot/history.html" %}
{% endif %}

12
nummi/category/urls.py
View file

@ -4,18 +4,16 @@ from transaction.views import TransactionMonthView
from . import views
urlpatterns = [
path("category", views.CategoryCreateView.as_view(), name="new_category"),
path("category/<pk>", views.CategoryUpdateView.as_view(), name="category"),
path("", views.CategoryCreateView.as_view(), name="new_category"),
path("<category>", views.CategoryUpdateView.as_view(), name="category"),
path(
"category/<pk>/transactions",
"<category>/transactions",
views.CategoryTListView.as_view(),
name="category_transactions",
),
path("<category>/delete", views.CategoryDeleteView.as_view(), name="del_category"),
path(
"category/<pk>/delete", views.CategoryDeleteView.as_view(), name="del_category"
),
path(
"category/<category>/history/<int:year>/<int:month>",
"<category>/history/<int:year>/<int:month>",
TransactionMonthView.as_view(),
name="transaction_month",
),

16
nummi/category/views.py
View file

@ -1,3 +1,4 @@
from django.shortcuts import get_object_or_404
from django.urls import reverse_lazy
from main.views import NummiCreateView, NummiDeleteView, NummiUpdateView
from transaction.utils import history
@ -10,13 +11,12 @@ from .models import Category
class CategoryCreateView(NummiCreateView):
model = Category
form_class = CategoryForm
template_name = "main/form/category.html"
class CategoryUpdateView(NummiUpdateView):
model = Category
form_class = CategoryForm
template_name = "main/form/category.html"
pk_url_kwarg = "category"
def get_context_data(self, **kwargs):
data = super().get_context_data(**kwargs)
@ -33,17 +33,19 @@ class CategoryUpdateView(NummiUpdateView):
class CategoryDeleteView(NummiDeleteView):
model = Category
pk_url_kwarg = "category"
class CategoryMixin:
def get_queryset(self):
return super().get_queryset().filter(category=self.kwargs.get("pk"))
self.category = get_object_or_404(
Category.objects.filter(user=self.request.user),
pk=self.kwargs.get("category"),
)
return super().get_queryset().filter(category=self.category)
def get_context_data(self, **kwargs):
return super().get_context_data(**kwargs) | {
"object": Category.objects.get(pk=self.kwargs.get("pk")),
"category": True,
}
return super().get_context_data(**kwargs) | {"category": self.category}
class CategoryTListView(CategoryMixin, TransactionListView):