starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-07-09 06:15:14 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

feat: revamp Yearly Overview

Browse Source
This commit is contained in:
Herculino Trotta
2024-11-02 01:32:52 -03:00
parent c75aa98e21
commit 6ee8e233ca
3 changed files with 103 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/apps/yearly_overview/urls.py
+1 -1
View File
@@ -11,7 +11,7 @@ urlpatterns = [
name="yearly_overview_currency", name="yearly_overview_currency",
), ),
path( path(
"yearly-overview/<int:year>/data/", "yearly-overview/<int:year>/currency/data/",
views.yearly_overview_by_currency, views.yearly_overview_by_currency,
name="yearly_overview_currency_data", name="yearly_overview_currency_data",
), ),
app/apps/yearly_overview/views.py
+31 -4
View File
@@ -13,6 +13,7 @@ from apps.accounts.models import Account
from apps.currencies.models import Currency from apps.currencies.models import Currency
from apps.currencies.utils.convert import convert from apps.currencies.utils.convert import convert
from apps.transactions.models import Transaction from apps.transactions.models import Transaction
from apps.common.decorators.htmx import only_htmx
@login_required @login_required
@@ -35,7 +36,9 @@ def index_yearly_overview_by_currency(request, year: int):
previous_year = year - 1 previous_year = year - 1
month_options = range(1, 13) month_options = range(1, 13)
currency_options = Currency.objects.all() currency_options = Currency.objects.filter(
accounts__transactions__date__year=year
).distinct()
return render( return render(
request, request,
@@ -50,6 +53,7 @@ def index_yearly_overview_by_currency(request, year: int):
) )
@only_htmx
@login_required @login_required
def yearly_overview_by_currency(request, year: int): def yearly_overview_by_currency(request, year: int):
month = request.GET.get("month") month = request.GET.get("month")
@@ -196,8 +200,6 @@ def yearly_overview_by_currency(request, year: int):
} }
) )
print(result)
return render( return render(
request, request,
"yearly_overview/fragments/currency_data.html", "yearly_overview/fragments/currency_data.html",
@@ -208,6 +210,32 @@ def yearly_overview_by_currency(request, year: int):
) )
@login_required
def index_yearly_overview_by_account(request, year: int):
next_year = year + 1
previous_year = year - 1
month_options = range(1, 13)
account_options = (
Account.objects.filter(is_archived=False, transactions__date__year=year)
.select_related("group")
.distinct()
)
return render(
request,
"yearly_overview/pages/overview_by_account.html",
context={
"year": year,
"next_year": next_year,
"previous_year": previous_year,
"months": month_options,
"accounts": account_options,
},
)
@only_htmx
@login_required @login_required
def yearly_overview_by_account(request, year: int): def yearly_overview_by_account(request, year: int):
month = request.GET.get("month") month = request.GET.get("month")
@@ -420,7 +448,6 @@ def yearly_overview_by_account(request, year: int):
) )
if isinstance(converted_amount, Decimal): if isinstance(converted_amount, Decimal):
print(converted_amount)
result[month][account_id][ result[month][account_id][
f"exchange_{field}" f"exchange_{field}"
] = converted_amount ] = converted_amount
app/templates/yearly_overview/pages/overview_by_currency.html
+71 -71
View File
@@ -90,77 +90,77 @@
</div> </div>
</div> </div>
</div> </div>
<div class="row"> <div class="row">
<div class="col-lg-2"> <div class="col-lg-2">
<div class="nav flex-column nav-pills" id="month-pills" role="tablist" aria-orientation="vertical"> <div class="nav flex-column nav-pills" id="month-pills" role="tablist" aria-orientation="vertical">
<input type="hidden" name="month" value=""> <input type="hidden" name="month" value="">
<button class="nav-link active" <button class="nav-link active"
role="tab" role="tab"
data-bs-toggle="pill" data-bs-toggle="pill"
hx-get="{% url 'yearly_overview_currency_data' year=year %}" hx-get="{% url 'yearly_overview_currency_data' year=year %}"
hx-target="#data-content" hx-target="#data-content"
hx-trigger="click" hx-trigger="click"
hx-include="[name='currency'], [name='month']" hx-include="[name='currency'], [name='month']"
hx-swap="innerHTML" hx-swap="innerHTML"
onclick="document.querySelector('[name=month]').value = ''"> onclick="document.querySelector('[name=month]').value = ''">
{% translate 'Year' %} {% translate 'Year' %}
</button> </button>
{% for month in months %} {% for month in months %}
<button class="nav-link" <button class="nav-link"
role="tab" role="tab"
data-bs-toggle="pill" data-bs-toggle="pill"
hx-get="{% url 'yearly_overview_currency_data' year=year %}" hx-get="{% url 'yearly_overview_currency_data' year=year %}"
hx-target="#data-content" hx-target="#data-content"
hx-trigger="click" hx-trigger="click"
hx-include="[name='currency'], [name='month']" hx-include="[name='currency'], [name='month']"
hx-swap="innerHTML" hx-swap="innerHTML"
onclick="document.querySelector('[name=month]').value = '{{ month }}'"> onclick="document.querySelector('[name=month]').value = '{{ month }}'">
{{ month|month_name }} {{ month|month_name }}
</button> </button>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<hr class="my-4 d-block d-lg-none"> <hr class="my-4 d-block d-lg-none">
<div class="col-lg-3"> <div class="col-lg-3">
<div class="nav flex-column nav-pills" id="currency-pills" role="tablist" aria-orientation="vertical"> <div class="nav flex-column nav-pills" id="currency-pills" role="tablist" aria-orientation="vertical">
<input type="hidden" name="currency" value=""> <input type="hidden" name="currency" value="">
<button class="nav-link active" <button class="nav-link active"
role="tab" role="tab"
data-bs-toggle="pill" data-bs-toggle="pill"
hx-get="{% url 'yearly_overview_currency_data' year=year %}" hx-get="{% url 'yearly_overview_currency_data' year=year %}"
hx-target="#data-content" hx-target="#data-content"
hx-trigger="click" hx-trigger="click"
hx-include="[name='currency'], [name='month']" hx-include="[name='currency'], [name='month']"
hx-swap="innerHTML" hx-swap="innerHTML"
onclick="document.querySelector('[name=currency]').value = ''"> onclick="document.querySelector('[name=currency]').value = ''">
{% translate 'All' %} {% translate 'All' %}
</button> </button>
{% for currency in currencies %} {% for currency in currencies %}
<button class="nav-link" <button class="nav-link"
role="tab" role="tab"
data-bs-toggle="pill" data-bs-toggle="pill"
hx-get="{% url 'yearly_overview_currency_data' year=year %}" hx-get="{% url 'yearly_overview_currency_data' year=year %}"
hx-target="#data-content" hx-target="#data-content"
hx-trigger="click" hx-trigger="click"
hx-include="[name='currency'], [name='month']" hx-include="[name='currency'], [name='month']"
hx-swap="innerHTML" hx-swap="innerHTML"
onclick="document.querySelector('[name=currency]').value = '{{ currency.id }}'"> onclick="document.querySelector('[name=currency]').value = '{{ currency.id }}'">
{{ currency.name }} {{ currency.name }}
</button> </button>
{% endfor %} {% endfor %}
</div> </div>
</div> </div>
<div class="col-lg-7"> <div class="col-lg-7">
<div id="data-content" <div id="data-content"
class="show-loading" class="show-loading"
hx-get="{% url 'yearly_overview_currency_data' year=year %}" hx-get="{% url 'yearly_overview_currency_data' year=year %}"
hx-trigger="load" hx-trigger="load"
hx-include="[name='currency'], [name='month']" hx-include="[name='currency'], [name='month']"
hx-swap="innerHTML"> hx-swap="innerHTML">
</div> </div>
</div> </div>
</div> </div>
</div> </div>
{% endblock %} {% endblock %}