From 72181e1ff7ff038fb17a3d6cb2887e5aaa39580a Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Wed, 31 May 2023 14:33:59 -0700 Subject: [PATCH 1/4] Add in missing filter for job search select on job clock on. --- .../tech-job-clock-in-form/tech-job-clock-in-form.component.jsx | 1 + 1 file changed, 1 insertion(+) diff --git a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx index 6c9f357e8..77bc795a8 100644 --- a/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx +++ b/client/src/components/tech-job-clock-in-form/tech-job-clock-in-form.component.jsx @@ -33,6 +33,7 @@ export function TechClockInComponent({ form, bodyshop, technician }) { From 33cfa531b821fa0e4bda9830a6d92bdecff86d30 Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 1 Jun 2023 17:34:55 -0700 Subject: [PATCH 2/4] IO-2316 Predefined Email address for CC field --- .../email-overlay/email-overlay.component.jsx | 60 ++++++++++++++++--- 1 file changed, 52 insertions(+), 8 deletions(-) diff --git a/client/src/components/email-overlay/email-overlay.component.jsx b/client/src/components/email-overlay/email-overlay.component.jsx index 7db03471d..362d973b4 100644 --- a/client/src/components/email-overlay/email-overlay.component.jsx +++ b/client/src/components/email-overlay/email-overlay.component.jsx @@ -1,28 +1,28 @@ import { UploadOutlined, UserAddOutlined } from "@ant-design/icons"; import { + Button, Divider, + Dropdown, Form, Input, + Menu, Select, + Space, Tabs, Upload, - Space, - Menu, - Dropdown, - Button, } from "antd"; +import _ from "lodash"; import React from "react"; import { useTranslation } from "react-i18next"; -import EmailDocumentsComponent from "../email-documents/email-documents.component"; -import _ from "lodash"; import { connect } from "react-redux"; import { createStructuredSelector } from "reselect"; +import { selectEmailConfig } from "../../redux/email/email.selectors"; import { selectBodyshop, selectCurrentUser, } from "../../redux/user/user.selectors"; import { CreateExplorerLinkForJob } from "../../utils/localmedia"; -import { selectEmailConfig } from "../../redux/email/email.selectors"; +import EmailDocumentsComponent from "../email-documents/email-documents.component"; const mapStateToProps = createStructuredSelector({ bodyshop: selectBodyshop, @@ -54,6 +54,15 @@ export function EmailOverlayComponent({ ]), }); }; + const handle_CC_Click = ({ item, key, keyPath }) => { + const email = item.props.value; + form.setFieldsValue({ + cc: _.uniq([ + ...(form.getFieldValue("cc") || ""), + ...(typeof email === "string" ? [email] : email), + ]), + }); + }; const menu = (
@@ -74,6 +83,25 @@ export function EmailOverlayComponent({
); + const menuCC = ( +
+ + {bodyshop.employees + .filter((e) => e.user_email) + .map((e, idx) => ( + + {`${e.first_name} ${e.last_name}`} + + ))} + {bodyshop.md_to_emails.map((e, idx) => ( + + {e.label} + + ))} + +
+ ); + return (
Date: Thu, 1 Jun 2023 18:29:41 -0700 Subject: [PATCH 3/4] IO-2310 Change RO sort. --- client/src/components/jobs-list/jobs-list.component.jsx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/client/src/components/jobs-list/jobs-list.component.jsx b/client/src/components/jobs-list/jobs-list.component.jsx index 189014d37..e28e21901 100644 --- a/client/src/components/jobs-list/jobs-list.component.jsx +++ b/client/src/components/jobs-list/jobs-list.component.jsx @@ -112,7 +112,9 @@ export function JobsList({ bodyshop }) { title: t("jobs.fields.ro_number"), dataIndex: "ro_number", key: "ro_number", - sorter: (a, b) => alphaSort(a.ro_number, b.ro_number), + sorter: (a, b) => + parseInt((a.ro_number || "0").replace(/\D/g, "")) - + parseInt((b.ro_number || "0").replace(/\D/g, "")), sortOrder: state.sortedInfo.columnKey === "ro_number" && state.sortedInfo.order, From cbf5d268ea25f3ede324478150f6ea453dad8e6f Mon Sep 17 00:00:00 2001 From: Allan Carr Date: Thu, 1 Jun 2023 20:32:30 -0700 Subject: [PATCH 4/4] IO-2315 DMS Posting Sheet Restrict to DMS setups only --- .../print-center-jobs.component.jsx | 39 +++++++++++++------ client/src/utils/TemplateConstants.js | 1 + 2 files changed, 29 insertions(+), 11 deletions(-) diff --git a/client/src/components/print-center-jobs/print-center-jobs.component.jsx b/client/src/components/print-center-jobs/print-center-jobs.component.jsx index c96e3d3a5..ddb9a247d 100644 --- a/client/src/components/print-center-jobs/print-center-jobs.component.jsx +++ b/client/src/components/print-center-jobs/print-center-jobs.component.jsx @@ -23,17 +23,34 @@ export function PrintCenterJobsComponent({ printCenterModal, bodyshop }) { const { id: jobId, job } = printCenterModal.context; const tempList = TemplateList("job", {}); const { t } = useTranslation(); - const JobsReportsList = Object.keys(tempList) - .map((key) => { - return tempList[key]; - }) - .filter( - (temp) => - !temp.regions || - (temp.regions && temp.regions[bodyshop.region_config]) || - (temp.regions && - bodyshop.region_config.includes(Object.keys(temp.regions)) === true) - ); + + const JobsReportsList = + bodyshop.cdk_dealerid === null && bodyshop.pbs_serialnumber === null + ? Object.keys(tempList) + .map((key) => { + return tempList[key]; + }) + .filter( + (temp) => + (!temp.regions || + (temp.regions && temp.regions[bodyshop.region_config]) || + (temp.regions && + bodyshop.region_config.includes(Object.keys(temp.regions)) === + true)) && + (!temp.dms || temp.dms === false) + ) + : Object.keys(tempList) + .map((key) => { + return tempList[key]; + }) + .filter( + (temp) => + !temp.regions || + (temp.regions && temp.regions[bodyshop.region_config]) || + (temp.regions && + bodyshop.region_config.includes(Object.keys(temp.regions)) === + true) + ); const filteredJobsReportsList = search !== "" diff --git a/client/src/utils/TemplateConstants.js b/client/src/utils/TemplateConstants.js index 78f2f12f2..debbfc57e 100644 --- a/client/src/utils/TemplateConstants.js +++ b/client/src/utils/TemplateConstants.js @@ -512,6 +512,7 @@ export const TemplateList = (type, context) => { key: "dms_posting_sheet", disabled: false, group: "financial", + dms: true, }, } : {}),