starred/WYGIWYH
1
0
Fork 0
mirror of https://github.com/eitchtee/WYGIWYH.git synced 2026-04-23 00:58:40 +02:00
Code Issues 14 Packages Projects Releases 10 Wiki Activity

feat: improve monthly transactions ordering

Browse Source
This commit is contained in:
Herculino Trotta
2024-10-09 22:31:08 -03:00
parent a918b4ae7c
commit d2cd115751
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/apps/monthly_overview/views/main.py
View File

@@ -74,7 +74,10 @@ def transactions_list(request, month: int, year: int):
today = timezone.localdate(timezone.now()) today = timezone.localdate(timezone.now())
yesterday = today - timezone.timedelta(days=1) yesterday = today - timezone.timedelta(days=1)
tomorrow = today + timezone.timedelta(days=1) tomorrow = today + timezone.timedelta(days=1)
last_7_days = today - timezone.timedelta(days=7)
next_7_days = today + timezone.timedelta(days=7)
# TO-DO Improve date-order
f = TransactionsFilter(request.GET) f = TransactionsFilter(request.GET)
transactions_filtered = ( transactions_filtered = (
f.qs.filter() f.qs.filter()
@@ -84,10 +87,12 @@ def transactions_list(request, month: int, year: int):
) )
.annotate( .annotate(
date_order=Case( date_order=Case(
When(date=tomorrow, then=Value(0)), When(date__lte=next_7_days, date__gte=tomorrow, then=Value(0)),
When(date=today, then=Value(1)), When(date=tomorrow, then=Value(1)),
When(date=yesterday, then=Value(2)), When(date=today, then=Value(2)),
default=Value(3), When(date=yesterday, then=Value(3)),
When(date__gte=last_7_days, date__lte=today, then=Value(4)),
default=Value(5),
output_field=IntegerField(), output_field=IntegerField(),
) )
) )