diff --git a/electron/audit/audit-ipc.js b/electron/audit/audit-ipc.js
index 5319720..e209a74 100644
--- a/electron/audit/audit-ipc.js
+++ b/electron/audit/audit-ipc.js
@@ -6,47 +6,54 @@ const _ = require("lodash");
const { store } = require("../electron-store");
const path = require("path");
var xlsx = require("node-xlsx");
+const log = require("electron-log");
-ipcMain.on(ipcTypes.default.audit.toMain.browseForFile, async (event, arg) => {
+ipcMain.on(ipcTypes.default.audit.toMain.browseForFile, async (event, { sheetName }) => {
const result = await dialog.showOpenDialog(mainWindow, {
filters: [{ extensions: ["xls", "xlsx"], name: "Excel Files" }],
properties: ["openFile"]
});
if (!result.canceled) {
- store.set("auditFilePath", result.filePaths);
- var obj = xlsx.parse(result.filePaths[0], { cellDates: true }); // parses a file
+ try {
+ store.set("auditFilePath", result.filePaths);
+ var obj = xlsx.parse(result.filePaths[0], { cellDates: true }); // parses a file
- const detailSheet = obj.find((sheet) => sheet.name === "Shop RPS Claim Detail");
- const claimsArray = [];
- let foundHeaderRow, foundTotalRow;
- detailSheet.data.forEach((line) => {
- //Check the first element. If it's claim number, we have our header row. the next one is important.
- if (!foundHeaderRow && line[0] === "Claim Number") {
- foundHeaderRow = true;
- } else if (foundHeaderRow && !foundTotalRow && line[0] && line[0] !== "Grand Total") {
- //Add it to the array
- const row = {
- clm_no: line[0],
- close_date: line[1],
- v_model_yr: line[3],
- v_make_desc: line[4],
- v_model: line[5],
- under20kmiles: line[6],
- pan_total: line[7],
- paa_total: line[8],
- pal_total: line[9],
- pam_total: line[10],
- eligible_db_price_total: Math.round((line[11] + Number.EPSILON) * 100) / 100,
- eligible_act_price_total: Math.round((line[12] + Number.EPSILON) * 100) / 100,
- expected_rps_dollars: Math.round((line[15] + Number.EPSILON) * 100) / 100,
- actual_rps_dollars: Math.round((line[16] + Number.EPSILON) * 100) / 100
- };
- claimsArray.push(row);
- } else {
- // foundTotalRow = true;
- }
- });
+ const detailSheet = obj.find((sheet) => sheet.name === sheetName);
+ const claimsArray = [];
+ let foundHeaderRow, foundTotalRow;
+ detailSheet.data.forEach((line) => {
+ //Check the first element. If it's claim number, we have our header row. the next one is important.
+ if (!foundHeaderRow && line[0] === "Claim Number") {
+ foundHeaderRow = true;
+ } else if (foundHeaderRow && !foundTotalRow && line[0] && line[0] !== "Grand Total") {
+ //Add it to the array
+ const row = {
+ clm_no: line[0],
+ close_date: line[1],
+ v_model_yr: line[3],
+ v_make_desc: line[4],
+ v_model: line[5],
+ under20kmiles: line[6],
+ pan_total: line[7],
+ paa_total: line[8],
+ pal_total: line[9],
+ pam_total: line[10],
+ eligible_db_price_total: Math.round((line[11] + Number.EPSILON) * 100) / 100,
+ eligible_act_price_total: Math.round((line[12] + Number.EPSILON) * 100) / 100,
+ expected_rps_dollars: Math.round((line[15] + Number.EPSILON) * 100) / 100,
+ actual_rps_dollars: Math.round((line[16] + Number.EPSILON) * 100) / 100
+ };
+ claimsArray.push(row);
+ } else {
+ // foundTotalRow = true;
+ }
+ });
- event.sender.send(ipcTypes.default.audit.toRenderer.auditClaimsArray, claimsArray);
+ event.sender.send(ipcTypes.default.audit.toRenderer.auditClaimsArray, claimsArray);
+ } catch (error) {
+ console.log("ot some sort of err", error);
+ log.error("Error when trying to read audit xlsx file", error);
+ event.sender.send(ipcTypes.default.audit.toRenderer.auditError, error.message);
+ }
}
});
diff --git a/src/components/organisms/audit-results/audit-results.organism.jsx b/src/components/organisms/audit-results/audit-results.organism.jsx
index df17852..9dad2d9 100644
--- a/src/components/organisms/audit-results/audit-results.organism.jsx
+++ b/src/components/organisms/audit-results/audit-results.organism.jsx
@@ -1,4 +1,4 @@
-import { Card, Col, Row, Table } from "antd";
+import { Card, Col, Divider, Space, Table, Tooltip } from "antd";
import React from "react";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
@@ -6,6 +6,7 @@ import { setSelectedJobTargetPc } from "../../../redux/application/application.a
import { selectAuditData } from "../../../redux/reporting/reporting.selectors";
import { DateFormat } from "../../../util/constants";
import dayjs from "../../../util/day";
+import Dinero from "dinero.js";
const mapStateToProps = createStructuredSelector({
selectAuditData: selectAuditData
@@ -16,22 +17,22 @@ const mapDispatchToProps = (dispatch) => ({
});
export function AuditResultsOrganism({ selectAuditData }) {
- console.log("🚀 ~ AuditResultsOrganism ~ selectAuditData:", selectAuditData);
const missingColumns = [
- { key: "clm_no", title: "Claim No.", dataIndex: "clm_no" },
+ { key: "clm_no", width: "20%", title: "Claim No.", dataIndex: "clm_no" },
{
key: "close_date",
+ width: "20%",
title: "[RPS] R4P",
dataIndex: "close_date",
render: (text, record) => dayjs(record.close_date).format(DateFormat)
},
- { key: "v_model_yr", title: "Model Year", dataIndex: "v_model_yr" },
- { key: "v_make_desc", title: "Make", dataIndex: "v_make_desc" },
- { key: "v_model", title: "Model", dataIndex: "v_model" }
+ { key: "v_model_yr", width: "20%", title: "Model Year", dataIndex: "v_model_yr" },
+ { key: "v_make_desc", width: "20%", title: "Make", dataIndex: "v_make_desc" },
+ { key: "v_model", width: "20%", title: "Model", dataIndex: "v_model" }
];
const mismatchColumns = [
- { key: "clm_no", title: "Claim No.", dataIndex: ["rps", "clm_no"] },
+ { key: "clm_no", width: "12%", title: "Claim No.", dataIndex: ["rps", "clm_no"] },
{
key: "close_date",
title: "[RPS] R4P",
@@ -40,53 +41,66 @@ export function AuditResultsOrganism({ selectAuditData }) {
},
{
key: "close_date_audit",
+ width: "12%",
title: "[Audit] R4P",
dataIndex: "close_date_audit",
render: (text, record) => dayjs(record.audit.close_date).format(DateFormat)
},
- { key: "v_model_yr", title: "Model Year", dataIndex: ["audit", "v_model_yr"] },
- { key: "v_make_desc", title: "Make", dataIndex: ["audit", "v_make_desc"] },
- { key: "v_model", title: "Model", dataIndex: ["audit", "v_model"] },
+ { key: "v_model_yr", width: "12%", title: "Model Year", dataIndex: ["audit", "v_model_yr"] },
+ { key: "v_make_desc", width: "12%", title: "Make", dataIndex: ["audit", "v_make_desc"] },
+ { key: "v_model", width: "12%", title: "Model", dataIndex: ["audit", "v_model"] },
{
key: "expected_rps",
- title: "[RPS] Expected",
+ width: "12%",
+ title: "Expected RPS",
dataIndex: ["audit", "expectedRpsDollars"],
- render: (text, record) => record.rps.expectedRpsDollars.toFormat()
+ render: (text, record) => (
+ }>
+ {record.rps.expectedRpsDollars.toFormat()}
+
+ {Dinero({ amount: Math.round(record.audit.expected_rps_dollars * 100) }).toFormat()}
+
+
+ )
},
- { key: "expected_audit", title: "[AUDIT] Expected", dataIndex: ["audit", "expected_rps_dollars"] },
{
key: "actual_rps",
- title: "[RPS] Actual",
+ width: "12%",
+ title: " Actual RPS",
dataIndex: ["audit", "jobRpsDollars"],
- render: (text, record) => record.rps.jobRpsDollars.toFormat()
- },
- { key: "actual_audit", title: "[Audit] Actual", dataIndex: ["audit", "actual_rps_dollars"] }
+ render: (text, record) => (
+ }>
+ {record.rps.jobRpsDollars.toFormat()}
+
+ {Dinero({ amount: Math.round(record.audit.actual_rps_dollars * 100) }).toFormat()}
+
+
+ )
+ }
];
return (
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ {auditError && (
+
+
+
+ )}
+
+