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

Bug fixes and formatting for RO guard.

Browse Source
This commit is contained in:
Patrick Fic
2024-04-11 09:49:00 -07:00
parent e5599ff4c4
commit 453236cf3a
11 changed files with 146 additions and 130 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
bodyshop_translations.babel
View File

@@ -34201,6 +34201,27 @@
</translation> </translation>
</translations> </translations>
</concept_node> </concept_node>
<concept_node>
<name>profitbypassrequired</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>profits</name> <name>profits</name>
<definition_loaded>false</definition_loaded> <definition_loaded>false</definition_loaded>

38
client/src/components/job-close-ro-guard/job-close-ro-gaurd.labor.jsx
View File

@@ -1,20 +1,20 @@
import React from 'react'; import React from "react";
import { useQuery } from '@apollo/client'; import { useQuery } from "@apollo/client";
import { useSplitTreatments } from '@splitsoftware/splitio-react'; import { useSplitTreatments } from "@splitsoftware/splitio-react";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from "reselect";
import { GET_LINE_TICKET_BY_PK } from '../../graphql/jobs-lines.queries'; import { GET_LINE_TICKET_BY_PK } from "../../graphql/jobs-lines.queries";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from '../../redux/user/user.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import AlertComponent from '../alert/alert.component'; import AlertComponent from "../alert/alert.component";
import LaborAllocationsTableComponent from '../labor-allocations-table/labor-allocations-table.component'; import LaborAllocationsTableComponent from "../labor-allocations-table/labor-allocations-table.component";
import PayrollLaborAllocationsTable from '../labor-allocations-table/labor-allocations-table.payroll.component'; import PayrollLaborAllocationsTable from "../labor-allocations-table/labor-allocations-table.payroll.component";
import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component'; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -24,21 +24,21 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardLabor
export function JobCloseRoGuardLabor({ job, jobRO, bodyshop, form, warningCallback }) { export function JobCloseRoGuardLabor({ job, jobRO, bodyshop, form, warningCallback }) {
const { loading, error, data, refetch } = useQuery(GET_LINE_TICKET_BY_PK, { const { loading, error, data, refetch } = useQuery(GET_LINE_TICKET_BY_PK, {
variables: { id: job.id }, variables: { id: job.id },
fetchPolicy: 'network-only', fetchPolicy: "network-only",
nextFetchPolicy: 'network-only', nextFetchPolicy: "network-only"
}); });
const { const {
treatments: { Enhanced_Payroll }, treatments: { Enhanced_Payroll }
} = useSplitTreatments({ } = useSplitTreatments({
attributes: {}, attributes: {},
names: ['Enhanced_Payroll'], names: ["Enhanced_Payroll"],
splitKey: bodyshop.imexshopid, splitKey: bodyshop.imexshopid
}); });
if (loading) return <LoadingSkeleton />; if (loading) return <LoadingSkeleton />;
if (error) return <AlertComponent message={error.message} type="error" />; if (error) return <AlertComponent message={error.message} type="error" />;
return Enhanced_Payroll.treatment === 'on' ? ( return Enhanced_Payroll.treatment === "on" ? (
<PayrollLaborAllocationsTable <PayrollLaborAllocationsTable
jobId={job.id} jobId={job.id}
timetickets={data ? data.timetickets : []} timetickets={data ? data.timetickets : []}

38
client/src/components/job-close-ro-guard/job-close-ro-guard.ar.jsx
View File

@@ -1,19 +1,19 @@
import React, { useEffect } from 'react'; import React, { useEffect } from "react";
import { Alert, Card } from 'antd'; import { Alert, Card } from "antd";
import { useTranslation } from 'react-i18next'; import { useTranslation } from "react-i18next";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from "reselect";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from '../../redux/user/user.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import { useMemo } from 'react'; import { useMemo } from "react";
import Dinero from 'dinero.js'; import Dinero from "dinero.js";
import DataLabel from '../data-label/data-label.component'; import DataLabel from "../data-label/data-label.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -41,25 +41,21 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
useEffect(() => { useEffect(() => {
if (balance.getAmount() !== 0) { if (balance.getAmount() !== 0) {
warningCallback({ key: 'ar', warning: t('jobs.labels.outstanding_ar') }); warningCallback({ key: "ar", warning: t("jobs.labels.outstanding_ar") });
} }
}, [balance, t, warningCallback]); }, [balance, t, warningCallback]);
return ( return (
<Card title={t('jobs.labels.accountsreceivable')} style={{ height: '100%' }}> <Card title={t("jobs.labels.accountsreceivable")} style={{ height: "100%" }}>
<DataLabel label={t('payments.labels.totalpayments')}>{total.toFormat()}</DataLabel> <DataLabel label={t("payments.labels.totalpayments")}>{total.toFormat()}</DataLabel>
<DataLabel <DataLabel
valueStyle={{ color: balance.getAmount() !== 0 ? 'red' : 'green' }} valueStyle={{ color: balance.getAmount() !== 0 ? "red" : "green" }}
label={t('payments.labels.balance')} label={t("payments.labels.balance")}
> >
{balance.toFormat()} {balance.toFormat()}
</DataLabel> </DataLabel>
{balance.getAmount() !== 0 && ( {balance.getAmount() !== 0 && (
<Alert <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_ar")} />
style={{ margin: '8px 0px' }}
type="warning"
message={t('jobs.labels.outstanding_ar')}
/>
)} )}
</Card> </Card>
); );

24
client/src/components/job-close-ro-guard/job-close-ro-guard.bills.jsx
View File

@@ -1,17 +1,17 @@
import React from 'react'; import React from "react";
import { useQuery } from '@apollo/client'; import { useQuery } from "@apollo/client";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from "reselect";
import { QUERY_BILLS_BY_JOBID } from '../../graphql/bills.queries'; import { QUERY_BILLS_BY_JOBID } from "../../graphql/bills.queries";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from '../../redux/user/user.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import AlertComponent from '../alert/alert.component'; import AlertComponent from "../alert/alert.component";
import JobBillsTotalComponent from '../job-bills-total/job-bills-total.component'; import JobBillsTotalComponent from "../job-bills-total/job-bills-total.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -21,8 +21,8 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRoGuardBills
export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) { export function JobCloseRoGuardBills({ job, jobRO, bodyshop, form, warningCallback }) {
const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, { const { loading, error, data } = useQuery(QUERY_BILLS_BY_JOBID, {
variables: { jobid: job.id }, variables: { jobid: job.id },
fetchPolicy: 'network-only', fetchPolicy: "network-only",
nextFetchPolicy: 'network-only', nextFetchPolicy: "network-only"
}); });
if (error) return <AlertComponent message={error.message} type="error" />; if (error) return <AlertComponent message={error.message} type="error" />;

23
client/src/components/job-close-ro-guard/job-close-ro-guard.container.jsx
View File

@@ -76,20 +76,27 @@ export function JobCloseRoGuardContainer({ job, jobRO, bodyshop, form }) {
<Col className="ro-guard-col-multiple" md={24} lg={6}> <Col className="ro-guard-col-multiple" md={24} lg={6}>
<Row gutter={[32, 32]} style={{ height: "100%" }}> <Row gutter={[32, 32]} style={{ height: "100%" }}>
<Col span={24}> <Col span={24}>
<JobCloseRoGuardProfit <JobCloseRoGuardProfit job={job} form={form} warningCallback={warningCallback} />
job={job}
form={form} //warningCallback={warningCallback}
/>
</Col> </Col>
<Col span={24}> <Col span={24}>
<JobCloseRoGuardAr job={job} form={form} warningCallback={warningCallback} /> <JobCloseRoGuardAr job={job} form={form} warningCallback={warningCallback} />
</Col> </Col>
</Row> </Row>
</Col> </Col>
<Col className="ro-guard-col-50" md={24} lg={8}> {InstanceRenderManager({
<JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> imex: (
{InstanceRenderManager({ rome: <JobCloseRoGuardPpd job={job} warningCallback={warningCallback} /> })} <Col md={24} lg={8}>
</Col> {/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */}
<JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
</Col>
),
rome: (
<Col md={24} lg={8}>
{/* <JobCloseRoGuardSublet job={job} warningCallback={warningCallback} /> */}
<JobCloseRoGuardPpd job={job} warningCallback={warningCallback} />
</Col>
)
})}
<Col className="ro-guard-col" md={24} lg={10}> <Col className="ro-guard-col" md={24} lg={10}>
<JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} /> <JobCloseRoGuardLabor job={job} form={form} warningCallback={warningCallback} />
</Col> </Col>

34
client/src/components/job-close-ro-guard/job-close-ro-guard.profit.jsx
View File

@@ -1,20 +1,19 @@
import React, { useEffect, useState } from 'react'; import React, { useEffect, useState } from "react";
import { LockOutlined } from '@ant-design/icons'; import { Alert, Card } from "antd";
import { Card, Form, Input } from 'antd'; import axios from "axios";
import axios from 'axios'; import { useTranslation } from "react-i18next";
import { useTranslation } from 'react-i18next'; import { connect } from "react-redux";
import { connect } from 'react-redux'; import { createStructuredSelector } from "reselect";
import { createStructuredSelector } from 'reselect'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import { selectBodyshop } from '../../redux/user/user.selectors'; import JobCostingStatistics from "../job-costing-statistics/job-costing-statistics.component";
import JobCostingStatistics from '../job-costing-statistics/job-costing-statistics.component'; import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import LoadingSkeleton from '../loading-skeleton/loading-skeleton.component';
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -31,7 +30,7 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
try { try {
if (job.id) { if (job.id) {
setLoading(true); setLoading(true);
const { data } = await axios.post('/job/costing', { jobid: job.id }); const { data } = await axios.post("/job/costing", { jobid: job.id });
setCostingData(data); setCostingData(data);
} }
} catch (error) {} } catch (error) {}
@@ -45,16 +44,19 @@ export function JobCloseRoGuardProfit({ job, jobRO, bodyshop, form, warningCallb
parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum; parseFloat(costingData?.summaryData.gppercent) < bodyshop?.md_ro_guard?.totalgppercent_minimum;
useEffect(() => { useEffect(() => {
if (enforceProfitPassword && typeof warningCallback === 'function') { if (enforceProfitPassword && typeof warningCallback === "function") {
warningCallback({ key: 'profit', warning: t('jobs.labels.profitbypassrequired') }); warningCallback({ key: "profit", warning: t("jobs.labels.profitbypassrequired") });
} }
}, [enforceProfitPassword, t, warningCallback]); }, [enforceProfitPassword, t, warningCallback]);
if (loading || !costingData) return <LoadingSkeleton />; if (loading || !costingData) return <LoadingSkeleton />;
return ( return (
<Card title={t('jobs.labels.profits')} style={{ height: '100%' }}> <Card title={t("jobs.labels.profits")} style={{ height: "100%" }}>
<JobCostingStatistics summaryData={costingData?.summaryData} onlyGP /> <JobCostingStatistics summaryData={costingData?.summaryData} onlyGP />
{enforceProfitPassword && (
<Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.profitbypassrequired")} />
)}
</Card> </Card>
); );
} }

81
client/src/components/job-close-ro-guard/job-close-ro-guard.sublet.jsx
View File

@@ -1,17 +1,17 @@
import React, { useEffect } from 'react'; import React, { useEffect } from "react";
import { Alert, Card, Table } from 'antd'; import { Alert, Card, Table } from "antd";
import { t } from 'i18next'; import { t } from "i18next";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from "reselect";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
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 { alphaSort } from '../../utils/sorters'; import { alphaSort } from "../../utils/sorters";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))
@@ -20,69 +20,56 @@ export default connect(mapStateToProps, mapDispatchToProps)(JobCloseRGuardSublet
export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallback }) { export function JobCloseRGuardSublet({ job, jobRO, bodyshop, form, warningCallback }) {
const subletsNotDone = job?.joblines.filter( const subletsNotDone = job?.joblines.filter(
(j) => (j) => (j.part_type === "PAS" || j.part_type === "PASL") && (!j.sublet_completed || !j.sublet_ignored)
(j.part_type === 'PAS' || j.part_type === 'PASL') &&
(!j.sublet_completed || !j.sublet_ignored)
); );
const columns = [ const columns = [
{ {
title: t('joblines.fields.line_desc'), title: t("joblines.fields.line_desc"),
dataIndex: 'line_desc', dataIndex: "line_desc",
fixed: 'left', fixed: "left",
key: 'line_desc', key: "line_desc",
sorter: (a, b) => alphaSort(a.line_desc, b.line_desc), sorter: (a, b) => alphaSort(a.line_desc, b.line_desc),
onCell: (record) => ({ onCell: (record) => ({
className: record.manual_line && 'job-line-manual', className: record.manual_line && "job-line-manual",
style: { style: {
...(record.critical ? { boxShadow: ' -.5em 0 0 #FFC107' } : {}), ...(record.critical ? { boxShadow: " -.5em 0 0 #FFC107" } : {})
}, }
}), }),
ellipsis: true, ellipsis: true
}, },
{ {
title: t('joblines.fields.act_price'), title: t("joblines.fields.act_price"),
dataIndex: 'act_price', dataIndex: "act_price",
key: 'act_price', key: "act_price",
sorter: (a, b) => a.act_price - b.act_price, sorter: (a, b) => a.act_price - b.act_price,
ellipsis: true, ellipsis: true,
render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>, render: (text, record) => <CurrencyFormatter>{record.act_price}</CurrencyFormatter>
}, },
{ {
title: t('joblines.fields.part_qty'), title: t("joblines.fields.part_qty"),
dataIndex: 'part_qty', dataIndex: "part_qty",
key: 'part_qty', key: "part_qty"
}, },
{ {
title: t('joblines.fields.notes'), title: t("joblines.fields.notes"),
dataIndex: 'notes', dataIndex: "notes",
key: 'notes', key: "notes"
}, }
]; ];
useEffect(() => { useEffect(() => {
if (subletsNotDone.length > 0) { if (subletsNotDone.length > 0) {
warningCallback({ key: 'sublet', warning: t('jobs.labels.outstanding_sublets') }); warningCallback({ key: "sublet", warning: t("jobs.labels.outstanding_sublets") });
} }
}, [subletsNotDone.length, warningCallback]); }, [subletsNotDone.length, warningCallback]);
return ( return (
<Card title={t('jobs.labels.subletsnotcompleted')}> <Card title={t("jobs.labels.subletsnotcompleted")}>
<Table <Table dataSource={subletsNotDone} columns={columns} pagination={false} rowKey="id" bordered size="small" />
dataSource={subletsNotDone}
columns={columns}
pagination={false}
rowKey="id"
bordered
size="small"
/>
{subletsNotDone.length > 0 && ( {subletsNotDone.length > 0 && (
<Alert <Alert style={{ margin: "8px 0px" }} type="warning" message={t("jobs.labels.outstanding_sublets")} />
style={{ margin: '8px 0px' }}
type="warning"
message={t('jobs.labels.outstanding_sublets')}
/>
)} )}
</Card> </Card>
); );

14
client/src/components/job-close-ro-guard/job-close-ro-guard.tt-lifecycle.jsx
View File

@@ -1,14 +1,14 @@
import React from 'react'; import React from "react";
import { connect } from 'react-redux'; import { connect } from "react-redux";
import { createStructuredSelector } from 'reselect'; import { createStructuredSelector } from "reselect";
import { selectJobReadOnly } from '../../redux/application/application.selectors'; import { selectJobReadOnly } from "../../redux/application/application.selectors";
import { selectBodyshop } from '../../redux/user/user.selectors'; import { selectBodyshop } from "../../redux/user/user.selectors";
import JobLifecycleComponent from '../job-lifecycle/job-lifecycle.component'; import JobLifecycleComponent from "../job-lifecycle/job-lifecycle.component";
const mapStateToProps = createStructuredSelector({ const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser //currentUser: selectCurrentUser
bodyshop: selectBodyshop, bodyshop: selectBodyshop,
jobRO: selectJobReadOnly, jobRO: selectJobReadOnly
}); });
const mapDispatchToProps = (dispatch) => ({ const mapDispatchToProps = (dispatch) => ({
//setUserLanguage: language => dispatch(setUserLanguage(language)) //setUserLanguage: language => dispatch(setUserLanguage(language))

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

@@ -2003,6 +2003,7 @@
"ppc": "This line contains a part price change.", "ppc": "This line contains a part price change.",
"ppdnotexported": "PPDs not Exported", "ppdnotexported": "PPDs not Exported",
"profileadjustments": "Profile Disc./Mkup", "profileadjustments": "Profile Disc./Mkup",
"profitbypassrequired": "Minimum gross profit requirements have not been met.",
"profits": "Job Profits", "profits": "Job Profits",
"prt_dsmk_total": "Line Item Adjustment", "prt_dsmk_total": "Line Item Adjustment",
"rates": "Rates", "rates": "Rates",

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

@@ -2003,6 +2003,7 @@
"ppc": "", "ppc": "",
"ppdnotexported": "", "ppdnotexported": "",
"profileadjustments": "", "profileadjustments": "",
"profitbypassrequired": "",
"profits": "", "profits": "",
"prt_dsmk_total": "", "prt_dsmk_total": "",
"rates": "Tarifas", "rates": "Tarifas",

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

@@ -2003,6 +2003,7 @@
"ppc": "", "ppc": "",
"ppdnotexported": "", "ppdnotexported": "",
"profileadjustments": "", "profileadjustments": "",
"profitbypassrequired": "",
"profits": "", "profits": "",
"prt_dsmk_total": "", "prt_dsmk_total": "",
"rates": "Les taux", "rates": "Les taux",