Next major version 2 with PHP 8.1, Symfony 6, Tabler UI, 2FA ... (#2902)

This commit is contained in:
Kevin Papst
2022-12-31 21:19:55 +01:00
committed by GitHub
parent 95e06746bd
commit 90a0fd8a22
2164 changed files with 83700 additions and 86426 deletions

View File

@@ -10,8 +10,8 @@
{% set currency = project.customer.currency %}
{% if project.isMonthlyBudget() %}
<h4>
{%- if showMoneyBudget %}{{ 'label.budget'|trans }}{% else %}{{ 'label.timeBudget'|trans }}{% endif -%}
: {{ 'label.budgetType_month'|trans }}
{%- if showMoneyBudget %}{{ 'budget'|trans }}{% else %}{{ 'timeBudget'|trans }}{% endif -%}
: {{ 'budgetType_month'|trans }}
</h4>
{% set chartData = [] %}
{% set chartLabels = [] %}
@@ -45,7 +45,7 @@
{{ bar_chart(chartPrefix, chartLabels, [chartData], {'height': '300px', 'renderEvent': 'render.' ~ chartPrefix}) }}
{% else %}
<h4>
{%- if showMoneyBudget %}{{ 'label.budget'|trans }}{% else %}{{ 'label.timeBudget'|trans }}{% endif -%}
{%- if showMoneyBudget %}{{ 'budget'|trans }}{% else %}{{ 'timeBudget'|trans }}{% endif -%}
</h4>
{% set chartData = [] %}
{% set chartLabels = [] %}
@@ -70,12 +70,9 @@
'label': (showMoneyBudget ? totalBudget|money(currency) : totalBudget|duration),
'value': (showMoneyBudget ? totalBudget|chart_money : totalBudget|chart_duration),
} %}
{# line chart do not support coloring negative areas #}
{#
{% if totalBudget < 0 %}
{% set chartValue = chartValue|merge({'color': 'red'}) %}
{% endif %}
#}
{% set chartData = chartData|merge([chartValue]) %}
{% endif %}
{% endfor %}