Compare commits

..

No commits in common. "eabdaf2516300614a4ff7cd4efe180621e27effb" and "278d252cfd292d44e87a31592d116a23927aaff0" have entirely different histories.

4 changed files with 11 additions and 44 deletions

View file

@ -58,30 +58,5 @@
{% endfor %}
{% endspaceless %}
</tbody>
{% if categories %}
<tfoot>
<tr>
<th scope="row" colspan="2" class="l">{% translate "Total" %}</th>
<td class="value">{{ total_m|pmrvalue }}</td>
<td class="bar m">
<div style="width: {% widthratio total_m max -100 %}%"></div>
{% if total < 0 %}
<div class="tot" style="width:{% widthratio total max -100 %}%">
<span>{{ total|pmrvalue }}</span>
</div>
{% endif %}
</td>
<td class="bar p">
<div style="width: {% widthratio total_p max 100 %}%"></div>
{% if total > 0 %}
<div class="tot" style="width:{% widthratio total max 100 %}%">
<span>{{ total|pmrvalue }}</span>
</div>
{% endif %}
</td>
<td class="value">{{ total_p|pmrvalue }}</td>
</tr>
</tfoot>
{% endif %}
</table>
</div>

View file

@ -1,12 +1,11 @@
from django import template
from django.db import models
from django.db.models.functions import Greatest
register = template.Library()
@register.inclusion_tag("category/category_plot.html")
def category_plot(transactions, **kwargs):
def category_plot(transactions):
categories = (
transactions.filter(category__budget=True)
.values("category", "category__name", "category__icon")
@ -17,15 +16,12 @@ def category_plot(transactions, **kwargs):
)
.order_by("-sum")
)
return (
kwargs
| {
"categories": categories,
}
| categories.aggregate(
max=Greatest(models.Sum("sum_m"), models.Sum("sum_p")),
total_m=models.Sum("sum_m"),
total_p=models.Sum("sum_p"),
total=models.Sum("value"),
)
)
return {
"categories": categories,
"max": max(
categories.aggregate(
max=models.Max("sum_p", default=0),
min=models.Min("sum_m", default=0),
).values(),
),
}

View file

@ -70,7 +70,3 @@ table.full-width col.bar {
overflow: hidden;
}
}
.plot tfoot {
background: var(--bg-01);
}

View file

@ -12,6 +12,6 @@
{{ block.super }}
{% if not category %}
<h3>{% translate "Categories" %}</h3>
{% category_plot transactions month=month %}
{% category_plot transactions %}
{% endif %}
{% endblock %}