diff --git a/resources/views/v1/budgets/index.twig b/resources/views/v1/budgets/index.twig index dbf2806ee6..82f2528886 100644 --- a/resources/views/v1/budgets/index.twig +++ b/resources/views/v1/budgets/index.twig @@ -202,227 +202,227 @@ {# make FF ignore demo for now. #} {% set shownDemo = true %} {% else %} - +
-
-
-
-

{{ 'budgets'|_ }}

-
-
-
- {{ 'createBudget'|_ }} +
+
+
+

{{ 'budgets'|_ }}

- - - - - - - - - - - - {% for budget in budgets %} - - - -
{{ 'budget'|_ }}{{ 'budgeted'|_ }}{{ 'left'|_ }} ({{ 'per_day'|_|lower }})
- {{ budget.name }} - {% if budget.auto_budget %} - {% if 1 == budget.auto_budget.auto_budget_type %} - - {% endif %} - {% if 2 == budget.auto_budget.auto_budget_type %} - - {% endif %} - {% endif %} - {% if budget.attachments.count > 0 %} - - {% endif %} - - {% if 0==budget.budgeted|length %} -
-
{{ defaultCurrency.symbol }}
- - +
+ + + + + + + + + + + + + {% for budget in budgets %} + + - + - + + + + + {% endfor %} + + + + + + + + - {% endfor %} - - - - - - - - - - -
{{ 'budget'|_ }}{{ 'budgeted'|_ }}{{ 'left'|_ }} ({{ 'per_day'|_|lower }})
+ {{ budget.name }} + {% if budget.auto_budget %} + {% if 1 == budget.auto_budget.auto_budget_type %} + {% endif %} - {% endfor %} - - {% for spentInfo in budget.spent %} - {% set countLimit = 0 %} - {% for budgetLimit in budget.budgeted %} - {% if spentInfo.currency_id == budgetLimit.currency_id %} - {% set countLimit = countLimit + 1 %} - - {{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }} - {% if spentInfo.spent + budgetLimit.amount > 0 %} - ({{ formatAmountBySymbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}) - {% else %} - ({{ formatAmountBySymbol(0, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}) + {% if 2 == budget.auto_budget.auto_budget_type %} + + {% endif %} + {% endif %} + {% if budget.attachments.count > 0 %} + + {% endif %} + + {% if 0==budget.budgeted|length %} +
+
{{ defaultCurrency.symbol }}
+ + +
+ + {% endif %} + {% if budget.budgeted|length > 0 %} + {% for budgetLimit in budget.budgeted %} +
+
{{ budgetLimit.currency_symbol }}
+ +
+ + +
+
+ {% if not budgetLimit.in_range %} + + {{ trans('firefly.budget_limit_not_in_range', {start: budgetLimit.start_date, end: budgetLimit.end_date}) }} +
{% endif %} + + {% endfor %} + {% endif %} + {% if budget.budgeted|length < currencies.count %} + + + + {% endif %} + 		+ {% for spentInfo in budget.spent %} + {% set countLimit = 0 %} + {% for budgetLimit in budget.budgeted %} + {% if spentInfo.currency_id == budgetLimit.currency_id %} + {% set countLimit = countLimit + 1 %} + + {{ formatAmountBySymbol(spentInfo.spent + budgetLimit.amount, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }} + {% if spentInfo.spent + budgetLimit.amount > 0 %} + ({{ formatAmountBySymbol((spentInfo.spent + budgetLimit.amount) / activeDaysLeft, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}) + {% else %} + ({{ formatAmountBySymbol(0, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}) + {% endif %} + +
+ {% endif %} + {% endfor %} + {% if countLimit == 0 %} + + {{ formatAmountBySymbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }}
{% endif %} {% endfor %} - {% if countLimit == 0 %} - - {{ formatAmountBySymbol(spentInfo.spent, spentInfo.currency_symbol, spentInfo.currency_decimal_places) }} + {% for budgetLimit in budget.budgeted %} + {% if null == budget.spent[budgetLimit.currency_id] %} + + {{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }} + ({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }})
- {% endif %} + {% endif %} + {% endfor %} +
 {{ 'sum'|_ }} + {% for arr in sums.budgeted %} + {{ formatAmountBySymbol(arr.amount, arr.currency_symbol, arr.currency_decimal_places) }}
{% endfor %} - {% for budgetLimit in budget.budgeted %} - {% if null == budget.spent[budgetLimit.currency_id] %} - - {{ formatAmountBySymbol(budgetLimit.amount, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }} - ({{ formatAmountBySymbol(budgetLimit.amount / activeDaysLeft, budgetLimit.currency_symbol, budgetLimit.currency_decimal_places) }}) - + 		+ {% for arr in sums.spent %} + {{ formatAmountBySymbol(arr.amount, arr.currency_symbol, arr.currency_decimal_places) }} + ({{ formatAmountBySymbol(arr.amount / activeDaysPassed, arr.currency_symbol, arr.currency_decimal_places) }}) +
+ {% endfor %} + 		+ {% for arr in sums.left %} + {{ formatAmountBySymbol(arr.amount, arr.currency_symbol, arr.currency_decimal_places) }} + ({{ formatAmountBySymbol(arr.amount / activeDaysLeft, arr.currency_symbol, arr.currency_decimal_places) }})
- {% endif %} {% endfor %}
 {{ 'sum'|_ }} - {% for arr in sums.budgeted %} - {{ formatAmountBySymbol(arr.amount, arr.currency_symbol, arr.currency_decimal_places) }}
- {% endfor %} - 		- {% for arr in sums.spent %} - {{ formatAmountBySymbol(arr.amount, arr.currency_symbol, arr.currency_decimal_places) }} - ({{ formatAmountBySymbol(arr.amount / activeDaysPassed, arr.currency_symbol, arr.currency_decimal_places) }}) -
- {% endfor %} - 		- {% for arr in sums.left %} - {{ formatAmountBySymbol(arr.amount, arr.currency_symbol, arr.currency_decimal_places) }} - ({{ formatAmountBySymbol(arr.amount / activeDaysLeft, arr.currency_symbol, arr.currency_decimal_places) }}) -
- {% endfor %} -
-
-
- {{ 'createBudget'|_ }} + +
+
+
+ {{ 'createBudget'|_ }} +
-
-
-
-
-
-

{{ 'transactionsWithoutBudget'|_ }}

-
-
-

- - {{ trans('firefly.transactions_no_budget', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} - -

-
-
-
- {% if paginator.count > 0 and inactive.count > 0 %} +
-
-
-

{{ 'createBudget'|_ }}

-
-
- {{ 'createBudget'|_ }} -
-
-
- {% endif %} - {% if inactive|length > 0 %} -
-

{{ 'inactiveBudgets'|_ }}

+

{{ 'transactionsWithoutBudget'|_ }}

- {% for budget in inactive %} - {% if loop.index == inactive.count() %} - {{ budget.name }} - {% else %} - {{ budget.name }}, - {% endif %} - {% endfor %} +

+ + {{ trans('firefly.transactions_no_budget', {start: start.formatLocalized(monthAndDayFormat), end: end.formatLocalized(monthAndDayFormat)}) }} + +

- {% endif %} -
+ {% if paginator.count > 0 and inactive.count > 0 %} +
+
+
+

{{ 'createBudget'|_ }}

+
+
+ {{ 'createBudget'|_ }} +
+
+
+ {% endif %} + {% if inactive|length > 0 %} +
+
+
+

{{ 'inactiveBudgets'|_ }}

+
+
+ {% for budget in inactive %} + {% if loop.index == inactive.count() %} + {{ budget.name }} + {% else %} + {{ budget.name }}, + {% endif %} + {% endfor %} +
+
+
+ {% endif %} +
{% endif %} {% endblock %}