From 968816b4a657dfae39dc8208370cd6965ebabfcd Mon Sep 17 00:00:00 2001 From: Patrick Fic Date: Fri, 6 Jan 2023 10:12:07 -0800 Subject: [PATCH] IO-2134 Add option to choose CSR on job conversion. --- .../jobs-convert-button/jobs-convert-button.component.jsx | 8 ++++++-- client/src/graphql/jobs.queries.js | 3 +++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx index 1a7f85d75..e20523880 100644 --- a/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx +++ b/client/src/components/jobs-convert-button/jobs-convert-button.component.jsx @@ -9,6 +9,7 @@ import { Space, Switch, } from "antd"; +import axios from "axios"; import React, { useState } from "react"; import { useTranslation } from "react-i18next"; import { connect } from "react-redux"; @@ -18,7 +19,6 @@ import { insertAuditTrail } from "../../redux/application/application.actions"; import { selectJobReadOnly } from "../../redux/application/application.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors"; import AuditTrailMapping from "../../utils/AuditTrailMappings"; -import axios from "axios"; const mapStateToProps = createStructuredSelector({ //currentUser: selectCurrentUser bodyshop: selectBodyshop, @@ -235,7 +235,11 @@ export function JobsConvertButton({ loading={loading} onClick={() => { setVisible(true); - form.resetFields(); + form.setFieldsValue({ + driveable: true, + towin: false, + employee_csr: job.employee_csr, + }); }} > {t("jobs.actions.convert")} diff --git a/client/src/graphql/jobs.queries.js b/client/src/graphql/jobs.queries.js index fa2b1c594..7e2871fe5 100644 --- a/client/src/graphql/jobs.queries.js +++ b/client/src/graphql/jobs.queries.js @@ -1101,6 +1101,9 @@ export const UPDATE_JOB_ASSIGNMENTS = gql` first_name last_name } + employee_csr + employee_body + employee_prep } } }