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

Merge pull request #311

Browse Source 
refactor(yearly): convert into a single page instead of two
This commit is contained in:
Herculino Trotta
2025-08-06 11:45:07 -03:00
committed by GitHub
parent 4f35647a22 368342853f
commit df47ffc49c
4 changed files with 48 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/templates/yearly_overview/pages/overview_by_account.html
+13 -2
View File
@@ -12,7 +12,18 @@
{% endblock %}
{% block content %}
<div class="container px-md-3 py-3 column-gap-5">
<div class="h-100 text-center mb-4 pt-2">
<div class="btn-group gap-3" role="group">
<a href="{% url 'yearly_overview_currency' year=year %}" class="btn {% if type != 'currency' %}btn-outline-primary{% else %}btn-primary{% endif %} rounded-5" hx-boost>
<i class="fa-solid fa-solid fa-coins fa-fw me-2"></i>{% trans 'Currency' %}
</a>
<a href="{% url 'yearly_overview_account' year=year %}" class="btn {% if type != 'account' %}btn-outline-primary{% else %}btn-primary{% endif %} rounded-5" hx-boost>
<i class="fa-solid fa-wallet fa-fw me-2"></i>{% trans 'Account' %}
</a>
</div>
</div>
<div class="container px-md-3 py-3 column-gap-5" id="yearly-content">
<div class="row mb-3 gx-xl-4 gy-3 mb-4">
{# Date picker#}
<div class="col-12 col-xl-2 flex-row align-items-center d-flex">
@@ -113,7 +124,7 @@
<div id="data-content"
class="show-loading"
hx-get="{% url 'yearly_overview_account_data' year=year %}"
hx-trigger="load, every 10m"
hx-trigger="load, every 10m, updated from:window"
hx-include="[name='account'], [name='month']"
hx-swap="innerHTML">
</div>
app/templates/yearly_overview/pages/overview_by_currency.html
+13 -2
View File
@@ -14,7 +14,18 @@
{% endblock %}
{% block content %}
<div class="container px-md-3 py-3 column-gap-5">
<div class="h-100 text-center mb-4 pt-2">
<div class="btn-group gap-3" role="group">
<a href="{% url 'yearly_overview_currency' year=year %}" class="btn {% if type != 'currency' %}btn-outline-primary{% else %}btn-primary{% endif %} rounded-5" hx-boost>
<i class="fa-solid fa-solid fa-coins fa-fw me-2"></i>{% trans 'Currency' %}
</a>
<a href="{% url 'yearly_overview_account' year=year %}" class="btn {% if type != 'account' %}btn-outline-primary{% else %}btn-primary{% endif %} rounded-5" hx-boost>
<i class="fa-solid fa-wallet fa-fw me-2"></i>{% trans 'Account' %}
</a>
</div>
</div>
<div class="container px-md-3 py-3 column-gap-5" id="yearly-content">
<div class="row mb-3 gx-xl-4 gy-3 mb-4">
{# Date picker#}
<div class="col-12 col-xl-2 flex-row align-items-center d-flex">
@@ -115,7 +126,7 @@
<div id="data-content"
class="show-loading"
hx-get="{% url 'yearly_overview_currency_data' year=year %}"
hx-trigger="load, every 10m"
hx-trigger="load, every 10m, updated from:window"
hx-include="[name='currency'], [name='month']"
hx-swap="innerHTML">
</div>