BOD-72 Refactored calculations to use Dinero library.

This commit is contained in:
Patrick Fic
2020-04-29 13:25:31 -07:00
parent a9bd0a5ccb
commit 99d3a6a64e
6 changed files with 240 additions and 209 deletions

View File

@@ -1,12 +1,28 @@
import { Col, Descriptions, Row, Statistic, Result } from "antd";
import React from "react";
import { Col, Descriptions, Row, Statistic } from "antd";
import React, { useEffect, useState } from "react";
import { useTranslation } from "react-i18next";
import { connect } from "react-redux";
import { createStructuredSelector } from "reselect";
import { selectBodyshop } from "../../redux/user/user.selectors";
import LoadingSkeleton from "../loading-skeleton/loading-skeleton.component";
import { CalculateJob } from "./job-totals.utility";
const mapStateToProps = createStructuredSelector({
//currentUser: selectCurrentUser
bodyshop: selectBodyshop,
});
export default function JobsTotalsTableComponent({ totals }) {
export function JobsTotalsTableComponent({ bodyshop, job }) {
const { t } = useTranslation();
if (!!!totals)
return <Result status='warning' title={t("jobs.errors.nofinancial")} />;
const [totals, setTotals] = useState(null);
useEffect(() => {
setTotals(CalculateJob(job, bodyshop.shoprates));
}, [bodyshop, job]);
if (!!!totals) {
console.log("Totals was falsey.");
return <LoadingSkeleton />;
}
return (
<div>
<Row>
@@ -17,161 +33,161 @@ export default function JobsTotalsTableComponent({ totals }) {
title={t("jobs.labels.rates")}>
<Descriptions.Item label={t("jobs.fields.rate_laa")}>
<Statistic
value={totals.rates.rate_laa.total}
value={totals.rates.rate_laa.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_laa.hours.toFixed(2)} @ ${
totals.rates.rate_laa.rate
})`}
suffix={`(${totals.rates.rate_laa.hours.toFixed(
2
)} @ ${totals.rates.rate_laa.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lab")}>
<Statistic
value={totals.rates.rate_lab.total}
value={totals.rates.rate_lab.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lab.hours.toFixed(2)} @ ${
totals.rates.rate_lab.rate
})`}
suffix={`(${totals.rates.rate_lab.hours.toFixed(
2
)} @ ${totals.rates.rate_lab.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lad")}>
<Statistic
value={totals.rates.rate_lad.total}
value={totals.rates.rate_lad.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lad.hours.toFixed(2)} @ ${
totals.rates.rate_lad.rate
})`}
suffix={`(${totals.rates.rate_lad.hours.toFixed(
2
)} @ ${totals.rates.rate_lad.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lae")}>
<Statistic
value={totals.rates.rate_lae.total}
value={totals.rates.rate_lae.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lae.hours.toFixed(2)} @ ${
totals.rates.rate_lae.rate
})`}
suffix={`(${totals.rates.rate_lae.hours.toFixed(
2
)} @ ${totals.rates.rate_lae.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_laf")}>
<Statistic
value={totals.rates.rate_laf.total}
value={totals.rates.rate_laf.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_laf.hours.toFixed(2)} @ ${
totals.rates.rate_laf.rate
})`}
suffix={`(${totals.rates.rate_laf.hours.toFixed(
2
)} @ ${totals.rates.rate_laf.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lag")}>
<Statistic
value={totals.rates.rate_lag.total}
value={totals.rates.rate_lag.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lag.hours.toFixed(2)} @ ${
totals.rates.rate_lag.rate
})`}
suffix={`(${totals.rates.rate_lag.hours.toFixed(
2
)} @ ${totals.rates.rate_lag.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lam")}>
<Statistic
value={totals.rates.rate_lam.total}
value={totals.rates.rate_lam.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lam.hours.toFixed(2)} @ ${
totals.rates.rate_lam.rate
})`}
suffix={`(${totals.rates.rate_lam.hours.toFixed(
2
)} @ ${totals.rates.rate_lam.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lar")}>
<Statistic
value={totals.rates.rate_lar.total}
value={totals.rates.rate_lar.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lar.hours.toFixed(2)} @ ${
totals.rates.rate_lar.rate
})`}
suffix={`(${totals.rates.rate_lar.hours.toFixed(
2
)} @ ${totals.rates.rate_lar.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_las")}>
<Statistic
value={totals.rates.rate_las.total}
value={totals.rates.rate_las.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_las.hours.toFixed(2)} @ ${
totals.rates.rate_las.rate
})`}
suffix={`(${totals.rates.rate_las.hours.toFixed(
2
)} @ ${totals.rates.rate_las.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_lau")}>
<Statistic
value={totals.rates.rate_lau.total}
value={totals.rates.rate_lau.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_lau.hours.toFixed(2)} @ ${
totals.rates.rate_lau.rate
})`}
suffix={`(${totals.rates.rate_lau.hours.toFixed(
2
)} @ ${totals.rates.rate_lau.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_la1")}>
<Statistic
value={totals.rates.rate_la1.total}
value={totals.rates.rate_la1.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_la1.hours.toFixed(2)} @ ${
totals.rates.rate_la1.rate
})`}
suffix={`(${totals.rates.rate_la1.hours.toFixed(
2
)} @ ${totals.rates.rate_la1.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_la2")}>
<Statistic
value={totals.rates.rate_la2.total}
value={totals.rates.rate_la2.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_la2.hours.toFixed(2)} @ ${
totals.rates.rate_la2.rate
})`}
suffix={`(${totals.rates.rate_la2.hours.toFixed(
2
)} @ ${totals.rates.rate_la2.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_la3")}>
<Statistic
value={totals.rates.rate_la3.total}
value={totals.rates.rate_la3.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_la3.hours.toFixed(2)} @ ${
totals.rates.rate_la3.rate
})`}
suffix={`(${totals.rates.rate_la3.hours.toFixed(
2
)} @ ${totals.rates.rate_la3.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_la4")}>
<Statistic
value={totals.rates.rate_la4.total}
value={totals.rates.rate_la4.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_la4.hours.toFixed(2)} @ ${
totals.rates.rate_la4.rate
})`}
suffix={`(${totals.rates.rate_la4.hours.toFixed(
2
)} @ ${totals.rates.rate_la4.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.fields.rate_atp")}>
<Statistic
value={totals.rates.rate_atp.total}
value={totals.rates.rate_atp.total.toFormat()}
precision={2}
suffix={`(${totals.rates.rate_atp.hours.toFixed(2)} @ ${
totals.rates.rate_atp.rate
})`}
suffix={`(${totals.rates.rate_atp.hours.toFixed(
2
)} @ ${totals.rates.rate_atp.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.labels.paint_mat")}>
<Statistic
value={totals.rates.paint_mat.total}
value={totals.rates.paint_mat.total.toFormat()}
precision={2}
suffix={`(${totals.rates.paint_mat.hours.toFixed(2)} @ ${
totals.rates.paint_mat.rate
})`}
suffix={`(${totals.rates.paint_mat.hours.toFixed(
2
)} @ ${totals.rates.paint_mat.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.labels.shop_mat")}>
<Statistic
value={totals.rates.shop_mat.total}
value={totals.rates.shop_mat.total.toFormat()}
precision={2}
suffix={`(${totals.rates.shop_mat.hours.toFixed(2)} @ ${
totals.rates.shop_mat.rate
})`}
suffix={`(${totals.rates.shop_mat.hours.toFixed(
2
)} @ ${totals.rates.shop_mat.rate})`}
/>
</Descriptions.Item>
<Descriptions.Item
style={{ color: "red" }}
label={t("jobs.labels.rates_subtotal")}>
<Statistic value={totals.rates.subtotal} precision={2} />
<Statistic value={totals.rates.subtotal.toFormat()} />
</Descriptions.Item>
</Descriptions>
</Row>
@@ -184,16 +200,14 @@ export default function JobsTotalsTableComponent({ totals }) {
title={t("jobs.labels.partssubletstotal")}>
<Descriptions.Item label={t("jobs.labels.partstotal")}>
<Statistic
value={totals.parts.parts.total}
precision={2}
suffix={`(${totals.parts.parts.subtotal} ± ${totals.parts.parts.adjustments})`}
value={totals.parts.parts.total.toFormat()}
suffix={`(${totals.parts.parts.subtotal.toFormat()} ± ${totals.parts.parts.adjustments.toFormat()})`}
/>
</Descriptions.Item>
<Descriptions.Item label={t("jobs.labels.subletstotal")}>
<Statistic
value={totals.parts.sublets.total}
precision={2}
suffix={`(${totals.parts.sublets.subtotal} ± ${totals.parts.sublets.adjustments})`}
value={totals.parts.sublets.total.toFormat()}
suffix={`(${totals.parts.sublets.subtotal.toFormat()} ± ${totals.parts.sublets.adjustments.toFormat()})`}
/>
</Descriptions.Item>
</Descriptions>
@@ -206,32 +220,31 @@ export default function JobsTotalsTableComponent({ totals }) {
column={1}
title={t("jobs.labels.totals")}>
<Descriptions.Item label={t("jobs.labels.subtotal")}>
<Statistic value={totals.totals.subtotal} precision={2} />
<Statistic value={totals.totals.subtotal.toFormat()} />
</Descriptions.Item>
<Descriptions.Item label={t("jobs.labels.federal_tax_amt")}>
<Statistic value={totals.totals.federal_tax} precision={2} />
<Statistic value={totals.totals.federal_tax.toFormat()} />
</Descriptions.Item>
<Descriptions.Item label={t("jobs.labels.state_tax_amt")}>
<Statistic value={totals.totals.state_tax} precision={2} />
<Statistic value={totals.totals.state_tax.toFormat()} />
</Descriptions.Item>
<Descriptions.Item label={t("jobs.labels.local_tax_amt")}>
<Statistic value={totals.totals.local_tax_amt} precision={2} />
<Statistic value={totals.totals.local_tax.toFormat()} />
</Descriptions.Item>
</Descriptions>
</Col>
<Col span={8}>
<Statistic
title={t("jobs.labels.total_repairs")}
value={totals.totals.total_repairs}
precision={2}
value={totals.totals.total_repairs.toFormat()}
/>
<Statistic
title={t("jobs.labels.net_repairs")}
value={totals.totals.net_repairs}
precision={2}
value={totals.totals.net_repairs.toFormat()}
/>
</Col>
</Row>
</div>
);
}
export default connect(mapStateToProps, null)(JobsTotalsTableComponent);