admin/bodyshop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Added status state machine BOD-251

Browse Source
This commit is contained in:
Patrick Fic
2020-09-02 11:01:34 -07:00
parent 2202683876
commit ed788a4b5c
17 changed files with 217 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

63
bodyshop_translations.babel
View File

@@ -3451,6 +3451,27 @@
<folder_node> <folder_node>
<name>statuses</name> <name>statuses</name>
<children> <children>
<concept_node>
<name>active_statuses</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>default_arrived</name> <name>default_arrived</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>
@@ -3745,6 +3766,48 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>post_production_statuses</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node>
<name>pre_production_statuses</name>
<definition_loaded>false</definition_loaded>
<description></description>
<comment></comment>
<default_text></default_text>
<translations>
<translation>
<language>en-US</language>
<approved>false</approved>
</translation>
<translation>
<language>es-MX</language>
<approved>false</approved>
</translation>
<translation>
<language>fr-CA</language>
<approved>false</approved>
</translation>
</translations>
</concept_node>
<concept_node> <concept_node>
<name>production_statuses</name> <name>production_statuses</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

8
client/src/components/contract-jobs/contract-jobs.container.jsx
View File

@@ -9,17 +9,17 @@ import { QUERY_ALL_ACTIVE_JOBS } from "../../graphql/jobs.queries";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop bodyshop: selectBodyshop,
}); });
export function ContractJobsContainer({ selectedJobState, bodyshop }) { export function ContractJobsContainer({ selectedJobState, bodyshop }) {
const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, { const { loading, error, data } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
variables: { variables: {
statuses: bodyshop.md_ro_statuses.open_statuses || ["Open"] statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
} },
}); });
const [selectedJob, setSelectedJob] = selectedJobState; const [selectedJob, setSelectedJob] = selectedJobState;
const handleSelect = record => { const handleSelect = (record) => {
setSelectedJob(record.id); setSelectedJob(record.id);
}; };

77
client/src/components/jobs-change-status/jobs-change-status.component.jsx Normal file
View File

@@ -0,0 +1,77 @@
import { DownCircleFilled } from "@ant-design/icons";
import { Button, Dropdown, Menu, notification } from "antd";
import React, { useState, useEffect } from "react";
import { useMutation } from "react-apollo";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { UPDATE_JOB_STATUS } from "../../graphql/jobs.queries";
import { selectBodyshop } from "../../redux/user/user.selectors";
const mapStateToProps = createStructuredSelector({
bodyshop: selectBodyshop,
});
const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language))
});
export function JobsChangeStatus({ job, bodyshop }) {
const { t } = useTranslation();
const [availableStatuses, setAvailableStatuses] = useState([]);
const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
const updateJobStatus = (status) => {
mutationUpdateJobstatus({
variables: { jobId: job.id, status: status },
})
.then((r) => {
notification["success"]({ message: t("jobs.successes.save") });
// refetch();
})
.catch((error) => {
notification["error"]({ message: t("jobs.errors.saving") });
});
};
useEffect(() => {
//Figure out what scenario were in, populate accodingly
if (job && bodyshop) {
if (bodyshop.md_ro_statuses.pre_production_statuses.includes(job.status))
setAvailableStatuses(bodyshop.md_ro_statuses.pre_production_statuses);
else if (bodyshop.md_ro_statuses.production_statuses.includes(job.status))
setAvailableStatuses(bodyshop.md_ro_statuses.production_statuses);
else if (
bodyshop.md_ro_statuses.post_production_statuses.includes(job.status)
)
setAvailableStatuses(bodyshop.md_ro_statuses.post_production_statuses);
else {
setAvailableStatuses(bodyshop.statuses);
}
}
}, [job, setAvailableStatuses, bodyshop]);
const statusmenu = (
<Menu
onClick={(e) => {
updateJobStatus(e.key);
}}
>
{availableStatuses.map((item) => (
<Menu.Item key={item}>{item}</Menu.Item>
))}
</Menu>
);
return (
<Dropdown
className="imex-flex-row__margin"
overlay={statusmenu}
trigger={["click"]}
key="changestatus"
>
<Button>
{t("jobs.actions.changestatus")} <DownCircleFilled />
</Button>
</Dropdown>
);
}
export default connect(mapStateToProps, mapDispatchToProps)(JobsChangeStatus);

29
client/src/components/jobs-detail-header/jobs-detail-header.component.jsx
View File

@@ -1,5 +1,5 @@
import { DownCircleFilled, PrinterFilled } from "@ant-design/icons"; import { PrinterFilled } from "@ant-design/icons";
import { Button, Dropdown, Menu, PageHeader, Tag } from "antd"; import { Button, PageHeader, Tag } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
@@ -8,6 +8,7 @@ import { setModalContext } from "../../redux/modals/modals.actions";
import { selectBodyshop } from "../../redux/user/user.selectors"; import { selectBodyshop } from "../../redux/user/user.selectors";
import CurrencyFormatter from "../../utils/CurrencyFormatter"; import CurrencyFormatter from "../../utils/CurrencyFormatter";
import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container"; import JobEmployeeAssignments from "../job-employee-assignments/job-employee-assignments.container";
import JobsChangeStatus from "../jobs-change-status/jobs-change-status.component";
import JobsConvertButton from "../jobs-convert-button/jobs-convert-button.component"; import JobsConvertButton from "../jobs-convert-button/jobs-convert-button.component";
import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component"; import JobsDetailHeaderActions from "../jobs-detail-header-actions/jobs-detail-header-actions.component";
import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component"; import OwnerTagPopoverComponent from "../owner-tag-popover/owner-tag-popover.component";
@@ -28,37 +29,15 @@ export function JobsDetailHeader({
refetch, refetch,
setPrintCenterContext, setPrintCenterContext,
bodyshop, bodyshop,
updateJobStatus,
setScheduleContext, setScheduleContext,
loading, loading,
form, form,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
const statusmenu = (
<Menu
onClick={(e) => {
updateJobStatus(e.key);
}}
>
{bodyshop.md_ro_statuses.statuses.map((item) => (
<Menu.Item key={item}>{item}</Menu.Item>
))}
</Menu>
);
const menuExtra = ( const menuExtra = (
<div className="imex-flex-row"> <div className="imex-flex-row">
<Dropdown <JobsChangeStatus job={job} />
className="imex-flex-row__margin"
overlay={statusmenu}
trigger={["click"]}
key="changestatus"
>
<Button>
{t("jobs.actions.changestatus")} <DownCircleFilled />
</Button>
</Dropdown>
<Button <Button
className="imex-flex-row__margin" className="imex-flex-row__margin"

7
client/src/components/jobs-find-modal/jobs-find-modal.container.jsx
View File

@@ -30,7 +30,7 @@ export default connect(
const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, { const jobsList = useQuery(QUERY_ALL_ACTIVE_JOBS, {
variables: { variables: {
statuses: bodyshop.md_ro_statuses.open_statuses || ["Open"], statuses: bodyshop.md_ro_statuses.active_statuses || ["Open"],
}, },
skip: !modalProps.visible, skip: !modalProps.visible,
}); });
@@ -80,9 +80,10 @@ export default connect(
width={"80%"} width={"80%"}
destroyOnClose destroyOnClose
okButtonProps={{ disabled: selectedJob ? false : true }} okButtonProps={{ disabled: selectedJob ? false : true }}
{...modalProps}> {...modalProps}
>
{loading ? <LoadingSpinner /> : null} {loading ? <LoadingSpinner /> : null}
{error ? <AlertComponent message={error.message} type='error' /> : null} {error ? <AlertComponent message={error.message} type="error" /> : null}
{true ? ( {true ? (
<JobsFindModalComponent <JobsFindModalComponent
selectedJob={selectedJob} selectedJob={selectedJob}

2
client/src/components/jobs-list/jobs-list.component.jsx
View File

@@ -26,7 +26,7 @@ export function JobsList({ bodyshop }) {
const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, { const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
variables: { variables: {
statuses: bodyshop.md_ro_statuses.open_statuses || ["Open", "Open*"], statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
}, },
}); });

8
client/src/components/owner-detail-jobs/owner-detail-jobs.component.jsx
View File

@@ -72,7 +72,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
pagination={{ position: "bottom" }} pagination={{ position: "bottom" }}
columns={columns} columns={columns}
scroll={{ x: true }} scroll={{ x: true }}
rowKey='id' rowKey="id"
dataSource={owner.jobs} dataSource={owner.jobs}
rowSelection={{ rowSelection={{
onSelect: (record, selected, selectedRows) => { onSelect: (record, selected, selectedRows) => {
@@ -83,7 +83,7 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
selectedRows selectedRows
? selectedRows ? selectedRows
.filter((i) => .filter((i) =>
bodyshop.md_ro_statuses.open_statuses.includes(i.status) bodyshop.md_ro_statuses.active_statuses.includes(i.status)
) )
.map((i) => i.id) .map((i) => i.id)
: [] : []
@@ -91,8 +91,8 @@ function OwnerDetailJobsComponent({ bodyshop, owner }) {
}, },
selectedRowKeys: selectedJobs, selectedRowKeys: selectedJobs,
getCheckboxProps: (record) => ({ getCheckboxProps: (record) => ({
disabled: bodyshop.md_ro_statuses.open_statuses disabled: bodyshop.md_ro_statuses.active_statuses
? !bodyshop.md_ro_statuses.open_statuses.includes(record.status) ? !bodyshop.md_ro_statuses.active_statuses.includes(record.status)
: true, : true,
}), }),
}} }}

2
client/src/components/shop-info/shop-info.intake.component.jsx
View File

@@ -118,7 +118,7 @@ export default function ShopInfoIntakeChecklistComponent({ form }) {
<SelectorDiv> <SelectorDiv>
<Form.Item <Form.Item
name={["intakechecklist", "templates"]} name={["intakechecklist", "templates"]}
label={t("bodyshop.fields.statuses.open_statuses")} label={t("bodyshop.fields.statuses.active_statuses")}
rules={[ rules={[
{ {
required: true, required: true,

42
client/src/components/shop-info/shop-info.rostatus.component.jsx
View File

@@ -82,8 +82,27 @@ export default function ShopInfoROStatusComponent({ form }) {
<Col span={12}> <Col span={12}>
<SelectorDiv> <SelectorDiv>
<Form.Item <Form.Item
name={["md_ro_statuses", "open_statuses"]} name={["md_ro_statuses", "active_statuses"]}
label={t("bodyshop.fields.statuses.open_statuses")} label={t("bodyshop.fields.statuses.active_statuses")}
rules={[
{
required: true,
message: t("general.validation.required"),
type: "array",
},
]}
>
<Select mode="multiple">
{options.map((item, idx) => (
<Select.Option key={idx} value={item}>
{item}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item
name={["md_ro_statuses", "pre_production_statuses"]}
label={t("bodyshop.fields.statuses.pre_production_statuses")}
rules={[ rules={[
{ {
required: true, required: true,
@@ -119,6 +138,25 @@ export default function ShopInfoROStatusComponent({ form }) {
))} ))}
</Select> </Select>
</Form.Item> </Form.Item>
<Form.Item
name={["md_ro_statuses", "post_production_statuses"]}
label={t("bodyshop.fields.statuses.post_production_statuses")}
rules={[
{
required: true,
message: t("general.validation.required"),
type: "array",
},
]}
>
<Select mode="multiple">
{options.map((item, idx) => (
<Select.Option key={idx} value={item}>
{item}
</Select.Option>
))}
</Select>
</Form.Item>
<Form.Item <Form.Item
label={t("bodyshop.fields.statuses.default_scheduled")} label={t("bodyshop.fields.statuses.default_scheduled")}
rules={[ rules={[

2
client/src/components/tech-lookup-jobs-list/tech-lookup-jobs-list.component.jsx
View File

@@ -23,7 +23,7 @@ export function TechLookupJobsList({ bodyshop }) {
const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, { const { loading, error, data, refetch } = useQuery(QUERY_ALL_ACTIVE_JOBS, {
variables: { variables: {
statuses: bodyshop.md_ro_statuses.open_statuses || ["Open", "Open*"], statuses: bodyshop.md_ro_statuses.active_statuses || ["Open", "Open*"],
}, },
}); });

6
client/src/components/vehicle-detail-jobs/vehicle-detail-jobs.component.jsx
View File

@@ -86,7 +86,7 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
selectedRows selectedRows
? selectedRows ? selectedRows
.filter((i) => .filter((i) =>
bodyshop.md_ro_statuses.open_statuses.includes(i.status) bodyshop.md_ro_statuses.active_statuses.includes(i.status)
) )
.map((i) => i.id) .map((i) => i.id)
: [] : []
@@ -94,8 +94,8 @@ export function VehicleDetailJobsComponent({ vehicle, bodyshop }) {
}, },
selectedRowKeys: selectedJobs, selectedRowKeys: selectedJobs,
getCheckboxProps: (record) => ({ getCheckboxProps: (record) => ({
disabled: bodyshop.md_ro_statuses.open_statuses disabled: bodyshop.md_ro_statuses.active_statuses
? !bodyshop.md_ro_statuses.open_statuses.includes(record.status) ? !bodyshop.md_ro_statuses.active_statuses.includes(record.status)
: true, : true,
}), }),
}} }}

2
client/src/graphql/jobs.queries.js
View File

@@ -653,6 +653,8 @@ export const UPDATE_JOB_STATUS = gql`
update_jobs(where: { id: { _eq: $jobId } }, _set: { status: $status }) { update_jobs(where: { id: { _eq: $jobId } }, _set: { status: $status }) {
returning { returning {
id id
status
inproduction
} }
} }
} }

2
client/src/pages/jobs-detail/jobs-detail.page.component.jsx
View File

@@ -84,7 +84,6 @@ export function JobsDetailPage({
mutationUpdateJob, mutationUpdateJob,
handleSubmit, handleSubmit,
refetch, refetch,
updateJobStatus,
bodyshop, bodyshop,
}) { }) {
const { t } = useTranslation(); const { t } = useTranslation();
@@ -155,7 +154,6 @@ export function JobsDetailPage({
job={job} job={job}
refetch={refetch} refetch={refetch}
handleSubmit={handleSubmit} handleSubmit={handleSubmit}
updateJobStatus={updateJobStatus}
loading={loading} loading={loading}
/> />
<Tabs <Tabs

24
client/src/pages/jobs-detail/jobs-detail.page.container.jsx
View File

@@ -1,23 +1,18 @@
import { useMutation, useQuery } from "@apollo/react-hooks"; import { useMutation, useQuery } from "@apollo/react-hooks";
import { notification } from "antd";
import React, { useEffect } from "react"; import React, { useEffect } from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import { connect } from "react-redux"; import { connect } from "react-redux";
import AlertComponent from "../../components/alert/alert.component"; import AlertComponent from "../../components/alert/alert.component";
import SpinComponent from "../../components/loading-spinner/loading-spinner.component"; import SpinComponent from "../../components/loading-spinner/loading-spinner.component";
import NotFound from "../../components/not-found/not-found.component";
import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component"; import RbacWrapper from "../../components/rbac-wrapper/rbac-wrapper.component";
import { import { GET_JOB_BY_PK, UPDATE_JOB } from "../../graphql/jobs.queries";
GET_JOB_BY_PK,
UPDATE_JOB,
UPDATE_JOB_STATUS,
} from "../../graphql/jobs.queries";
import { import {
addRecentItem, addRecentItem,
setBreadcrumbs, setBreadcrumbs,
} from "../../redux/application/application.actions"; } from "../../redux/application/application.actions";
import { CreateRecentItem } from "../../utils/create-recent-item"; import { CreateRecentItem } from "../../utils/create-recent-item";
import JobsDetailPage from "./jobs-detail.page.component"; import JobsDetailPage from "./jobs-detail.page.component";
import NotFound from "../../components/not-found/not-found.component";
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)), setBreadcrumbs: (breadcrumbs) => dispatch(setBreadcrumbs(breadcrumbs)),
@@ -33,20 +28,6 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
fetchPolicy: "network-only", fetchPolicy: "network-only",
}); });
const [mutationUpdateJob] = useMutation(UPDATE_JOB); const [mutationUpdateJob] = useMutation(UPDATE_JOB);
const [mutationUpdateJobstatus] = useMutation(UPDATE_JOB_STATUS);
const updateJobStatus = (status) => {
mutationUpdateJobstatus({
variables: { jobId: jobId, status: status },
})
.then((r) => {
notification["success"]({ message: t("jobs.successes.save") });
refetch();
})
.catch((error) => {
notification[error]({ message: t("jobs.errors.saving") });
});
};
useEffect(() => { useEffect(() => {
document.title = loading document.title = loading
@@ -98,7 +79,6 @@ function JobsDetailPageContainer({ match, setBreadcrumbs, addRecentItem }) {
job={data.jobs_by_pk} job={data.jobs_by_pk}
mutationUpdateJob={mutationUpdateJob} mutationUpdateJob={mutationUpdateJob}
refetch={refetch} refetch={refetch}
updateJobStatus={updateJobStatus}
/> />
</RbacWrapper> </RbacWrapper>
) : ( ) : (

7
client/src/translations/en_us/common.json
View File

@@ -233,11 +233,12 @@
"state_tax_id": "State Tax ID (PST, QST)", "state_tax_id": "State Tax ID (PST, QST)",
"status": "Status Label", "status": "Status Label",
"statuses": { "statuses": {
"default_arrived": "Default Arrived Status", "active_statuses": "Active Statuses (Filtering for Active Jobs throughout system)",
"default_arrived": "Default Arrived Status (Transition to Production)",
"default_bo": "Default Backordered Status", "default_bo": "Default Backordered Status",
"default_canceled": "Default Canceled Status", "default_canceled": "Default Canceled Status",
"default_completed": "Default Completed Status", "default_completed": "Default Completed Status",
"default_delivered": "Default Delivered Status", "default_delivered": "Default Delivered Status (Transition to Post-Production)",
"default_exported": "Default Exported Status", "default_exported": "Default Exported Status",
"default_imported": "Default Imported Status", "default_imported": "Default Imported Status",
"default_invoiced": "Default Invoiced Status", "default_invoiced": "Default Invoiced Status",
@@ -247,6 +248,8 @@
"default_scheduled": "Default Scheduled Status", "default_scheduled": "Default Scheduled Status",
"default_void": "Default Void", "default_void": "Default Void",
"open_statuses": "Open Statuses", "open_statuses": "Open Statuses",
"post_production_statuses": "Post-Production Statuses",
"pre_production_statuses": "Pre-Production Statuses",
"production_statuses": "Production Statuses" "production_statuses": "Production Statuses"
}, },
"zip_post": "Zip/Postal Code" "zip_post": "Zip/Postal Code"

3
client/src/translations/es/common.json
View File

@@ -233,6 +233,7 @@
"state_tax_id": "", "state_tax_id": "",
"status": "", "status": "",
"statuses": { "statuses": {
"active_statuses": "",
"default_arrived": "", "default_arrived": "",
"default_bo": "", "default_bo": "",
"default_canceled": "", "default_canceled": "",
@@ -247,6 +248,8 @@
"default_scheduled": "", "default_scheduled": "",
"default_void": "", "default_void": "",
"open_statuses": "", "open_statuses": "",
"post_production_statuses": "",
"pre_production_statuses": "",
"production_statuses": "" "production_statuses": ""
}, },
"zip_post": "" "zip_post": ""

3
client/src/translations/fr/common.json
View File

@@ -233,6 +233,7 @@
"state_tax_id": "", "state_tax_id": "",
"status": "", "status": "",
"statuses": { "statuses": {
"active_statuses": "",
"default_arrived": "", "default_arrived": "",
"default_bo": "", "default_bo": "",
"default_canceled": "", "default_canceled": "",
@@ -247,6 +248,8 @@
"default_scheduled": "", "default_scheduled": "",
"default_void": "", "default_void": "",
"open_statuses": "", "open_statuses": "",
"post_production_statuses": "",
"pre_production_statuses": "",
"production_statuses": "" "production_statuses": ""
}, },
"zip_post": "" "zip_post": ""