From 5aceac630f2583d18c4b1f47242b1f5de14d8915 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Tue, 27 Apr 2021 18:12:50 -0700
Subject: [PATCH] IO-936 Job Costing Sorting

---
 .../job-costing-parts-table.component.jsx     | 15 ++++++++---
 .../time-ticket-modal.component.jsx           |  3 ++-
 .../time-ticket-modal.container.jsx           | 25 ++++++++++++++++++-
 client/src/utils/TemplateConstants.js         |  9 +++++++
 4 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
index 6e80f1fad..e18a9692e 100644
--- a/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
+++ b/client/src/components/job-costing-parts-table/job-costing-parts-table.component.jsx
@@ -28,7 +28,8 @@ export default function JobCostingPartsTable({ data, summaryData }) {
       title: t("jobs.labels.sales"),
       dataIndex: "sales",
       key: "sales",
-      sorter: (a, b) => alphaSort(a.sales, b.sales),
+      sorter: (a, b) =>
+        parseFloat(a.sales.substring(1)) - parseFloat(b.sales.substring(1)),
       sortOrder:
         state.sortedInfo.columnKey === "sales" && state.sortedInfo.order,
     },
@@ -37,7 +38,8 @@ export default function JobCostingPartsTable({ data, summaryData }) {
       title: t("jobs.labels.costs"),
       dataIndex: "costs",
       key: "costs",
-      sorter: (a, b) => a.costs - b.costs,
+      sorter: (a, b) =>
+        parseFloat(a.costs.substring(1)) - parseFloat(b.costs.substring(1)),
       sortOrder:
         state.sortedInfo.columnKey === "costs" && state.sortedInfo.order,
     },
@@ -46,7 +48,10 @@ export default function JobCostingPartsTable({ data, summaryData }) {
       title: t("jobs.labels.gpdollars"),
       dataIndex: "gpdollars",
       key: "gpdollars",
-      sorter: (a, b) => a.gpdollars - b.gpdollars,
+      sorter: (a, b) =>
+        parseFloat(a.gpdollars.substring(1)) -
+        parseFloat(b.gpdollars.substring(1)),
+
       sortOrder:
         state.sortedInfo.columnKey === "gpdollars" && state.sortedInfo.order,
     },
@@ -54,7 +59,9 @@ export default function JobCostingPartsTable({ data, summaryData }) {
       title: t("jobs.labels.gppercent"),
       dataIndex: "gppercent",
       key: "gppercent",
-      sorter: (a, b) => a.gppercent - b.gppercent,
+      sorter: (a, b) =>
+        parseFloat(a.gppercent.slice(0, -1) || 0) -
+        parseFloat(b.gppercent.slice(0, -1) || 0),
       sortOrder:
         state.sortedInfo.columnKey === "gppercent" && state.sortedInfo.order,
     },
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 6dac0a3a8..32749484e 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
@@ -39,7 +39,7 @@ export function TimeTicketModalComponent({
 
   return (
     <div>
-      <LayoutFormRow grow>
+      <LayoutFormRow grow noDivider>
         <Form.Item shouldUpdate>
           {() => (
             <Form.Item
@@ -201,6 +201,7 @@ export function LaborAllocationContainer({ jobid }) {
         joblines={lineTicketData.joblines}
         timetickets={lineTicketData.timetickets}
       />
+
       <TimeTicketList
         loading={loading}
         timetickets={lineTicketData.timetickets}
diff --git a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
index 56289fe6e..4918f8716 100644
--- a/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
+++ b/client/src/components/time-ticket-modal/time-ticket-modal.container.jsx
@@ -1,5 +1,5 @@
 import { useMutation, useQuery } from "@apollo/client";
-import { Button, Form, Modal, notification } from "antd";
+import { Button, Form, Modal, notification, PageHeader, Space } from "antd";
 import moment from "moment";
 import React, { useEffect, useState } from "react";
 import { useTranslation } from "react-i18next";
@@ -212,6 +212,29 @@ export function TimeTicketModalContainer({
         }
         onValuesChange={handleFieldsChange}
       >
+        <PageHeader
+          extra={
+            <Space>
+              <Button onClick={handleCancel}>
+                {t("general.actions.cancel")}
+              </Button>
+              <Button onClick={() => form.submit()}>
+                {t("general.actions.save")}
+              </Button>
+              {timeTicketModal.context && timeTicketModal.context.id ? null : (
+                <Button
+                  type="primary"
+                  htmlType="submit"
+                  onClick={() => {
+                    setEnterAgain(true);
+                  }}
+                >
+                  {t("general.actions.saveandnew")}
+                </Button>
+              )}
+            </Space>
+          }
+        />
         <TimeTicketModalComponent
           form={form}
           employeeAutoCompleteOptions={
diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js
index de4a61454..4aa6297a7 100644
--- a/client/src/utils/TemplateConstants.js
+++ b/client/src/utils/TemplateConstants.js
@@ -20,6 +20,15 @@ export const TemplateList = (type, context) => {
             disabled: false,
             group: "authorization",
           },
+
+          fippa_authorization: {
+            title: i18n.t("printcenter.jobs.fippa_authorization"),
+            description: "CASL Authorization",
+            subject: i18n.t("printcenter.jobs.fippa_authorization"),
+            key: "fippa_authorization",
+            disabled: false,
+            group: "authorization",
+          },
           diagnostic_authorization: {
             title: i18n.t("printcenter.jobs.diagnostic_authorization"),
             description: "Diagnostic Authorization",