IO-1316 Add flat_rate to time tickets & resolve issues in job costing calculations.

client/src/components/time-ticket-modal/time-ticket-modal.component.jsx

@@ -1,5 +1,5 @@
 import { useQuery } from "@apollo/client";
-import { Form, Input, InputNumber, Select } from "antd";
+import { Form, Input, InputNumber, Select, Switch } from "antd";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -113,7 +113,17 @@ export function TimeTicketModalComponent({
             },
           ]}
         >
-          <EmployeeSearchSelect options={employeeAutoCompleteOptions} />
+          <EmployeeSearchSelect
+            options={employeeAutoCompleteOptions}
+            onSelect={(value) => {
+              console.log(value);
+              const emps =
+                employeeAutoCompleteOptions &&
+                employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
+              console.log(emps);
+              form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
+            }}
+          />
         </Form.Item>
         <Form.Item
           shouldUpdate={(prev, cur) => prev.employeeid !== cur.employeeid}
@@ -140,6 +150,14 @@ export function TimeTicketModalComponent({
             );
           }}
         </Form.Item>
+
+        <Form.Item
+          name="flat_rate"
+          label={t("timetickets.fields.flat_rate")}
+          valuePropName="checked"
+        >
+          <Switch />
+        </Form.Item>
       </LayoutFormRow>
 
       <LayoutFormRow>

client/src/graphql/jobs-lines.queries.js

@@ -58,6 +58,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       jobid
       employeeid
       memo
+      flat_rate
       employee {
         id
         first_name

client/src/graphql/jobs.queries.js

@@ -318,6 +318,7 @@ export const QUERY_JOB_COSTING_DETAILS = gql`
         cost_center
         actualhrs
         productivehrs
+        flat_rate
       }
     }
   }

client/src/graphql/timetickets.queries.js

@@ -14,6 +14,7 @@ export const QUERY_TICKETS_BY_JOBID = gql`
       id
       memo
       jobid
+      flat_rate
       employee {
         employee_number
         first_name
@@ -42,6 +43,7 @@ export const QUERY_TIME_TICKETS_IN_RANGE = gql`
       productivehrs
       memo
       jobid
+      flat_rate
       job {
         id
         ro_number
@@ -72,6 +74,7 @@ export const INSERT_NEW_TIME_TICKET = gql`
         ciecacode
         date
         memo
+        flat_rate
       }
     }
   }
@@ -98,6 +101,7 @@ export const UPDATE_TIME_TICKET = gql`
         updated_at
         jobid
         date
+        flat_rate
         memo
       }
     }
@@ -121,6 +125,7 @@ export const QUERY_ACTIVE_TIME_TICKETS = gql`
       clockon
       memo
       cost_center
+      flat_rate
       jobid
       job {
         id

client/src/translations/en_us/common.json

@@ -2160,6 +2160,7 @@
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
+				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
 				"ro_number": "Job to Post Against"

client/src/translations/es/common.json

@@ -2160,6 +2160,7 @@
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""

client/src/translations/fr/common.json

@@ -2160,6 +2160,7 @@
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
 				"ro_number": ""