diff --git a/app/apps/insights/forms.py b/app/apps/insights/forms.py index 34c6c8f..50d8428 100644 --- a/app/apps/insights/forms.py +++ b/app/apps/insights/forms.py @@ -9,6 +9,7 @@ from apps.common.widgets.datepicker import ( AirDatePickerInput, ) from apps.transactions.models import TransactionCategory +from apps.common.widgets.tom_select import TomSelect class SingleMonthForm(forms.Form): @@ -115,7 +116,9 @@ class CategoryForm(forms.Form): category = forms.ModelChoiceField( required=False, label=_("Category"), + empty_label=_("Uncategorized"), queryset=TransactionCategory.objects.filter(active=True), + widget=TomSelect(clear_button=True), ) def __init__(self, *args, **kwargs): diff --git a/app/apps/insights/views.py b/app/apps/insights/views.py index 177f57f..c6738cc 100644 --- a/app/apps/insights/views.py +++ b/app/apps/insights/views.py @@ -126,7 +126,7 @@ def category_sum_by_account(request): # Generate data account_data = get_category_sums_by_account(transactions, category) else: - account_data = None + account_data = get_category_sums_by_account(transactions, category=None) return render( request, @@ -150,9 +150,7 @@ def category_sum_by_currency(request): # Generate data currency_data = get_category_sums_by_currency(transactions, category) else: - currency_data = None - - print(currency_data) + currency_data = get_category_sums_by_currency(transactions, category=None) return render( request,