Sort categories and add link to current month

This commit is contained in:
Jan Bader 2021-12-07 13:45:08 +00:00
parent 646560267a
commit 4a0759af8f
3 changed files with 5 additions and 2 deletions

View File

@ -111,6 +111,7 @@ FROM categories
INNER JOIN category_groups ON categories.category_group_id = category_groups.id
WHERE category_groups.budget_id = $3
GROUP BY categories.id, categories.name, category_groups.name
ORDER BY category_groups.name, categories.name
`
type GetCategoriesWithBalanceParams struct {

View File

@ -40,4 +40,5 @@ SELECT categories.id, categories.name, category_groups.name as group,
FROM categories
INNER JOIN category_groups ON categories.category_group_id = category_groups.id
WHERE category_groups.budget_id = @budget_id
GROUP BY categories.id, categories.name, category_groups.name;
GROUP BY categories.id, categories.name, category_groups.name
ORDER BY category_groups.name, categories.name;

View File

@ -15,7 +15,8 @@
<span class="time"></span>
</div>
<div>
<a href="{{printf "/budget/%s/%d/%d" .Budget.ID .Previous.Year .Previous.Month}}">Previous Month</a>
<a href="{{printf "/budget/%s/%d/%d" .Budget.ID .Previous.Year .Previous.Month}}">Previous Month</a> -
<a href="{{printf "/budget/%s" .Budget.ID}}">Current Month</a> -
<a href="{{printf "/budget/%s/%d/%d" .Budget.ID .Next.Year .Next.Month}}">Next Month</a>
</div>
<table class="container col-lg-12" id="content">