diff --git a/app/templates/insights/fragments/month_by_month.html b/app/templates/insights/fragments/month_by_month.html index 91db3df..c6f91af 100644 --- a/app/templates/insights/fragments/month_by_month.html +++ b/app/templates/insights/fragments/month_by_month.html @@ -88,9 +88,9 @@ {% trans 'Entity' %} {% endif %} - {% trans 'Total' %} + {% trans 'Total' %} {% for month in data.months %} - + {% if month == 1 %}{% trans 'Jan' %} {% elif month == 2 %}{% trans 'Feb' %} {% elif month == 3 %}{% trans 'Mar' %} @@ -125,7 +125,7 @@ {% endif %} {# Total column for this item #} - + {% for currency_id, currency_data in item.total.currencies.items %} + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} @@ -149,7 +148,7 @@ {# Month columns #} {% for month in data.months %} - + {% with month_data=item.month_totals %} {% for m, m_data in month_data.items %} {% if m == month %} @@ -166,8 +165,7 @@ :amount="currency_data.exchanged.final_total" :prefix="currency_data.exchanged.currency.prefix" :suffix="currency_data.exchanged.currency.suffix" - :decimal_places="currency_data.exchanged.currency.decimal_places" - color="{% if currency_data.exchanged.final_total < 0 %}red{% elif currency_data.exchanged.final_total > 0 %}green{% endif %}"> + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} @@ -187,7 +185,7 @@ {% trans 'Total' %} {# Grand total #} - + {% for currency_id, currency_data in data.grand_total.currencies.items %} + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} @@ -211,7 +208,7 @@ {# Month totals #} {% for month in data.months %} - + {% with month_total=data.month_totals %} {% for m, m_data in month_total.items %} {% if m == month %} @@ -228,8 +225,7 @@ :amount="currency_data.exchanged.final_total" :prefix="currency_data.exchanged.currency.prefix" :suffix="currency_data.exchanged.currency.suffix" - :decimal_places="currency_data.exchanged.currency.decimal_places" - color="{% if currency_data.exchanged.final_total < 0 %}red{% elif currency_data.exchanged.final_total > 0 %}green{% endif %}"> + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} diff --git a/app/templates/insights/fragments/year_by_year.html b/app/templates/insights/fragments/year_by_year.html index ccbdb67..2ab3508 100644 --- a/app/templates/insights/fragments/year_by_year.html +++ b/app/templates/insights/fragments/year_by_year.html @@ -56,9 +56,9 @@ {% trans 'Entity' %} {% endif %} - {% trans 'Total' %} + {% trans 'Total' %} {% for year in data.years %} - {{ year }} + {{ year }} {% endfor %} @@ -79,7 +79,7 @@ {% endif %} {# Total column for this item #} - + {% for currency_id, currency_data in item.total.currencies.items %} + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} @@ -103,7 +102,7 @@ {# Year columns #} {% for year in data.years %} - + {% with year_data=item.year_totals %} {% for y, y_data in year_data.items %} {% if y == year %} @@ -120,8 +119,7 @@ :amount="currency_data.exchanged.final_total" :prefix="currency_data.exchanged.currency.prefix" :suffix="currency_data.exchanged.currency.suffix" - :decimal_places="currency_data.exchanged.currency.decimal_places" - color="{% if currency_data.exchanged.final_total < 0 %}red{% elif currency_data.exchanged.final_total > 0 %}green{% endif %}"> + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} @@ -141,7 +139,7 @@ {% trans 'Total' %} {# Grand total #} - + {% for currency_id, currency_data in data.grand_total.currencies.items %} + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %} @@ -165,7 +162,7 @@ {# Year totals #} {% for year in data.years %} - + {% with year_total=data.year_totals %} {% for y, y_data in year_total.items %} {% if y == year %} @@ -182,8 +179,7 @@ :amount="currency_data.exchanged.final_total" :prefix="currency_data.exchanged.currency.prefix" :suffix="currency_data.exchanged.currency.suffix" - :decimal_places="currency_data.exchanged.currency.decimal_places" - color="{% if currency_data.exchanged.final_total < 0 %}red{% elif currency_data.exchanged.final_total > 0 %}green{% endif %}"> + :decimal_places="currency_data.exchanged.currency.decimal_places"> {% endif %} {% empty %}