From 17033cc874ebe40ff5d958fc054d2cae96295cab Mon Sep 17 00:00:00 2001 From: Patrick FIc Date: Wed, 18 Jun 2025 11:54:52 -0700 Subject: [PATCH] FInal changes for 1.4.0 release. --- electron/changelog.json | 5 +++++ package-lock.json | 4 ++-- package.json | 2 +- .../jobs-detail-description.molecule.jsx | 4 ++-- .../reporting-totals-stats.molecule.jsx | 4 +++- .../organisms/jobs-detail/jobs-detail.organism.jsx | 7 +++++-- 6 files changed, 18 insertions(+), 8 deletions(-) diff --git a/electron/changelog.json b/electron/changelog.json index 2a0399b..ff88da2 100644 --- a/electron/changelog.json +++ b/electron/changelog.json @@ -188,5 +188,10 @@ "title": "Release Notes for 1.3.5", "date": "10/17/2024", "notes": "Improvements:\r\n* Improved group detection for latest RPS rule sets.\r\n* Audit functionality will now rely on header names instead of order." + }, + "1.4.0": { + "title": "Release Notes for 1.4.0", + "date": "06/17/2025", + "notes": "New Features: \r\n* Added a scenario manager to scorecards to dynamically remove and add jobs to see impacts without adjusting dates.\r\n* Added ability to print a job. \r\n\r\nImprovements:\r\n* Added dark mode for app.\r\n* Added variance dollars to the scorecard.\r\n* Adjusted layout of job details to more prominently display savings information." } } diff --git a/package-lock.json b/package-lock.json index c5d3948..dae361e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "imexrps", - "version": "1.4.0-alpha.3", + "version": "1.4.0-alpha.4", "lockfileVersion": 3, "requires": true, "packages": { "": { "name": "imexrps", - "version": "1.4.0-alpha.3", + "version": "1.4.0-alpha.4", "hasInstallScript": true, "dependencies": { "@ant-design/pro-layout": "^7.22.3", diff --git a/package.json b/package.json index 0c71c39..fe64112 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.4", + "version": "1.4.0", "main": "electron/main.js", "homepage": "./", "dependencies": { 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 9e364b5..855b4bf 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 @@ -14,13 +14,13 @@ import JobGroupMolecule from "../job-group/job-group.molecule"; import moment from "moment"; import { useReactToPrint } from "react-to-print"; -export default function JobsDetailDescriptionMolecule({ loading, job }) { +export default function JobsDetailDescriptionMolecule({ loading, job, jobDetailRef }) { const hasQuantityGreaterThan1 = useMemo(() => { return job?.joblines?.find((jl) => !jl.ignore && jl.quantity > 1); }, [job]); const handlePrint = useReactToPrint({ - content: () => window.jobDetailRef.current, + contentRef: jobDetailRef, bodyClass: "audit-container-print" }); diff --git a/src/components/molecules/reporting-totals-stats/reporting-totals-stats.molecule.jsx b/src/components/molecules/reporting-totals-stats/reporting-totals-stats.molecule.jsx index 5424ae0..6b80646 100644 --- a/src/components/molecules/reporting-totals-stats/reporting-totals-stats.molecule.jsx +++ b/src/components/molecules/reporting-totals-stats/reporting-totals-stats.molecule.jsx @@ -87,7 +87,9 @@ export function ReportingTotalsStatsMolecule({ reportingLoading, scoreCard, excl Clear } - message={`There are ${excludedJobIds.length} jobs excluded from the totals above.`} + message={`There ${excludedJobIds.length == 1 ? "is" : "are"} ${excludedJobIds.length} job${ + excludedJobIds.length > 1 ? "s" : "" + } excluded from the totals above.`} /> )} diff --git a/src/components/organisms/jobs-detail/jobs-detail.organism.jsx b/src/components/organisms/jobs-detail/jobs-detail.organism.jsx index 71e5cf4..4470355 100644 --- a/src/components/organisms/jobs-detail/jobs-detail.organism.jsx +++ b/src/components/organisms/jobs-detail/jobs-detail.organism.jsx @@ -29,7 +29,6 @@ export function JobsDetailOrganism({ selectedJobId, setSelectedJobTargetPc }) { skip: !selectedJobId }); const jobDetailRef = useRef(); - window.jobDetailRef = jobDetailRef; useEffect(() => { if (data && data.jobs_by_pk) @@ -60,7 +59,11 @@ export function JobsDetailOrganism({ selectedJobId, setSelectedJobTargetPc }) { return (
- +