From 8e86abc25d217f29e303889ca3686a022bf1fa78 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 29 May 2025 08:51:05 -0700 Subject: [PATCH] Remove CC AI, add Variance to report screen. --- electron/decoder/decoder.js | 4 +- .../jobs-lines-table.molecule.jsx | 27 +++++++------- .../reporting-jobs-list.molecule.jsx | 37 ++++++++++++++----- .../jobs-detail/jobs-detail.organism.jsx | 4 +- 4 files changed, 47 insertions(+), 25 deletions(-) diff --git a/electron/decoder/decoder.js b/electron/decoder/decoder.js index 57cb95c..23f2c3f 100644 --- a/electron/decoder/decoder.js +++ b/electron/decoder/decoder.js @@ -379,8 +379,8 @@ async function DecodeLinFile(extensionlessFilePath, close_date) { jobline = V3Ruleset(jobline, joblines); break; } - - jobline.alerts = claimsClerk({ jobline, joblines }); + //2025-05-27 Commenting out to prepare release without claims clerk. + // jobline.alerts = claimsClerk({ jobline, joblines }); return jobline; }); diff --git a/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx b/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx index a1ca2a2..bc9aac0 100644 --- a/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx +++ b/src/components/molecules/jobs-lines-table/jobs-lines-table.molecule.jsx @@ -40,18 +40,19 @@ export default function JobLinesTableMolecule({ loading, job }) { key: "line_desc", width: "25%", sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), - render: (text, record) => ( - - {record.line_desc} - {record.alerts && - record.alerts.length > 0 && - record.alerts.map((alert) => ( - - {alert.key} - - ))} - - ) + //2025-05-27 Removing CC AI + // render: (text, record) => ( + // + // {record.line_desc} + // {record.alerts && + // record.alerts.length > 0 && + // record.alerts.map((alert) => ( + // + // {alert.key} + // + // ))} + // + // ) }, { title: "Part Type", @@ -116,7 +117,7 @@ export default function JobLinesTableMolecule({ loading, job }) { filters: [ { text: "Eligible for RPS Calculation", value: false }, { text: "Ineligible for RPS Calculation", value: true }, - { text: "Lines with identified issues", value: "ai" } + // { text: "Lines with identified issues", value: "ai" } ], width: "5%", filteredValue: filters.ignore || null, diff --git a/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx b/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx index fb6d869..ed8c9f9 100644 --- a/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx +++ b/src/components/molecules/reporting-jobs-list/reporting-jobs-list.molecule.jsx @@ -55,11 +55,13 @@ export function ReportingJobsListMolecule({ {text} - {record.alerts && record.alerts.length > 0 && ( - - - - )} + {false && + record.alerts && + record.alerts.length > 0 && ( //2025-05-27 Removing CC AI + + + + )} @@ -119,6 +121,23 @@ export function ReportingJobsListMolecule({ sorter: (a, b) => a.group_verified - b.group_verified, render: (text, record) => }, + { + title: "$ Variance", + dataIndex: "jobRpsDollarsVariance", + key: "jobRpsDollarsVariance", + render: (text, record) => { + const variance = record.jobRpsDollars.subtract(record.expectedRpsDollars); + return ( + 0 ? "seagreen" : "tomato" + }} + > + {variance.toFormat()} + + ); + } + }, { title: "$ (Act./Target)", dataIndex: "jobRpsDollars", @@ -212,10 +231,10 @@ export function ReportingJobsListMolecule({ size="small" pagination={false} dataSource={data} - expandable={{ - expandedRowRender: (record) => , - rowExpandable: (record) => record.alerts && record.alerts.length > 0 - }} + // expandable={{ + // expandedRowRender: (record) => , + // rowExpandable: (record) => record.alerts && record.alerts.length > 0 + // }} scroll={{ x: true }} diff --git a/src/components/organisms/jobs-detail/jobs-detail.organism.jsx b/src/components/organisms/jobs-detail/jobs-detail.organism.jsx index 5c2934a..71e5cf4 100644 --- a/src/components/organisms/jobs-detail/jobs-detail.organism.jsx +++ b/src/components/organisms/jobs-detail/jobs-detail.organism.jsx @@ -66,7 +66,9 @@ export function JobsDetailOrganism({ selectedJobId, setSelectedJobTargetPc }) { - + {/* + //2025-05-27 Removing CC AI + */}