From 6467078505ad032775d76bdb51b736cdd08a348e Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Mon, 19 Aug 2024 08:46:09 -0700 Subject: [PATCH] 1.3.2 scaffolding, add audit error for no group, add SUVs --- electron/changelog.json | 5 ++++ package.json | 2 +- src/components/pages/audit/audit.page.jsx | 28 +++++++++++++++++++---- src/ipc/suvs.json | 1 + 4 files changed, 30 insertions(+), 6 deletions(-) diff --git a/electron/changelog.json b/electron/changelog.json index ec7c8d0..64e8794 100644 --- a/electron/changelog.json +++ b/electron/changelog.json @@ -168,5 +168,10 @@ "title": "Release Notes for 1.3.1", "date": "08/16/2024", "notes": "Bug Fix\n* Resolved incorrect targets for vehicles under 20,000 miles under current rule set." + }, + "1.3.2": { + "title": "Release Notes for 1.3.2", + "date": "TBD", + "notes": "Bug Fix\n* Added additional SUV models." } } diff --git a/package.json b/package.json index 195dc87..e805e87 100644 --- a/package.json +++ b/package.json @@ -3,7 +3,7 @@ "productName": "ImEX RPS", "author": "ImEX Systems Inc. ", "description": "ImEX RPS", - "version": "1.3.1", + "version": "1.3.2", "main": "electron/main.js", "homepage": "./", "dependencies": { diff --git a/src/components/pages/audit/audit.page.jsx b/src/components/pages/audit/audit.page.jsx index 4f4b7fe..2bfa036 100644 --- a/src/components/pages/audit/audit.page.jsx +++ b/src/components/pages/audit/audit.page.jsx @@ -1,31 +1,35 @@ import { PrinterFilled } from "@ant-design/icons"; -import { Alert, Button, Card, Col, DatePicker, Form, Input, Result, Row, Select, Space } from "antd"; +import { Alert, Button, Card, Col, DatePicker, Form, Input, Result, Row, Select, Space, Typography } from "antd"; import React, { useEffect, useRef, useState } from "react"; import { connect } from "react-redux"; import { useReactToPrint } from "react-to-print"; import { createStructuredSelector } from "reselect"; import ipcTypes from "../../../ipc.types"; import { queryReportingData } from "../../../redux/reporting/reporting.actions"; -import { selectAuditError } from "../../../redux/reporting/reporting.selectors"; +import { selectAuditError, selectReportingError } from "../../../redux/reporting/reporting.selectors"; import dayjs from "../../../util/day"; import AuditResultsOrganism from "../../organisms/audit-results/audit-results.organism"; import FeatureWrapper from "../../templates/feature-wrapper"; import "./audit.page.styles.scss"; import { selectBodyshop } from "../../../redux/user/user.selectors"; +import { Link } from "react-router-dom"; +import { setSelectedJobId } from "../../../redux/application/application.actions"; const { ipcRenderer } = window; const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser bodyshop: selectBodyshop, - auditError: selectAuditError + auditError: selectAuditError, + reportingError: selectReportingError }); const mapDispatchToProps = (dispatch) => ({ - queryReportingData: (dates) => dispatch(queryReportingData(dates)) + queryReportingData: (dates) => dispatch(queryReportingData(dates)), + setSelectedJobId: (id) => dispatch(setSelectedJobId(id)) }); export default connect(mapStateToProps, mapDispatchToProps)(AuditPage); -export function AuditPage({ auditError, queryReportingData, bodyshop }) { +export function AuditPage({ auditError, queryReportingData, bodyshop, reportingError, setSelectedJobId }) { const [form] = Form.useForm(); const [sheets, setSheets] = useState([]); useEffect(() => { @@ -178,6 +182,20 @@ export function AuditPage({ auditError, queryReportingData, bodyshop }) { /> )} + {reportingError && ( +
+ {reportingError.message} +
    + {reportingError.jobs.map((j, idx) => ( +
  • + setSelectedJobId(j.id)} to={"/"}> + {`${j.clm_no} - ${j.error}`} + +
  • + ))} +
+
+ )} diff --git a/src/ipc/suvs.json b/src/ipc/suvs.json index 450febb..4fa4f11 100644 --- a/src/ipc/suvs.json +++ b/src/ipc/suvs.json @@ -28,6 +28,7 @@ "BRONCO SPORT", "TRAILBLAZER", + "BLAZER LT", "CHEROKEE", "CHEROKEE CLASSIC",