WIP Payroll Commit process.

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

@@ -10,6 +10,7 @@ import {
   Space,
   Table,
 } from "antd";
+import _ from "lodash";
 import React from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
@@ -19,10 +20,9 @@ import EmployeeSearchSelectComponent from "../employee-search-select/employee-se
 import EmployeeTeamSearchSelectComponent from "../employee-team-search-select/employee-team-search-select.component";
 import FormDateTimePickerComponent from "../form-date-time-picker/form-date-time-picker.component";
 import JobSearchSelectComponent from "../job-search-select/job-search-select.component";
+import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
 import { LaborAllocationContainer } from "../time-ticket-modal/time-ticket-modal.component";
 import TimeTicketsTasksPresets from "../time-ticket-tasks-presets/time-ticket-tasks-presets.component";
-import { CalculateAllocationsTotals } from "../labor-allocations-table/labor-allocations-table.utility";
-import _ from "lodash";
 
 const mapStateToProps = createStructuredSelector({
   //currentUser: selectCurrentUser
@@ -39,7 +39,6 @@ export default connect(
 export function TimeTicketTaskModalComponent({
   bodyshop,
   form,
-  employeeAutoCompleteOptions,
   lineTicketCalled,
   calculateTimeTickets,
   lineTicketLoading,
@@ -72,18 +71,6 @@ export function TimeTicketTaskModalComponent({
             />
           </Form.Item>
 
-          <Form.Item name="employeeid" label={t("timetickets.fields.employee")}>
-            <EmployeeSearchSelectComponent
-              options={employeeAutoCompleteOptions}
-              allowClear
-              onSelect={(value) => {
-                const emps =
-                  employeeAutoCompleteOptions &&
-                  employeeAutoCompleteOptions.filter((e) => e.id === value)[0];
-                form.setFieldsValue({ flat_rate: emps && emps.flat_rate });
-              }}
-            />
-          </Form.Item>
           <Form.Item
             name="employeeteamid"
             label={t("timetickets.fields.employee_team")}
@@ -243,7 +230,13 @@ export function TimeTicketTaskModalComponent({
                   {errors.map((e, idx) => (
                     <Alert key={idx} message={e} />
                   ))}
-                  <div style={{ display: "none" }}>
+                  <div
+                    style={
+                      {
+                        //display: "none"
+                      }
+                    }
+                  >
                     {fields.map((field, index) => (
                       <Form.Item
                         key={field.key}
@@ -358,7 +351,7 @@ export function TimeTicketTaskModalComponent({
               !lineTicketLoading)
           ) {
             queryJobInfo({ variables: { id: jobid } }).then(() =>
-              calculateTimeTickets()
+              calculateTimeTickets("")
             );
           }
           return (

client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx

@@ -41,6 +41,7 @@ export function TimeTickeTaskModalContainer({
     fetchPolicy: "network-only",
     nextFetchPolicy: "network-only",
   });
+
   const { t } = useTranslation();
   const [insertTimeTickets] = useMutation(INSERT_NEW_TIME_TICKET);
   const [insertTimeTicketApproval] = useMutation(INSERT_NEW_TT_APPROVALS);
@@ -56,7 +57,7 @@ export function TimeTickeTaskModalContainer({
         const result = await insertTimeTicketApproval({
           variables: {
             timeTicketInput: values.timetickets.map((ticket) => ({
-            ..._.omit(ticket, "pay"),
+              ..._.omit(ticket, "pay"),
               bodyshopid: bodyshop.id,
             })),
           },
@@ -73,6 +74,7 @@ export function TimeTickeTaskModalContainer({
             type: "success",
             message: t("timetickets.successes.created"),
           });
+          form.resetFields();
           toggleModalVisible();
         }
       } else {
@@ -104,13 +106,13 @@ export function TimeTickeTaskModalContainer({
   }
 
   useEffect(() => {
-    if (context.jobid) {
-      console.log("UE Fired.");
+    if (visible && context.jobid) {
       queryJobInfo({ variables: { id: context.jobid } });
     }
-  }, [context.jobid, queryJobInfo]);
+  }, [context.jobid, queryJobInfo, visible]);
 
   const calculateTimeTickets = (presetMemo) => {
+    console.log("🚀 ~ file: time-ticket-task-modal.container.jsx:115 ~ calculateTimeTickets ~ presetMemo:", presetMemo)
     const formData = form.getFieldsValue();
     if (
       !formData.jobid ||
@@ -122,14 +124,13 @@ export function TimeTickeTaskModalContainer({
     ) {
       return;
     }
+
     let data = [];
     let eligibleHours = 0;
 
     const theTeam = JSON.parse(formData.employeeteamid);
 
     if (theTeam) {
-      data = [];
-
       formData.hourstype.forEach((hourstype) => {
         eligibleHours =
           lineTicketData.joblines.reduce(
@@ -148,6 +149,7 @@ export function TimeTickeTaskModalContainer({
             actualhrs: 0,
             memo: presetMemo,
             flat_rate: true,
+            ciecacode: hourstype,
             cost_center:
               bodyshop.md_responsibility_centers.defaults.costs[hourstype],
             productivehrs:
@@ -175,7 +177,10 @@ export function TimeTickeTaskModalContainer({
     <Modal
       destroyOnClose
       open={visible}
-      onCancel={() => toggleModalVisible()}
+      onCancel={() => {
+        toggleModalVisible();
+        form.resetFields();
+      }}
       width="80%"
       onOk={() => form.submit()}
     >
@@ -184,7 +189,6 @@ export function TimeTickeTaskModalContainer({
         form={form}
         layout="vertical"
         onFinish={handleFinish}
-        //  onFieldsChange={handleFieldsChange}
         initialValues={context}
       >
         <TimeTicketTaskModalComponent