IO-834 IO-835 Totals table formatting.

This commit is contained in:
Patrick Fic
2021-04-06 14:29:44 -07:00
parent 4779964449
commit 5b17bfaaa0
10 changed files with 58 additions and 23 deletions

View File

@@ -47,17 +47,21 @@ export function JobsTotalsTableComponent({ jobRO, job }) {
</Col>
<Col {...colSpan}>
<Row gutter={[16, 16]}>
<Col sm={24} md={12}>
<Card title={t("jobs.labels.partstotal")}>
<JobTotalsTableParts job={job} />
</Card>
<Col {...colSpan}>
<Row gutter={[16, 16]}>
<Col span={24}>
<Card title={t("jobs.labels.partstotal")}>
<JobTotalsTableParts job={job} />
</Card>
</Col>
<Col span={24}>
<Card title={t("jobs.labels.othertotal")}>
<JobTotalsTableOther job={job} />
</Card>
</Col>
</Row>
</Col>
<Col sm={24} md={12}>
<Card title={t("jobs.labels.othertotal")}>
<JobTotalsTableOther job={job} />
</Card>
</Col>
<Col span={24}>
<Col {...colSpan}>
<Card title={t("jobs.labels.jobtotals")}>
<JobTotalsTableTotals job={job} />
</Card>

View File

@@ -103,11 +103,11 @@ export default function JobTotalsTableLabor({ job }) {
<>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.labor_rates_subtotal")}
<strong>{t("jobs.labels.labor_rates_subtotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell />
<Table.Summary.Cell />
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}
</strong>
@@ -121,7 +121,7 @@ export default function JobTotalsTableLabor({ job }) {
<Table.Summary.Cell>
{job.job_totals.rates.mapa.hours.toFixed(2)}
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
{Dinero(job.job_totals.rates.mapa.total).toFormat()}
</Table.Summary.Cell>
</Table.Summary.Row>
@@ -133,19 +133,19 @@ export default function JobTotalsTableLabor({ job }) {
<Table.Summary.Cell>
{job.job_totals.rates.mash.hours.toFixed(2)}
</Table.Summary.Cell>
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
{Dinero(job.job_totals.rates.mash.total).toFormat()}
</Table.Summary.Cell>
</Table.Summary.Row>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.labor_rates_subtotal")}
<strong>{t("jobs.labels.rates_subtotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell />
<Table.Summary.Cell />
<Table.Summary.Cell>
<Table.Summary.Cell align="right">
<strong>
{Dinero(job.job_totals.rates.rates_subtotal).toFormat()}
{Dinero(job.job_totals.rates.subtotal).toFormat()}
</strong>
</Table.Summary.Cell>
</Table.Summary.Row>

View File

@@ -79,7 +79,7 @@ export default function JobTotalsTableOther({ job }) {
<>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.additionaltotal")}
<strong>{t("jobs.labels.additionaltotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
@@ -90,7 +90,7 @@ export default function JobTotalsTableOther({ job }) {
</Table.Summary.Row>
<Table.Summary.Row>
<Table.Summary.Cell>
{t("jobs.labels.subletstotal")}
<strong>{t("jobs.labels.subletstotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>

View File

@@ -70,7 +70,9 @@ export default function JobTotalsTableParts({ job }) {
}}
summary={() => (
<Table.Summary.Row>
<Table.Summary.Cell>{t("jobs.labels.partstotal")}</Table.Summary.Cell>
<Table.Summary.Cell>
<strong>{t("jobs.labels.partstotal")}</strong>
</Table.Summary.Cell>
<Table.Summary.Cell>
<strong>