diff --git a/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx b/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx new file mode 100644 index 0000000..7a16923 --- /dev/null +++ b/src/components/atoms/vehicle-group-alert/vehicle-group-alert.atom.jsx @@ -0,0 +1,47 @@ +import { AlertFilled } from "@ant-design/icons"; +import { Tooltip } from "antd"; +import React from "react"; +const models = [ + "equinox", + "expedition", + "pickup", + "tucson", + "terrain", + "sorento", + "sienna", + "grandcaravan", + "grand caravan", + "journey", + "nv200", + "rav4", +]; + +export default function VehicleGroupAlertAtom({ job, showGroup = false }) { + const shouldWarn = models.includes(job.v_model.toLowerCase()); + + const vehicleText = `${job.v_model_yr} ${job.v_makedesc} ${job.v_model} (${ + job.v_type + })${ + showGroup + ? `- ${job.group} @ ${ + job.v_age === 1 ? `${job.v_age} year` : `${job.v_age} years` + }` + : "" + } +`; + + if (shouldWarn) + return ( + +
+ {vehicleText} + +
+
+ ); + + return vehicleText; +} diff --git a/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx b/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx index c250c9e..a679ac7 100644 --- a/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx +++ b/src/components/molecules/jobs-detail-description/jobs-detail-description.molecule.jsx @@ -6,6 +6,7 @@ import TimeAgoFormatter from "../../atoms/time-ago-formatter/time-ago-formatter. import CloseDateDisplayMolecule from "../close-date-display/close-date-display.molecule"; import JobGroupMolecule from "../job-group/job-group.molecule"; import DeleteJobAtom from "../../atoms/delete-job/delete-job.atom"; +import VehicleGroupAlertAtom from "../../atoms/vehicle-group-alert/vehicle-group-alert.atom"; export default function JobsDetailDescriptionMolecule({ loading, job }) { if (loading) return ; @@ -28,7 +29,9 @@ export default function JobsDetailDescriptionMolecule({ loading, job }) { > {`${job.ownr_fn} ${job.ownr_ln}`} - {`${job.v_model_yr} ${job.v_makedesc} ${job.v_model} (${job.v_type})`} + + + {job.clm_total} 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 ae9e6f2..a697395 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 @@ -1,18 +1,18 @@ import { Input, Table } from "antd"; +import moment from "moment"; import React, { useState } from "react"; import { connect } from "react-redux"; import { Link } from "react-router-dom"; import { createStructuredSelector } from "reselect"; import ipcTypes from "../../../ipc.types"; import { setSelectedJobId } from "../../../redux/application/application.actions"; - import { selectReportData, selectReportLoading, - selectScorecard, + selectScorecard } from "../../../redux/reporting/reporting.selectors"; import { alphaSort } from "../../../util/sorters"; -import moment from "moment"; +import VehicleGroupAlertAtom from "../../atoms/vehicle-group-alert/vehicle-group-alert.atom"; const { ipcRenderer } = window; @@ -76,12 +76,9 @@ export function ReportingJobsListMolecule({ title: "Vehicle", dataIndex: "vehicle", key: "vehicle", - render: (text, record) => - `${record.v_model_yr} ${record.v_makedesc} ${record.v_model} (${ - record.v_type - }) - ${record.group} @ ${ - record.v_age === 1 ? `${record.v_age} year` : `${record.v_age} years` - }`, + render: (text, record) => ( + + ), }, { title: "Database Price Sum",