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

re-order fields in search form (#2120)

Browse Source
This commit is contained in:
Kevin Papst
2020-11-12 11:14:43 +01:00
committed by GitHub
parent 49a4d1069a
commit 7503899a9b
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Form/Toolbar/TimesheetToolbarForm.php
View File

@@ -29,14 +29,14 @@ class TimesheetToolbarForm extends AbstractToolbarForm
}
$this->addSearchTermInputField($builder);
if ($options['include_user']) {
$this->addUsersChoice($builder);
}
$this->addDateRangeChoice($builder);
$this->addCustomerMultiChoice($builder, $newOptions, true);
$this->addProjectMultiChoice($builder, $newOptions, true, true);
$this->addActivityMultiChoice($builder, [], true);
$this->addTagInputField($builder);
if ($options['include_user']) {
$this->addUsersChoice($builder);
}
$this->addTimesheetStateChoice($builder);
$this->addExportStateChoice($builder);
$this->addPageSizeChoice($builder);

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

@@ -40,8 +40,8 @@
{{ form_row(form.customers) }}
{{ form_row(form.projects) }}
{{ form_row(form.activities) }}
{{ form_row(form.users) }}
{{ form_row(form.tags) }}
{{ form_row(form.users) }}
{{ form_row(form.exported) }}
{{ form_row(form.state) }}
{{ form_row(form.markAsExported) }}

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

@@ -42,12 +42,12 @@
{% if form.activities is defined %}
{{ form_row(form.activities) }}
{% endif %}
{% if form.users is defined %}
{{ form_row(form.users) }}
{% endif %}
{% if form.tags is defined %}
{{ form_row(form.tags) }}
{% endif %}
{% if form.users is defined %}
{{ form_row(form.users) }}
{% endif %}
{% if form.exported is defined %}
{{ form_row(form.exported) }}
{% endif %}