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

added team filter in timesheet search forms (#3590)

Browse Source 
* added team filter in export and invoice search form
* added teams select to timesheet filter
* added team select to report filter
* hide user and team filter if count < 2
This commit is contained in:
Kevin Papst
2022-10-21 16:14:39 +02:00
committed by GitHub
parent 2022fa54d3
commit 14f4530de0
17 changed files with 235 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
templates/export/index.html.twig
View File

@@ -47,6 +47,9 @@
{% if form.users is defined %}
{{ form_row(form.users) }}
{% endif %}
{% if form.teams is defined %}
{{ form_row(form.teams) }}
{% endif %}
{{ form_row(form.billable) }}
{{ form_row(form.exported) }}
{{ form_row(form.state) }}

3
templates/invoice/index.html.twig
View File

@@ -49,6 +49,9 @@
{% if form.users is defined %}
{{ form_row(form.users, {'row_attr': {'class': 'invoice_search_form_row_users'}}) }}
{% endif %}
{% if form.teams is defined %}
{{ form_row(form.teams, {'row_attr': {'class': 'invoice_search_form_row_teams'}}) }}
{% endif %}
{% if form.exported is defined %}
{{ form_row(form.exported, {'row_attr': {'class': 'invoice_search_form_row_exported'}}) }}
{% endif %}

3
templates/reporting/report_user_list.html.twig
View File

@@ -14,6 +14,9 @@
{% endblock %}
{% block box_title %}
{{ form_widget(form.date) }}
{% if form.team is defined %}
{{ form_widget(form.team) }}
{% endif %}
{% if form.sumType.vars.choices|length > 1 %}
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">

3
templates/reporting/report_user_list_monthly.html.twig
View File

@@ -14,6 +14,9 @@
{% endblock %}
{% block box_title %}
{{ form_widget(form.date) }}
{% if form.team is defined %}
{{ form_widget(form.team) }}
{% endif %}
{% if form.sumType.vars.choices|length > 1 %}
<div class="btn-group">
<button type="button" class="btn btn-default dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">