mirror of
https://github.com/eitchtee/WYGIWYH.git
synced 2026-07-08 13:55:21 +02:00
@@ -30,6 +30,8 @@ def index(request):
|
|||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def monthly_overview(request, month: int, year: int):
|
def monthly_overview(request, month: int, year: int):
|
||||||
|
order = request.session.get("monthly_transactions_order", "default")
|
||||||
|
|
||||||
if month < 1 or month > 12:
|
if month < 1 or month > 12:
|
||||||
from django.http import Http404
|
from django.http import Http404
|
||||||
|
|
||||||
@@ -54,6 +56,7 @@ def monthly_overview(request, month: int, year: int):
|
|||||||
"previous_month": previous_month,
|
"previous_month": previous_month,
|
||||||
"previous_year": previous_year,
|
"previous_year": previous_year,
|
||||||
"filter": f,
|
"filter": f,
|
||||||
|
"order": order,
|
||||||
},
|
},
|
||||||
)
|
)
|
||||||
|
|
||||||
@@ -62,7 +65,11 @@ def monthly_overview(request, month: int, year: int):
|
|||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def transactions_list(request, month: int, year: int):
|
def transactions_list(request, month: int, year: int):
|
||||||
order = request.GET.get("order")
|
order = request.session.get("monthly_transactions_order", "default")
|
||||||
|
|
||||||
|
if "order" in request.GET:
|
||||||
|
order = request.GET["order"]
|
||||||
|
request.session["monthly_transactions_order"] = order
|
||||||
|
|
||||||
f = TransactionsFilter(request.GET)
|
f = TransactionsFilter(request.GET)
|
||||||
transactions_filtered = (
|
transactions_filtered = (
|
||||||
|
|||||||
@@ -313,15 +313,22 @@ def transaction_pay(request, transaction_id):
|
|||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def transaction_all_index(request):
|
def transaction_all_index(request):
|
||||||
|
order = request.session.get("all_transactions_order", "default")
|
||||||
f = TransactionsFilter(request.GET)
|
f = TransactionsFilter(request.GET)
|
||||||
return render(request, "transactions/pages/transactions.html", {"filter": f})
|
return render(
|
||||||
|
request, "transactions/pages/transactions.html", {"filter": f, "order": order}
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
@only_htmx
|
@only_htmx
|
||||||
@login_required
|
@login_required
|
||||||
@require_http_methods(["GET"])
|
@require_http_methods(["GET"])
|
||||||
def transaction_all_list(request):
|
def transaction_all_list(request):
|
||||||
order = request.GET.get("order")
|
order = request.session.get("all_transactions_order", "default")
|
||||||
|
|
||||||
|
if "order" in request.GET:
|
||||||
|
order = request.GET["order"]
|
||||||
|
request.session["all_transactions_order"] = order
|
||||||
|
|
||||||
transactions = Transaction.objects.prefetch_related(
|
transactions = Transaction.objects.prefetch_related(
|
||||||
"account",
|
"account",
|
||||||
|
|||||||
@@ -113,9 +113,9 @@
|
|||||||
<div class="text-sm-end" _="on change trigger updated on window">
|
<div class="text-sm-end" _="on change trigger updated on window">
|
||||||
<label for="order">{% translate "Order by" %}</label>
|
<label for="order">{% translate "Order by" %}</label>
|
||||||
<select class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded" name="order" id="order">
|
<select class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded" name="order" id="order">
|
||||||
<option value="default">{% translate 'Default' %}</option>
|
<option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
|
||||||
<option value="older">{% translate 'Oldest first' %}</option>
|
<option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
|
||||||
<option value="newer">{% translate 'Newest first' %}</option>
|
<option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -32,9 +32,9 @@
|
|||||||
<div class="tw-content-center" _="on change trigger updated on window">
|
<div class="tw-content-center" _="on change trigger updated on window">
|
||||||
<label for="order">{% translate "Order by" %}</label>
|
<label for="order">{% translate "Order by" %}</label>
|
||||||
<select class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded" name="order" id="order">
|
<select class="tw-border-0 focus-visible:tw-outline-0 w-full pe-2 tw-leading-normal text-bg-tertiary tw-font-medium rounded" name="order" id="order">
|
||||||
<option value="default">{% translate 'Default' %}</option>
|
<option value="default" {% if order == 'default' %}selected{% endif %}>{% translate 'Default' %}</option>
|
||||||
<option value="older">{% translate 'Oldest first' %}</option>
|
<option value="older" {% if order == 'older' %}selected{% endif %}>{% translate 'Oldest first' %}</option>
|
||||||
<option value="newer">{% translate 'Newest first' %}</option>
|
<option value="newer" {% if order == 'newer' %}selected{% endif %}>{% translate 'Newest first' %}</option>
|
||||||
</select>
|
</select>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
Reference in New Issue
Block a user