From 6ca773050fc5931df7af18b98c8f7fb18b43ac1b Mon Sep 17 00:00:00 2001
From: Patrick Fic <snaptsoft@gmail.com>
Date: Tue, 25 Apr 2023 10:24:26 -0700
Subject: [PATCH] WIP Payroll Commit process.

---
 bodyshop_translations.babel                   | 180 +++++++++++++++++-
 .../shop-info/shop-info.rbac.component.jsx    |  12 ++
 .../time-ticket-list.component.jsx            |  16 +-
 .../time-ticket-task-modal.component.jsx      |  27 +--
 .../time-ticket-task-modal.container.jsx      |  20 +-
 .../time-ticket-tasks-presets.component.jsx   |   1 +
 .../tt-approvals-list.component.jsx           |   5 +-
 .../tt-approvals-list.container.jsx           |  44 +++--
 .../tt-approve-button.component.jsx           |  23 ++-
 client/src/graphql/jobs-lines.queries.js      |   3 +
 client/src/graphql/timetickets.queries.js     |  35 ++++
 client/src/graphql/tt-approvals.queries.js    |   7 +-
 client/src/translations/en_us/common.json     |  12 ++
 client/src/translations/es/common.json        |  12 ++
 client/src/translations/fr/common.json        |  12 ++
 15 files changed, 350 insertions(+), 59 deletions(-)

diff --git a/bodyshop_translations.babel b/bodyshop_translations.babel
index ecb15e1e8..3b4fff18d 100644
--- a/bodyshop_translations.babel
+++ b/bodyshop_translations.babel
@@ -1,4 +1,4 @@
-<babeledit_project version="1.2" be_version="2.7.1">
+<babeledit_project be_version="2.7.1" version="1.2">
     <!--
 
     BabelEdit project file
@@ -6898,6 +6898,27 @@
                                                             </translation>
                                                         </translations>
                                                     </concept_node>
+                                                    <concept_node>
+                                                        <name>editcommitted</name>
+                                                        <definition_loaded>false</definition_loaded>
+                                                        <description></description>
+                                                        <comment></comment>
+                                                        <default_text></default_text>
+                                                        <translations>
+                                                            <translation>
+                                                                <language>en-US</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>es-MX</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                            <translation>
+                                                                <language>fr-CA</language>
+                                                                <approved>false</approved>
+                                                            </translation>
+                                                        </translations>
+                                                    </concept_node>
                                                     <concept_node>
                                                         <name>enter</name>
                                                         <definition_loaded>false</definition_loaded>
@@ -7293,6 +7314,48 @@
                                                     </translation>
                                                 </translations>
                                             </concept_node>
+                                            <concept_node>
+                                                <name>invoiceexemptcode</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
+                                            <concept_node>
+                                                <name>itemexemptcode</name>
+                                                <definition_loaded>false</definition_loaded>
+                                                <description></description>
+                                                <comment></comment>
+                                                <default_text></default_text>
+                                                <translations>
+                                                    <translation>
+                                                        <language>en-US</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>es-MX</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                    <translation>
+                                                        <language>fr-CA</language>
+                                                        <approved>false</approved>
+                                                    </translation>
+                                                </translations>
+                                            </concept_node>
                                             <concept_node>
                                                 <name>la1</name>
                                                 <definition_loaded>false</definition_loaded>
@@ -26833,6 +26896,27 @@
                             <folder_node>
                                 <name>labels</name>
                                 <children>
+                                    <concept_node>
+                                        <name>act_price_ppc</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>actual_completion_inferred</name>
                                         <definition_loaded>false</definition_loaded>
@@ -29467,6 +29551,27 @@
                                             </concept_node>
                                         </children>
                                     </folder_node>
+                                    <concept_node>
+                                        <name>ppc</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>profileadjustments</name>
                                         <definition_loaded>false</definition_loaded>
@@ -44675,6 +44780,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>committed</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>cost_center</name>
                                         <definition_loaded>false</definition_loaded>
@@ -44759,6 +44885,27 @@
                                             </translation>
                                         </translations>
                                     </concept_node>
+                                    <concept_node>
+                                        <name>employee_team</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
                                     <concept_node>
                                         <name>flat_rate</name>
                                         <definition_loaded>false</definition_loaded>
@@ -47392,6 +47539,37 @@
                             </concept_node>
                         </children>
                     </folder_node>
+                    <folder_node>
+                        <name>tt_approvals</name>
+                        <children>
+                            <folder_node>
+                                <name>actions</name>
+                                <children>
+                                    <concept_node>
+                                        <name>approveselected</name>
+                                        <definition_loaded>false</definition_loaded>
+                                        <description></description>
+                                        <comment></comment>
+                                        <default_text></default_text>
+                                        <translations>
+                                            <translation>
+                                                <language>en-US</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>es-MX</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                            <translation>
+                                                <language>fr-CA</language>
+                                                <approved>false</approved>
+                                            </translation>
+                                        </translations>
+                                    </concept_node>
+                                </children>
+                            </folder_node>
+                        </children>
+                    </folder_node>
                     <folder_node>
                         <name>user</name>
                         <children>
diff --git a/client/src/components/shop-info/shop-info.rbac.component.jsx b/client/src/components/shop-info/shop-info.rbac.component.jsx
index 2a32cca54..315d1f5dd 100644
--- a/client/src/components/shop-info/shop-info.rbac.component.jsx
+++ b/client/src/components/shop-info/shop-info.rbac.component.jsx
@@ -532,6 +532,18 @@ export function ShopInfoRbacComponent({ form, bodyshop }) {
         >
           <InputNumber />
         </Form.Item>
+        <Form.Item
+          label={t("bodyshop.fields.rbac.timetickets.editcommitted")}
+          rules={[
+            {
+              required: true,
+              //message: t("general.validation.required"),
+            },
+          ]}
+          name={["md_rbac", "timetickets:editcommitted"]}
+        >
+          <InputNumber />
+        </Form.Item>
         <Form.Item
           label={t("bodyshop.fields.rbac.ttapprovals.view")}
           rules={[
diff --git a/client/src/components/time-ticket-list/time-ticket-list.component.jsx b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
index ba4aeda2f..6cc2e3e3d 100644
--- a/client/src/components/time-ticket-list/time-ticket-list.component.jsx
+++ b/client/src/components/time-ticket-list/time-ticket-list.component.jsx
@@ -1,5 +1,5 @@
 import { EditFilled } from "@ant-design/icons";
-import { Button, Card, Space, Table } from "antd";
+import { Button, Card, Checkbox, Space, Table } from "antd";
 import Dinero from "dinero.js";
 import moment from "moment";
 import React, { useMemo, useState } from "react";
@@ -62,6 +62,14 @@ export function TimeTicketList({
   }, [timetickets]);
 
   const columns = [
+    {
+      title: t("timetickets.fields.committed"),
+      dataIndex: "committed_at",
+      key: "committed_at",
+      render: (text, record) => (
+        <Checkbox disabled checked={record.committed_at} />
+      ),
+    },
     {
       title: t("timetickets.fields.date"),
       dataIndex: "date",
@@ -236,6 +244,11 @@ export function TimeTicketList({
                   timeticket: record,
                 }}
                 disabled={
+                  HasRbacAccess({
+                    bodyshop,
+                    authLevel: authLevel,
+                    action: "timetickets:editcommitted",
+                  }) &&
                   HasRbacAccess({
                     bodyshop,
                     authLevel: authLevel,
@@ -271,7 +284,6 @@ export function TimeTicketList({
           }
           <Button
             onClick={() => {
-              setTimeTicketTaskContext();
               setTimeTicketTaskContext({
                 actions: {},
                 context: { jobid: jobId },
diff --git a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx
index 0884b656a..5612931e1 100644
--- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.component.jsx
+++ b/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 (
diff --git a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx b/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx
index 1ae283124..cc8ae83a6 100644
--- a/client/src/components/time-ticket-task-modal/time-ticket-task-modal.container.jsx
+++ b/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
diff --git a/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx b/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx
index f88ba4d1a..05a845926 100644
--- a/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx
+++ b/client/src/components/time-ticket-tasks-presets/time-ticket-tasks-presets.component.jsx
@@ -15,6 +15,7 @@ export default function TimeTicketsTasksPresets({
         percent: preset.percent,
         hourstype: preset.hourstype,
       });
+
       calculateTimeTickets(preset.memo);
     }
   };
diff --git a/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx b/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx
index 9c1befc79..60628a394 100644
--- a/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx
+++ b/client/src/components/tt-approvals-list/tt-approvals-list.component.jsx
@@ -1,4 +1,4 @@
-import { EditFilled } from "@ant-design/icons";
+import { SyncOutlined, EditFilled } from "@ant-design/icons";
 import { Button, Card, Space, Table, Tag } from "antd";
 import Dinero from "dinero.js";
 import moment from "moment";
@@ -210,6 +210,9 @@ export function TtApprovalsListComponent({
             completedCallback={setSelectedTickets}
             refetch={refetch}
           />
+          <Button onClick={() => refetch()}>
+            <SyncOutlined />
+          </Button>
         </Space>
       }
     >
diff --git a/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx b/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx
index 0ef860fe5..2569605f9 100644
--- a/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx
+++ b/client/src/components/tt-approvals-list/tt-approvals-list.container.jsx
@@ -28,26 +28,29 @@ export function TimeTicketsContainer({
   const searchParams = queryString.parse(useLocation().search);
   const { page, sortcolumn, sortorder, search, searchObj } = searchParams;
 
-  const { loading, error, data } = useQuery(QUERY_ALL_TT_APPROVALS_PAGINATED, {
-    fetchPolicy: "network-only",
-    nextFetchPolicy: "network-only",
-    variables: {
-      search: search || "",
-      offset: page ? (page - 1) * 25 : 0,
-      limit: 25,
-      order: [
-        searchObj
-          ? JSON.parse(searchObj)
-          : {
-              [sortcolumn || "date"]: sortorder
-                ? sortorder === "descend"
-                  ? "desc"
-                  : "asc"
-                : "desc",
-            },
-      ],
-    },
-  });
+  const { loading, error, data, refetch } = useQuery(
+    QUERY_ALL_TT_APPROVALS_PAGINATED,
+    {
+      fetchPolicy: "network-only",
+      nextFetchPolicy: "network-only",
+      variables: {
+        search: search || "",
+        offset: page ? (page - 1) * 25 : 0,
+        limit: 25,
+        order: [
+          searchObj
+            ? JSON.parse(searchObj)
+            : {
+                [sortcolumn || "date"]: sortorder
+                  ? sortorder === "descend"
+                    ? "desc"
+                    : "asc"
+                  : "desc",
+              },
+        ],
+      },
+    }
+  );
 
   if (error) return <AlertComponent message={error.message} type="error" />;
 
@@ -56,6 +59,7 @@ export function TimeTicketsContainer({
       loading={loading}
       tt_approval_queue={data ? data.tt_approval_queue : []}
       total={data ? data.tt_approval_queue_aggregate.aggregate.count : 0}
+      refetch={refetch}
     />
   );
 }
diff --git a/client/src/components/tt-approve-button/tt-approve-button.component.jsx b/client/src/components/tt-approve-button/tt-approve-button.component.jsx
index a8ab89aa9..aa287abc2 100644
--- a/client/src/components/tt-approve-button/tt-approve-button.component.jsx
+++ b/client/src/components/tt-approve-button/tt-approve-button.component.jsx
@@ -1,13 +1,13 @@
 import { useApolloClient } from "@apollo/client";
 import { Button } from "antd";
+import _ from "lodash";
 import React, { useState } from "react";
 import { useTranslation } from "react-i18next";
 import { connect } from "react-redux";
 import { createStructuredSelector } from "reselect";
-import {
-  QUERY_TT_APPROVALS_BY_IDS,
-  UPDATE_TT_BY_APPROVAL,
-} from "../../graphql/tt-approvals.queries";
+import { INSERT_TIME_TICKET_AND_APPROVE } from "../../graphql/timetickets.queries";
+import { QUERY_TT_APPROVALS_BY_IDS } from "../../graphql/tt-approvals.queries";
+import moment from "moment";
 import {
   selectBodyshop,
   selectCurrentUser,
@@ -38,13 +38,18 @@ export function TtApproveButton({
       variables: { ids: selectedTickets },
     });
 
-    const { data: insertData } = await client.query({
-      query: UPDATE_TT_BY_APPROVAL,
+    const { data: insertData } = await client.mutate({
+      mutation: INSERT_TIME_TICKET_AND_APPROVE,
       variables: {
-        ttApprovalUpdates: data.map((tta) => ({
-          _set: {},
-          where: { id: { _eq: tta.id } },
+        timeTicketInput: data.tt_approval_queue.map((tta) => ({
+          ..._.omit(tta, ["id", "__typename"]),
+          ttapprovalqueueid: tta.id,
         })),
+        approvalIds: selectedTickets,
+        approvalUpdate: {
+          approved_at: moment(),
+          approved_by: currentUser.email,
+        },
       },
     });
 
diff --git a/client/src/graphql/jobs-lines.queries.js b/client/src/graphql/jobs-lines.queries.js
index 26e46c470..03b3a3075 100644
--- a/client/src/graphql/jobs-lines.queries.js
+++ b/client/src/graphql/jobs-lines.queries.js
@@ -51,6 +51,7 @@ export const GET_LINE_TICKET_BY_PK = gql`
       op_code_desc
       convertedtolbr
       convertedtolbr_data
+    
     }
     timetickets(where: { jobid: { _eq: $id } }) {
       actualhrs
@@ -65,6 +66,8 @@ export const GET_LINE_TICKET_BY_PK = gql`
       clockon
       clockoff
       rate
+      committed_at
+      committed_by
       employee {
         id
         first_name
diff --git a/client/src/graphql/timetickets.queries.js b/client/src/graphql/timetickets.queries.js
index fd593a003..88c710a2b 100644
--- a/client/src/graphql/timetickets.queries.js
+++ b/client/src/graphql/timetickets.queries.js
@@ -83,6 +83,8 @@ export const QUERY_TIME_TICKETS_IN_RANGE_SB = gql`
       productivehrs
       memo
       jobid
+      committed_at
+      committed_by
       flat_rate
       job {
         id
@@ -149,6 +151,39 @@ export const INSERT_NEW_TIME_TICKET = gql`
   }
 `;
 
+export const INSERT_TIME_TICKET_AND_APPROVE = gql`
+  mutation INSERT_TIME_TICKET_AND_APPROVE(
+    $timeTicketInput: [timetickets_insert_input!]!
+    $approvalIds: [uuid!]!
+    $approvalUpdate: tt_approval_queue_set_input
+  ) {
+    insert_timetickets(objects: $timeTicketInput) {
+      returning {
+        id
+        clockon
+        clockoff
+        employeeid
+        productivehrs
+        actualhrs
+        ciecacode
+        date
+        memo
+        flat_rate
+      }
+    }
+    update_tt_approval_queue(
+      where: { id: { _in: $approvalIds } }
+      _set: $approvalUpdate
+    ) {
+      returning {
+        id
+        approved_at
+        approved_at
+      }
+    }
+  }
+`;
+
 export const UPDATE_TIME_TICKET = gql`
   mutation UPDATE_TIME_TICKET(
     $timeticketId: uuid!
diff --git a/client/src/graphql/tt-approvals.queries.js b/client/src/graphql/tt-approvals.queries.js
index 48540d935..7cf4f30c3 100644
--- a/client/src/graphql/tt-approvals.queries.js
+++ b/client/src/graphql/tt-approvals.queries.js
@@ -6,7 +6,12 @@ export const QUERY_ALL_TT_APPROVALS_PAGINATED = gql`
     $limit: Int
     $order: [tt_approval_queue_order_by!]!
   ) {
-    tt_approval_queue(offset: $offset, limit: $limit, order_by: $order) {
+    tt_approval_queue(
+      offset: $offset
+      limit: $limit
+      order_by: $order
+      where: { approved_at: { _is_null: true } }
+    ) {
       id
       jobid
       bodyshopid
diff --git a/client/src/translations/en_us/common.json b/client/src/translations/en_us/common.json
index 400a413e0..b158ec418 100644
--- a/client/src/translations/en_us/common.json
+++ b/client/src/translations/en_us/common.json
@@ -435,6 +435,7 @@
 					},
 					"timetickets": {
 						"edit": "Time Tickets -> Edit",
+						"editcommitted": "Time Tickets -> Edit Committed",
 						"enter": "Time Tickets -> Enter",
 						"list": "Time Tickets -> List",
 						"shiftedit": "Time Tickets -> Shift Edit"
@@ -460,6 +461,8 @@
 					"federal_tax": "Federal Tax",
 					"federal_tax_itc": "Federal Tax Credit",
 					"gst_override": "GST Override Account #",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "LA1",
 					"la2": "LA2",
 					"la3": "LA3",
@@ -1594,6 +1597,7 @@
 				"scheddates": "Schedule Dates"
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "$t(jobs.fields.actual_completion) inferred using $t(jobs.fields.scheduled_completion).",
 				"actual_delivery_inferred": "$t(jobs.fields.actual_delivery) inferred using $t(jobs.fields.scheduled_delivery).",
 				"actual_in_inferred": "$t(jobs.fields.actual_in) inferred using $t(jobs.fields.scheduled_in).",
@@ -1730,6 +1734,7 @@
 					"partstotal": "This is the total of all parts and sublet amounts on the vehicle (some of these may require an in-house invoice).<br/>\nItems such as shop and paint materials, labor online lines, etc. are not included in this total.",
 					"totalreturns": "The total <b>retail</b> amount of returns created for this job."
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "Line Item Adjustment",
 				"rates": "Rates",
@@ -2648,10 +2653,12 @@
 				"clockhours": "Clock Hours",
 				"clockoff": "Clock Off",
 				"clockon": "Clocked In",
+				"committed": "Committed",
 				"cost_center": "Cost Center",
 				"date": "Ticket Date",
 				"efficiency": "Efficiency",
 				"employee": "Employee",
+				"employee_team": "Employee Team",
 				"flat_rate": "Flat Rate?",
 				"memo": "Memo",
 				"productivehrs": "Productive Hours",
@@ -2788,6 +2795,11 @@
 			"vehicledetail": "Vehicle Details {{vehicle}} | $t(titles.app)",
 			"vehicles": "All Vehicles | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": "Approve Selected"
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "Change Password",
diff --git a/client/src/translations/es/common.json b/client/src/translations/es/common.json
index 9184f2237..5d7a7bf2e 100644
--- a/client/src/translations/es/common.json
+++ b/client/src/translations/es/common.json
@@ -435,6 +435,7 @@
 					},
 					"timetickets": {
 						"edit": "",
+						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
@@ -460,6 +461,8 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -1594,6 +1597,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1730,6 +1734,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Tarifas",
@@ -2648,10 +2653,12 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
+				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2788,6 +2795,11 @@
 			"vehicledetail": "Detalles del vehículo {{vehicle}} | $t(titles.app)",
 			"vehicles": "Todos los vehiculos | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": ""
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "",
diff --git a/client/src/translations/fr/common.json b/client/src/translations/fr/common.json
index 5481a9dc5..f6a56ac38 100644
--- a/client/src/translations/fr/common.json
+++ b/client/src/translations/fr/common.json
@@ -435,6 +435,7 @@
 					},
 					"timetickets": {
 						"edit": "",
+						"editcommitted": "",
 						"enter": "",
 						"list": "",
 						"shiftedit": ""
@@ -460,6 +461,8 @@
 					"federal_tax": "",
 					"federal_tax_itc": "",
 					"gst_override": "",
+					"invoiceexemptcode": "",
+					"itemexemptcode": "",
 					"la1": "",
 					"la2": "",
 					"la3": "",
@@ -1594,6 +1597,7 @@
 				"scheddates": ""
 			},
 			"labels": {
+				"act_price_ppc": "",
 				"actual_completion_inferred": "",
 				"actual_delivery_inferred": "",
 				"actual_in_inferred": "",
@@ -1730,6 +1734,7 @@
 					"partstotal": "",
 					"totalreturns": ""
 				},
+				"ppc": "",
 				"profileadjustments": "",
 				"prt_dsmk_total": "",
 				"rates": "Les taux",
@@ -2648,10 +2653,12 @@
 				"clockhours": "",
 				"clockoff": "",
 				"clockon": "",
+				"committed": "",
 				"cost_center": "",
 				"date": "",
 				"efficiency": "",
 				"employee": "",
+				"employee_team": "",
 				"flat_rate": "",
 				"memo": "",
 				"productivehrs": "",
@@ -2788,6 +2795,11 @@
 			"vehicledetail": "Détails du véhicule {{vehicle} | $t(titles.app)",
 			"vehicles": "Tous les véhicules | $t(titles.app)"
 		},
+		"tt_approvals": {
+			"actions": {
+				"approveselected": ""
+			}
+		},
 		"user": {
 			"actions": {
 				"changepassword": "",