diff --git a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
index bbb09178c..90dc234d3 100644
--- a/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
+++ b/client/src/components/labor-allocations-table/labor-allocations-table.component.jsx
@@ -1,12 +1,13 @@
import { EditFilled } from "@ant-design/icons";
import { Card, Col, Row, Space, Table } from "antd";
import _ from "lodash";
-import React, { useEffect, useState } from "react";
+import React, { useEffect, useMemo, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectTechnician } from "../../redux/tech/tech.selectors";
import { selectBodyshop } from "../../redux/user/user.selectors";
+import CurrencyFormatter from "../../utils/CurrencyFormatter";
import { alphaSort } from "../../utils/sorters";
import LaborAllocationsAdjustmentEdit from "../labor-allocations-adjustment-edit/labor-allocations-adjustment-edit.component";
import "./labor-allocations-table.styles.scss";
@@ -44,10 +45,14 @@ export function LaborAllocationsTable({
if (!jobId) setTotals([]);
}, [joblines, timetickets, bodyshop, adjustments, jobId]);
- // const convertedLines = useMemo(
- // () => joblines && joblines.filter((j) => j.convertedtolbr),
- // [joblines]
- // );
+ const convertedLines = useMemo(
+ () => joblines && joblines.filter((j) => j.convertedtolbr),
+ [joblines]
+ );
+ console.log(
+ "🚀 ~ file: labor-allocations-table.component.jsx ~ line 52 ~ convertedLines",
+ convertedLines
+ );
const columns = [
{
@@ -120,52 +125,68 @@ export function LaborAllocationsTable({
),
},
];
- // const convertedTableCols = [
- // {
- // title: t("joblines.fields.line_desc"),
- // dataIndex: "line_desc",
- // key: "line_desc",
- // ellipsis: true,
- // },
- // {
- // title: t("joblines.fields.op_code_desc"),
- // dataIndex: "op_code_desc",
- // key: "op_code_desc",
- // ellipsis: true,
- // render: (text, record) =>
- // `${record.op_code_desc || ""}${
- // record.alt_partm ? ` ${record.alt_partm}` : ""
- // }`,
- // },
+ const convertedTableCols = [
+ {
+ title: t("joblines.fields.line_desc"),
+ dataIndex: "line_desc",
+ key: "line_desc",
+ ellipsis: true,
+ },
+ {
+ title: t("joblines.fields.op_code_desc"),
+ dataIndex: "op_code_desc",
+ key: "op_code_desc",
+ ellipsis: true,
+ render: (text, record) =>
+ `${record.op_code_desc || ""}${
+ record.alt_partm ? ` ${record.alt_partm}` : ""
+ }`,
+ },
- // {
- // title: t("joblines.fields.act_price"),
- // dataIndex: "act_price",
- // key: "act_price",
- // ellipsis: true,
- // render: (text, record) => (
- // <>
- //