From 23c1d519148366cea4c6075206b40b2e2532df6c Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Thu, 28 Jan 2021 09:46:08 -0800
Subject: [PATCH] Re-order time ticket modal fields.

---
 .../time-ticket-modal.component.jsx           | 62 +++++++++----------
 1 file changed, 31 insertions(+), 31 deletions(-)

diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
index bfc40411d..75be0dea6 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.component.jsx
@@ -40,21 +40,6 @@ export default function TimeTicketModalComponent({
             }}
           />
         </Form.Item>
-        <Form.Item
-          name="employeeid"
-          label={t("timetickets.fields.employee")}
-          rules={[
-            {
-              required: true,
-              message: t("general.validation.required"),
-            },
-          ]}
-        >
-          <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
-        </Form.Item>
-      </LayoutFormRow>
-
-      <LayoutFormRow>
         <Form.Item
           label={t("timetickets.fields.date")}
           name="date"
@@ -68,8 +53,8 @@ export default function TimeTicketModalComponent({
           <FormDatePicker />
         </Form.Item>
         <Form.Item
-          label={t("timetickets.fields.productivehrs")}
-          name="productivehrs"
+          name="employeeid"
+          label={t("timetickets.fields.employee")}
           rules={[
             {
               required: true,
@@ -77,21 +62,8 @@ export default function TimeTicketModalComponent({
             },
           ]}
         >
-          <InputNumber min={0} precision={1} />
+          <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
         </Form.Item>
-        <Form.Item
-          label={t("timetickets.fields.actualhrs")}
-          name="actualhrs"
-          // rules={[
-          //   {
-          //     required: true,
-          //     message: t("general.validation.required"),
-          //   },
-          // ]}
-        >
-          <InputNumber min={0} precision={1} />
-        </Form.Item>
-
         <Form.Item
           shouldUpdate={(prev, cur) => prev.employeeid !== cur.employeeid}
         >
@@ -124,6 +96,34 @@ export default function TimeTicketModalComponent({
             );
           }}
         </Form.Item>
+      </LayoutFormRow>
+
+      <LayoutFormRow>
+        <Form.Item
+          label={t("timetickets.fields.productivehrs")}
+          name="productivehrs"
+          rules={[
+            {
+              required: true,
+              message: t("general.validation.required"),
+            },
+          ]}
+        >
+          <InputNumber min={0} precision={1} />
+        </Form.Item>
+        <Form.Item
+          label={t("timetickets.fields.actualhrs")}
+          name="actualhrs"
+          // rules={[
+          //   {
+          //     required: true,
+          //     message: t("general.validation.required"),
+          //   },
+          // ]}
+        >
+          <InputNumber min={0} precision={1} />
+        </Form.Item>
+
         <Form.Item
           name="ciecacode"
           label={t("timetickets.fields.ciecacode")}