jjsm01/kimai2
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

added new permission to separate time and money budget (#3352)

Browse Source
This commit is contained in:
Kevin Papst
2022-06-11 12:23:02 +02:00
committed by GitHub
parent 3f827b3104
commit b46fdcefad
47 changed files with 853 additions and 346 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
templates/activity/edit.html.twig
View File

@@ -28,18 +28,22 @@
{% if form.project is defined %}
{{ form_row(form.project) }}
{% endif %}
{% if form.budget is defined %}
<div class="row">
<div class="col-md-4">
{{ form_row(form.budget) }}
{% if form.budgetType is defined %}
<div class="row">
{% if form.budget is defined %}
<div class="col-md-4">
{{ form_row(form.budget) }}
</div>
{% endif %}
{% if form.timeBudget is defined %}
<div class="col-md-4">
{{ form_row(form.timeBudget) }}
</div>
{% endif %}
<div class="col-md-4">
{{ form_row(form.budgetType) }}
</div>
</div>
<div class="col-md-4">
{{ form_row(form.timeBudget) }}
</div>
<div class="col-md-4">
{{ form_row(form.budgetType) }}
</div>
</div>
{% endif %}
{% if form.invoiceText is defined %}
{{ form_row(form.invoiceText) }}

16
templates/activity/index.html.twig
View File

@@ -14,9 +14,17 @@
('mf_' ~ field.name): {'title': field.label|trans, 'class': 'hidden-xs hidden-sm mf_' ~ field.name, 'orderBy': false}
}) %}
{% endfor %}
{% if is_granted('budget_money', 'activity') %}
{% set columns = columns|merge({
'budget': {'class': 'hidden-xs hidden-sm hidden text-right w-min', 'title': 'label.budget'|trans},
}) %}
{% endif %}
{% if is_granted('budget_time', 'activity') %}
{% set columns = columns|merge({
'timeBudget': {'class': 'hidden-xs hidden-sm hidden text-right w-min', 'title': 'label.timeBudget'|trans},
}) %}
{% endif %}
{% set columns = columns|merge({
'budget': {'class': 'hidden-xs hidden-sm hidden text-right w-min', 'title': 'label.budget'|trans},
'timeBudget': {'class': 'hidden-xs hidden-sm hidden text-right w-min', 'title': 'label.timeBudget'|trans},
'team': {'class': 'text-center w-min', 'orderBy': false},
'visible': {'class': 'text-center hidden w-min'},
'actions': {'class': 'actions alwaysVisible'},
@@ -63,14 +71,14 @@
</td>
{% endfor %}
<td class="{{ tables.data_table_column_class(tableName, columns, 'budget') }}">
{% if entry.hasBudget() %}
{% if entry.hasBudget() and is_granted('budget', entry) %}
{{ entry.budget|money((entry.project is null ? defaultCurrency : entry.project.customer.currency)) }}
{% else %}
&ndash;
{% endif %}
</td>
<td class="{{ tables.data_table_column_class(tableName, columns, 'timeBudget') }}">
{% if entry.hasTimeBudget() %}
{% if entry.hasTimeBudget() and is_granted('time', entry) %}
{{ entry.timeBudget|duration }}
{% else %}
&ndash;