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

BOD-62 creation of totals utility class + base calculations.

Browse Source
This commit is contained in:
Patrick Fic
2020-04-06 21:09:48 -07:00
parent 4c679b6d83
commit 6bf9ba5be0
7 changed files with 560 additions and 122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
client/src/components/job-totals-table/job-totals-table.component.jsx Normal file
View File

@@ -0,0 +1,9 @@
import React from "react";
export default function JobsTotalsTableComponent({ totals }) {
return (
<div>
<div>{JSON.stringify(totals, null, 2)}</div>
</div>
);
}

56
client/src/components/job-totals-table/job-totals-table.container.jsx Normal file
View File

@@ -0,0 +1,56 @@
import { useQuery } from "@apollo/react-hooks";
import React, { useEffect, useState } from "react";
import { QUERY_JOB_FINANCIALS } from "../../graphql/jobs.queries";
import AlertComponent from "../alert/alert.component";
import LoadingSpinner from "../loading-spinner/loading-spinner.component";
import JobTotalsTableComponent from "./job-totals-table.component";
import {
CalculateRatesTotals,
CalculatePartsTotals,
CalculateCustPayable
} from "./job-totals.utility";
export default function JobTotalsTableContainer({ jobId }) {
const { loading, error, data } = useQuery(QUERY_JOB_FINANCIALS, {
variables: { jobId: jobId }
});
const [totals, setTotals] = useState({});
useEffect(() => {
if (!!data) {
setTotals({
parts: CalculatePartsTotals(data.jobs_by_pk.joblines),
rates: CalculateRatesTotals(data.jobs_by_pk),
custPayable: CalculateCustPayable(data.jobs_by_pk)
});
}
}, [data]);
console.log("totals", totals);
if (loading) return <LoadingSpinner />;
if (error) return <AlertComponent message={error.message} type='error' />;
return (
<div>
<JobTotalsTableComponent totals={totals} />
<div>
<div>STL Data</div>
<div>
{data
? JSON.stringify(data.jobs_by_pk.cieca_stl.data, null, 2)
: null}
</div>
</div>
<div>
<div>ttl Data</div>
<div>
{data
? JSON.stringify(data.jobs_by_pk.cieca_ttl.data, null, 2)
: null}
</div>
</div>
</div>
);
}

179
client/src/components/job-totals-table/job-totals.utility.js Normal file
View File

@@ -0,0 +1,179 @@
export function CalculateRatesTotals(ratesList) {
const jobLines = ratesList.joblines;
let ret = {
rate_la1: {
hours: jobLines
.filter(item => item.mod_lbr_ty === "LA1")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2),
rate: ratesList.rate_la1
},
rate_la2: {
hours: jobLines
.filter(item => item.mod_lbr_ty === "LA2")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2),
rate: ratesList.rate_la2
},
rate_la3: {
rate: ratesList.rate_la3,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LA3")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_la4: {
rate: ratesList.rate_la4,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LA4")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_laa: {
rate: ratesList.rate_laa,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAA")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lab: {
rate: ratesList.rate_lab,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAB")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lad: {
rate: ratesList.rate_lad,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAD")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lae: {
rate: ratesList.rate_lae,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAE")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_laf: {
rate: ratesList.rate_laf,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAF")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lag: {
rate: ratesList.rate_lag,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAG")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lam: {
rate: ratesList.rate_lam,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAM")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lar: {
rate: ratesList.rate_lar,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAR")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_las: {
rate: ratesList.rate_las,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAS")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
},
rate_lau: {
rate: ratesList.rate_lau,
hours: jobLines
.filter(item => item.mod_lbr_ty === "LAU")
.reduce((acc, value) => acc + value.mod_lb_hrs, 0)
.toFixed(2)
}
};
let subtotal = 0;
for (const property in ret) {
ret[property].total = (ret[property].hours * ret[property].rate).toFixed(2);
subtotal = subtotal + ret[property].hours * ret[property].rate;
}
ret.subtotal = subtotal.toFixed(2);
return ret;
}
export function CalculatePartsTotals(jobLines) {
const ret = jobLines.reduce(
(acc, value) => {
switch (value.part_type) {
case "PAA":
case "PAC":
case "PAG":
case "PAL":
case "PAM":
case "PAN":
case "PAND":
case "PANF":
case "PAO":
case "PAP":
case "PAR":
return {
...acc,
parts: {
...acc.parts,
subtotal: acc.parts.subtotal + value.act_price
//TODO Add Adjustments in
}
};
case "PAS":
case "PASL":
return {
...acc,
sublets: {
...acc.sublets,
subtotal: acc.sublets.subtotal + value.act_price
//TODO Add Adjustments in
}
};
default:
return acc;
}
},
{
parts: { subtotal: 0, adjustments: 0, total: 0 },
sublets: { subtotal: 0, adjustments: 0, total: 0 }
}
);
return {
parts: { ...ret.parts, total: ret.parts.subtotal + ret.parts.adjustments },
sublets: {
...ret.sublets,
total: ret.sublets.subtotal + ret.sublets.adjustments
}
};
}
export function CalculateCustPayable(job) {
return {
deductible: job.ded_amt || 0,
federal_tax: job.federal_tax_payable || 0,
other_customer_amount: job.other_amount_payable || 0,
dep_taxes: job.depreciation_taxes || 0,
total:
job.ded_amt ||
0 + job.federal_tax_payable ||
0 + job.other_amount_payable ||
0 + job.depreciation_taxes ||
0
};
}

246
client/src/components/jobs-detail-financial/jobs-detail-financial.component.jsx
View File

@@ -1,131 +1,133 @@
import { Divider, Form, Input, InputNumber } from "antd"; import { Divider, Form, Input, InputNumber, Row, Col } from "antd";
import React from "react"; import React from "react";
import { useTranslation } from "react-i18next"; import { useTranslation } from "react-i18next";
import JobTotalsTableContainer from "../job-totals-table/job-totals-table.container";
export default function JobsDetailFinancials({ job }) { export default function JobsDetailFinancials({ job }) {
const { t } = useTranslation(); const { t } = useTranslation();
return ( return (
<div> <Row>
<Form.Item label={t("jobs.fields.ded_amt")} name="ded_amt"> <Col offset={1} span={10}>
<InputNumber /> <Form.Item label={t("jobs.fields.ded_amt")} name='ded_amt'>
</Form.Item> <InputNumber />
<Form.Item label={t("jobs.fields.ded_status")} name="ded_status"> </Form.Item>
<Input /> <Form.Item label={t("jobs.fields.ded_status")} name='ded_status'>
</Form.Item> <Input />
<Form.Item </Form.Item>
label={t("jobs.fields.depreciation_taxes")} <Form.Item
name="depreciation_taxes" label={t("jobs.fields.depreciation_taxes")}
> name='depreciation_taxes'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
TODO This is equivalent of GST payable. TODO This is equivalent of GST payable.
<Form.Item <Form.Item
label={t("jobs.fields.federal_tax_payable")} label={t("jobs.fields.federal_tax_payable")}
name="federal_tax_payable" name='federal_tax_payable'>
> <InputNumber />
<InputNumber /> </Form.Item>
</Form.Item> TODO equivalent of other customer amount
TODO equivalent of other customer amount <Form.Item
<Form.Item label={t("jobs.fields.other_amount_payable")}
label={t("jobs.fields.other_amount_payable")} name='other_amount_payable'>
name="other_amount_payable" <InputNumber />
> </Form.Item>
<InputNumber /> <Form.Item
</Form.Item> label={t("jobs.fields.towing_payable")}
<Form.Item label={t("jobs.fields.towing_payable")} name="towing_payable"> name='towing_payable'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item <Form.Item
label={t("jobs.fields.storage_payable")} label={t("jobs.fields.storage_payable")}
name="storage_payable" name='storage_payable'>
> <InputNumber />
<InputNumber /> </Form.Item>
</Form.Item> <Form.Item
<Form.Item label={t("jobs.fields.adjustment_bottom_line")}
label={t("jobs.fields.adjustment_bottom_line")} name='adjustment_bottom_line'>
name="adjustment_bottom_line" <InputNumber />
> </Form.Item>
<InputNumber /> <Divider />
</Form.Item> Totals Table
<Divider /> <Form.Item
Totals Table label={t("jobs.fields.labor_rate_desc")}
<Form.Item name='labor_rate_desc'>
label={t("jobs.fields.labor_rate_desc")} <Input />
name="labor_rate_desc" </Form.Item>
> <Form.Item label={t("jobs.fields.rate_lab")} name='rate_lab'>
<Input /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lab")} name="rate_lab"> <Form.Item label={t("jobs.fields.rate_lad")} name='rate_lad'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lad")} name="rate_lad"> <Form.Item label={t("jobs.fields.rate_lae")} name='rate_lae'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lae")} name="rate_lae"> <Form.Item label={t("jobs.fields.rate_lar")} name='rate_lar'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lar")} name="rate_lar"> <Form.Item label={t("jobs.fields.rate_las")} name='rate_las'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_las")} name="rate_las"> <Form.Item label={t("jobs.fields.rate_laf")} name='rate_laf'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_laf")} name="rate_laf"> <Form.Item label={t("jobs.fields.rate_lam")} name='rate_lam'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lam")} name="rate_lam"> <Form.Item label={t("jobs.fields.rate_lag")} name='rate_lag'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lag")} name="rate_lag"> Note //TODO Remove ATP rate?
<InputNumber /> <Form.Item label={t("jobs.fields.rate_atp")} name='rate_atp'>
</Form.Item> <InputNumber />
Note //TODO Remove ATP rate? </Form.Item>
<Form.Item label={t("jobs.fields.rate_atp")} name="rate_atp"> <Form.Item label={t("jobs.fields.rate_lau")} name='rate_lau'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_lau")} name="rate_lau"> <Form.Item label={t("jobs.fields.rate_la1")} name='rate_la1'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_la1")} name="rate_la1"> <Form.Item label={t("jobs.fields.rate_la2")} name='rate_la2'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_la2")} name="rate_la2"> <Form.Item label={t("jobs.fields.rate_la3")} name='rate_la3'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_la3")} name="rate_la3"> <Form.Item label={t("jobs.fields.rate_la4")} name='rate_la4'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_la4")} name="rate_la4"> <Form.Item label={t("jobs.fields.rate_mapa")} name='rate_mapa'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_mapa")} name="rate_mapa"> <Form.Item label={t("jobs.fields.rate_mash")} name='rate_mash'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_mash")} name="rate_mash"> <Form.Item label={t("jobs.fields.rate_mahw")} name='rate_mahw'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_mahw")} name="rate_mahw"> <Form.Item label={t("jobs.fields.rate_ma2s")} name='rate_ma2s'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_ma2s")} name="rate_ma2s"> <Form.Item label={t("jobs.fields.rate_ma3s")} name='rate_ma3s'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_ma3s")} name="rate_ma3s"> <Form.Item label={t("jobs.fields.rate_mabl")} name='rate_mabl'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_mabl")} name="rate_mabl"> <Form.Item label={t("jobs.fields.rate_macs")} name='rate_macs'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_macs")} name="rate_macs"> <Form.Item label={t("jobs.fields.rate_matd")} name='rate_matd'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_matd")} name="rate_matd"> <Form.Item label={t("jobs.fields.rate_laa")} name='rate_laa'>
<InputNumber /> <InputNumber />
</Form.Item> </Form.Item>
<Form.Item label={t("jobs.fields.rate_laa")} name="rate_laa"> </Col>
<InputNumber /> <Col offset={2} span={10}>
</Form.Item> <JobTotalsTableContainer jobId={job.id} />
</div> </Col>
</Row>
); );
} }

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

@@ -385,3 +385,47 @@ export const ACTIVE_JOBS_FOR_AUTOCOMPLETE = gql`
} }
} }
`; `;
export const QUERY_JOB_FINANCIALS = gql`
query QUERY_JOB_FINANCIALS($jobId: uuid!) {
jobs_by_pk(id: $jobId) {
id
cieca_ttl
cieca_stl
ded_amt
depreciation_taxes
federal_tax_payable
other_amount_payable
rate_atp
rate_la1
rate_la2
rate_la3
rate_la4
rate_laa
rate_lab
rate_lad
rate_lae
rate_laf
rate_lag
rate_lam
rate_lar
rate_las
rate_lau
rate_ma2s
rate_ma2t
rate_ma3s
rate_mabl
rate_macs
rate_mahw
rate_mapa
rate_mash
rate_matd
joblines {
mod_lbr_ty
act_price
mod_lb_hrs
part_type
}
}
}
`;

74
hasura/migrations/1586216036874_update_permission_user_public_table_joblines/down.yaml Normal file
View File

@@ -0,0 +1,74 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: false
columns:
- alt_overrd
- alt_part_i
- bett_tax
- cert_part
- glass_flag
- lbr_hrs_j
- lbr_inc
- lbr_op_j
- lbr_tax
- lbr_typ_j
- misc_sublt
- misc_tax
- price_inc
- price_j
- tax_part
- est_seq
- paint_stg
- paint_tone
- part_qty
- unq_seq
- act_price
- bett_amt
- bett_pctg
- db_hrs
- db_price
- lbr_amt
- line_ref
- misc_amt
- mod_lb_hrs
- prt_dsmk_m
- prt_dsmk_p
- alt_co_id
- alt_partm
- alt_partno
- bett_type
- db_ref
- lbr_op
- line_desc
- line_ind
- mod_lbr_ty
- oem_partno
- op_code_desc
- part_type
- status
- created_at
- updated_at
- id
- jobid
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: joblines
schema: public
type: create_select_permission

74
hasura/migrations/1586216036874_update_permission_user_public_table_joblines/up.yaml Normal file
View File

@@ -0,0 +1,74 @@
- args:
role: user
table:
name: joblines
schema: public
type: drop_select_permission
- args:
permission:
allow_aggregations: true
columns:
- alt_overrd
- alt_part_i
- bett_tax
- cert_part
- glass_flag
- lbr_hrs_j
- lbr_inc
- lbr_op_j
- lbr_tax
- lbr_typ_j
- misc_sublt
- misc_tax
- price_inc
- price_j
- tax_part
- est_seq
- paint_stg
- paint_tone
- part_qty
- unq_seq
- act_price
- bett_amt
- bett_pctg
- db_hrs
- db_price
- lbr_amt
- line_ref
- misc_amt
- mod_lb_hrs
- prt_dsmk_m
- prt_dsmk_p
- alt_co_id
- alt_partm
- alt_partno
- bett_type
- db_ref
- lbr_op
- line_desc
- line_ind
- mod_lbr_ty
- oem_partno
- op_code_desc
- part_type
- status
- created_at
- updated_at
- id
- jobid
computed_fields: []
filter:
job:
bodyshop:
associations:
_and:
- user:
authid:
_eq: X-Hasura-User-Id
- active:
_eq: true
role: user
table:
name: joblines
schema: public
type: create_select_permission