From 7503899a9b3c7e3926e0faa4b89831ebc35b5eda Mon Sep 17 00:00:00 2001
From: Kevin Papst <kevinpapst@users.noreply.github.com>
Date: Thu, 12 Nov 2020 11:14:43 +0100
Subject: [PATCH] re-order fields in search form (#2120)

---
 src/Form/Toolbar/TimesheetToolbarForm.php | 6 +++---
 templates/export/index.html.twig          | 2 +-
 templates/invoice/index.html.twig         | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/Form/Toolbar/TimesheetToolbarForm.php b/src/Form/Toolbar/TimesheetToolbarForm.php
index 32394524..ce73bed0 100644
--- a/src/Form/Toolbar/TimesheetToolbarForm.php
+++ b/src/Form/Toolbar/TimesheetToolbarForm.php
@@ -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);
diff --git a/templates/export/index.html.twig b/templates/export/index.html.twig
index ac75d284..e8257f61 100644
--- a/templates/export/index.html.twig
+++ b/templates/export/index.html.twig
@@ -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) }}
diff --git a/templates/invoice/index.html.twig b/templates/invoice/index.html.twig
index 88239064..dfaff68c 100644
--- a/templates/invoice/index.html.twig
+++ b/templates/invoice/index.html.twig
@@ -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 %}