From d5f3105341faadcdd8667b9456173c290777d1a7 Mon Sep 17 00:00:00 2001
From: Patrick Fic <>
Date: Mon, 20 Sep 2021 12:02:37 -0700
Subject: [PATCH] IO-1254 Add PO Number

---
 .../jobs-detail-header.component.jsx                  |  3 +++
 .../jobs-list-paginated.component.jsx                 | 11 ++++-------
 .../src/components/jobs-list/jobs-list.component.jsx  |  4 ++++
 client/src/graphql/jobs.queries.js                    |  5 ++++-
 4 files changed, 15 insertions(+), 8 deletions(-)

diff --git a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
index 83ade9d5c..bb9afbf51 100644
--- a/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
+++ b/client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
@@ -76,6 +76,9 @@ export function JobsDetailHeader({ job, bodyshop, disabled }) {
               {job.ins_co_nm}
             </DataLabel>
             <DataLabel label={t("jobs.fields.clm_no")}>{job.clm_no}</DataLabel>
+            <DataLabel label={t("jobs.fields.ponumber")} hideIfNull>
+              {job.po_number}
+            </DataLabel>
             <DataLabel label={t("jobs.fields.repairtotal")}>
               <CurrencyFormatter>{job.clm_total}</CurrencyFormatter>
               <span style={{ margin: "0rem .5rem" }}>/</span>
diff --git a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
index 6c186b6c9..18cd7b105 100644
--- a/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
+++ b/client/src/components/jobs-list-paginated/jobs-list-paginated.component.jsx
@@ -130,13 +130,10 @@ export function JobsList({ bodyshop, refetch, loading, jobs, total }) {
       ellipsis: true,
       sorter: true, //(a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder: sortcolumn === "clm_no" && sortorder,
-      render: (text, record) => {
-        return record.clm_no ? (
-          <span>{record.clm_no}</span>
-        ) : (
-          t("general.labels.unknown")
-        );
-      },
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
     },
     {
       title: t("jobs.fields.ins_co_nm"),
diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx
index 04fb749f2..fe9077ae9 100644
--- a/client/src/components/jobs-list/jobs-list.component.jsx
+++ b/client/src/components/jobs-list/jobs-list.component.jsx
@@ -208,6 +208,10 @@ export function JobsList({ bodyshop }) {
       sorter: (a, b) => alphaSort(a.clm_no, b.clm_no),
       sortOrder:
         state.sortedInfo.columnKey === "clm_no" && state.sortedInfo.order,
+      render: (text, record) =>
+        `${record.clm_no || ""}${
+          record.po_number ? ` (PO: ${record.po_number})` : ""
+        }`,
     },
     {
       title: t("jobs.fields.ins_co_nm"),
diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js
index ed7307e45..072f37e8c 100644
--- a/client/src/graphql/jobs.queries.js
+++ b/client/src/graphql/jobs.queries.js
@@ -31,6 +31,7 @@ export const QUERY_ALL_ACTIVE_JOBS = gql`
       id
       ins_co_nm
       clm_no
+      po_number
       clm_total
       owner_owing
       ro_number
@@ -362,6 +363,7 @@ export const GET_JOB_BY_PK = gql`
       converted
       lbr_adjustments
       ro_number
+      po_number
       clm_total
       inproduction
       vehicleid
@@ -715,7 +717,7 @@ export const QUERY_JOB_CARD_DETAILS = gql`
       actual_completion
       actual_delivery
       actual_in
-
+      po_number
       id
       ins_co_nm
       ins_ct_fn
@@ -1660,6 +1662,7 @@ export const QUERY_ALL_JOBS_PAGINATED_STATUS_FILTERED = gql`
       clm_total
       owner_owing
       ro_number
+      po_number
       scheduled_completion
       scheduled_in
       scheduled_delivery