DMS Updates
This commit is contained in:
@@ -97,18 +97,20 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
|
|||||||
dataSource={allocationsSummary}
|
dataSource={allocationsSummary}
|
||||||
locale={{ emptyText: t("dms.labels.refreshallocations") }}
|
locale={{ emptyText: t("dms.labels.refreshallocations") }}
|
||||||
summary={() => {
|
summary={() => {
|
||||||
const totals = allocationsSummary.reduce(
|
const totals =
|
||||||
(acc, val) => {
|
allocationsSummary &&
|
||||||
return {
|
allocationsSummary.reduce(
|
||||||
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
(acc, val) => {
|
||||||
totalCost: acc.totalCost.add(Dinero(val.cost)),
|
return {
|
||||||
};
|
totalSale: acc.totalSale.add(Dinero(val.sale)),
|
||||||
},
|
totalCost: acc.totalCost.add(Dinero(val.cost)),
|
||||||
{
|
};
|
||||||
totalSale: Dinero(),
|
},
|
||||||
totalCost: Dinero(),
|
{
|
||||||
}
|
totalSale: Dinero(),
|
||||||
);
|
totalCost: Dinero(),
|
||||||
|
}
|
||||||
|
);
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Table.Summary.Row>
|
<Table.Summary.Row>
|
||||||
@@ -118,7 +120,7 @@ export function DmsAllocationsSummary({ socket, bodyshop, jobId, title }) {
|
|||||||
</Typography.Title>
|
</Typography.Title>
|
||||||
</Table.Summary.Cell>
|
</Table.Summary.Cell>
|
||||||
<Table.Summary.Cell>
|
<Table.Summary.Cell>
|
||||||
{totals.totalSale.toFormat()}
|
{totals && totals.totalSale.toFormat()}
|
||||||
</Table.Summary.Cell>
|
</Table.Summary.Cell>
|
||||||
<Table.Summary.Cell>
|
<Table.Summary.Cell>
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ export default connect(mapStateToProps, mapDispatchToProps)(DmsLogEvents);
|
|||||||
export function DmsLogEvents({ socket, logs, bodyshop }) {
|
export function DmsLogEvents({ socket, logs, bodyshop }) {
|
||||||
return (
|
return (
|
||||||
<Timeline pending
|
<Timeline pending
|
||||||
//reverse={true}
|
reverse={true}
|
||||||
>
|
>
|
||||||
{logs.map((log, idx) => (
|
{logs.map((log, idx) => (
|
||||||
<Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
|
<Timeline.Item key={idx} color={LogLevelHierarchy(log.level)}>
|
||||||
|
|||||||
Reference in New Issue
Block a user