From 6106b435a0181e1efcaa46793b41f0d070214c83 Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Thu, 13 Mar 2025 13:59:44 -0700 Subject: [PATCH] Auto filter Claims Clerk lines & adjust rules. --- electron/claims-clerk/claims-clerk.js | 55 ++++++++++--------- package.json | 2 +- .../jobs-lines-table.molecule.jsx | 9 +-- 3 files changed, 34 insertions(+), 32 deletions(-) diff --git a/electron/claims-clerk/claims-clerk.js b/electron/claims-clerk/claims-clerk.js index adf6cfc..65aac85 100644 --- a/electron/claims-clerk/claims-clerk.js +++ b/electron/claims-clerk/claims-clerk.js @@ -15,38 +15,40 @@ exports.claimsClerk = ({ jobline, joblines }) => { }; const rules = [ - ({ jobline, joblines }) => { - //Upgrade 1 - if ( - jobline.db_ref === "900500" && - jobline.db_price === 0 && - jobline.db_hrs === 0 && - jobline.mod_lb_hrs !== jobline.db_hrs - ) { - return { - key: "Manual Line", - alert: `
- Manually entered line detected. - -
` - }; - } + //Disabling per discussion with Norm. + // ({ jobline, joblines }) => { + // //Upgrade 1 + // if ( + // jobline.db_ref === "900500" && + // jobline.db_price === 0 && + // jobline.db_hrs === 0 && + // jobline.mod_lb_hrs !== jobline.db_hrs + // ) { + // return { + // key: "Manual Line", + // alert: `
+ // Manually entered line detected. + // + //
` + // }; + // } - return null; - }, + // return null; + // }, ({ jobline, joblines }) => { //Upgrade 2 if ( - joblines.db_hrs !== 0 && + jobline.db_hrs !== 0 && jobline.mod_lb_hrs !== jobline.db_hrs && jobline.lbr_inc === false && - jobline.lbr_hrs_j === true && - jobline.lbr_op !== "OP9" && - jobline.lbr_op !== "OP14" + jobline.lbr_hrs_j === true + + // jobline.lbr_op !== "OP9" && + // jobline.lbr_op !== "OP14" ) { return { key: "Manual labor Time Change", @@ -138,7 +140,6 @@ const rules = [ //Need to find a 900501 line that is right after it indicating it has the words pricematch const lineIndex = joblines.findIndex((line) => line.line_no === jobline.line_no); const nextLine = joblines[lineIndex + 1]; - console.log("*** ~ nextLine:", nextLine); if (!nextLine?.line_desc.includes("price")) { return { diff --git a/package.json b/package.json index 9bdfcb3..0c71c39 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "ImEX RPS", "author": "ImEX Systems Inc. ", "description": "ImEX RPS", - "version": "1.4.0-alpha.3", + "version": "1.4.0-alpha.4", "main": "electron/main.js", "homepage": "./", "dependencies": { 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 b2365cb..a1ca2a2 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 @@ -8,12 +8,12 @@ import ErrorResultAtom from "../../atoms/error-result/error-result.atom"; import IgnoreJobLine from "../../atoms/ignore-job-line/ignore-job-line.atom"; import partTypeConverterAtom from "../../atoms/part-type-converter/part-type-converter.atom"; import PriceDiffPcFormatterAtom from "../../atoms/price-diff-pc-formatter/price-diff-pc-formatter.atom"; -import { render } from "sass"; + const { ipcRenderer } = window; export default function JobLinesTableMolecule({ loading, job }) { const [searchText, setSearchText] = useState(""); - const [filters, setFilters] = useState({ ignore: ["false"] }); + const [filters, setFilters] = useState({ ignore: ["false", "ai"] }); if (!job) { return ; @@ -115,11 +115,12 @@ export default function JobLinesTableMolecule({ loading, job }) { key: "ignore", filters: [ { text: "Eligible for RPS Calculation", value: false }, - { text: "Ineligible for RPS Calculation", value: true } + { text: "Ineligible for RPS Calculation", value: true }, + { text: "Lines with identified issues", value: "ai" } ], width: "5%", filteredValue: filters.ignore || null, - onFilter: (value, record) => value === record.ignore, + onFilter: (value, record) => (value === "ai" ? record.alerts?.length > 0 : value === record.ignore), render: (text, record) => } ];